diff options
| author | Anup Patel <anup.patel@wdc.com> | 2018-12-26 16:14:54 +0300 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2018-12-27 07:05:09 +0300 |
| commit | 52ed1d17092bbe93a34802a55ff19cc7cbb7f85d (patch) | |
| tree | d367bfc48a0c787fabd6bd830b9ed68513afaebd /lib | |
| parent | c1b6200653c51642e544c66fab8bb320969b818e (diff) | |
| download | opensbi-52ed1d17092bbe93a34802a55ff19cc7cbb7f85d.tar.xz | |
lib: Simplify sbi_platform timer_init() hooks
Instead of having separate timer_init() hooks for cold and
warm boot, this patch updates struct sbi_platform to have just
one timer_init() hook. The type of boot (cold or warm) is now
a boolean flag parameter for the updated timer_init() hook.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sbi_init.c | 8 | ||||
| -rw-r--r-- | lib/sbi_timer.c | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/lib/sbi_init.c b/lib/sbi_init.c index 989cb7d..f942971 100644 --- a/lib/sbi_init.c +++ b/lib/sbi_init.c @@ -54,11 +54,7 @@ static void __attribute__((noreturn)) init_coldboot(struct sbi_scratch *scratch, if (rc) sbi_hart_hang(); - rc = sbi_timer_cold_init(scratch); - if (rc) - sbi_hart_hang(); - - rc = sbi_timer_warm_init(scratch, hartid); + rc = sbi_timer_init(scratch, hartid, TRUE); if (rc) sbi_hart_hang(); @@ -125,7 +121,7 @@ static void __attribute__((noreturn)) init_warmboot(struct sbi_scratch *scratch, if (rc) sbi_hart_hang(); - rc = sbi_timer_warm_init(scratch, hartid); + rc = sbi_timer_init(scratch, hartid, FALSE); if (rc) sbi_hart_hang(); diff --git a/lib/sbi_timer.c b/lib/sbi_timer.c index 355bc64..8dfc753 100644 --- a/lib/sbi_timer.c +++ b/lib/sbi_timer.c @@ -67,12 +67,9 @@ void sbi_timer_process(struct sbi_scratch *scratch, u32 hartid) csr_set(mip, MIP_STIP); } -int sbi_timer_warm_init(struct sbi_scratch *scratch, u32 hartid) +int sbi_timer_init(struct sbi_scratch *scratch, u32 hartid, + bool cold_boot) { - return sbi_platform_warm_timer_init(sbi_platform_ptr(scratch), hartid); -} - -int sbi_timer_cold_init(struct sbi_scratch *scratch) -{ - return sbi_platform_cold_timer_init(sbi_platform_ptr(scratch)); + return sbi_platform_timer_init(sbi_platform_ptr(scratch), + hartid, cold_boot); } |