diff options
| author | Anup Patel <anup.patel@wdc.com> | 2018-12-26 15:51:22 +0300 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2018-12-27 07:05:09 +0300 |
| commit | 7b59571758a5dec75c89928a60d982b29629cee6 (patch) | |
| tree | 455e803910c993bcd465cee1f2b0b1c80b8ba9a8 /lib | |
| parent | cfa3fba14f27f1fabaa8194d1ea1a6a21c2cc83a (diff) | |
| download | opensbi-7b59571758a5dec75c89928a60d982b29629cee6.tar.xz | |
lib: Simplify sbi_platform early_init() and final_init() hooks
Instead of having separate early_init() and final_init() hooks
for cold and warm boot, this patch updates struct sbi_platform
to have just one early_init() and one final_init() hook. The
type of boot (cold or warm) is now a boolean flag parameter for
the updated early_init() and final_init() hooks.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sbi_init.c | 16 | ||||
| -rw-r--r-- | lib/sbi_system.c | 22 |
2 files changed, 12 insertions, 26 deletions
diff --git a/lib/sbi_init.c b/lib/sbi_init.c index 68113b4..1f5d923 100644 --- a/lib/sbi_init.c +++ b/lib/sbi_init.c @@ -34,11 +34,7 @@ static void __attribute__((noreturn)) init_coldboot(struct sbi_scratch *scratch, char str[64]; struct sbi_platform *plat = sbi_platform_ptr(scratch); - rc = sbi_system_cold_early_init(scratch); - if (rc) - sbi_hart_hang(); - - rc = sbi_system_warm_early_init(scratch, hartid); + rc = sbi_system_early_init(scratch, hartid, TRUE); if (rc) sbi_hart_hang(); @@ -74,11 +70,7 @@ static void __attribute__((noreturn)) init_coldboot(struct sbi_scratch *scratch, if (rc) sbi_hart_hang(); - rc = sbi_system_cold_final_init(scratch); - if (rc) - sbi_hart_hang(); - - rc = sbi_system_warm_final_init(scratch, hartid); + rc = sbi_system_final_init(scratch, hartid, TRUE); if (rc) sbi_hart_hang(); @@ -125,7 +117,7 @@ static void __attribute__((noreturn)) init_warmboot(struct sbi_scratch *scratch, if (sbi_platform_hart_disabled(plat, hartid)) sbi_hart_hang(); - rc = sbi_system_warm_early_init(scratch, hartid); + rc = sbi_system_early_init(scratch, hartid, FALSE); if (rc) sbi_hart_hang(); @@ -145,7 +137,7 @@ static void __attribute__((noreturn)) init_warmboot(struct sbi_scratch *scratch, if (rc) sbi_hart_hang(); - rc = sbi_system_warm_final_init(scratch, hartid); + rc = sbi_system_final_init(scratch, hartid, FALSE); if (rc) sbi_hart_hang(); diff --git a/lib/sbi_system.c b/lib/sbi_system.c index cd250f5..f543cef 100644 --- a/lib/sbi_system.c +++ b/lib/sbi_system.c @@ -11,24 +11,18 @@ #include <sbi/sbi_platform.h> #include <sbi/sbi_system.h> -int sbi_system_warm_early_init(struct sbi_scratch *scratch, u32 hartid) +int sbi_system_early_init(struct sbi_scratch *scratch, u32 hartid, + bool cold_boot) { - return sbi_platform_warm_early_init(sbi_platform_ptr(scratch), hartid); + return sbi_platform_early_init(sbi_platform_ptr(scratch), + hartid, cold_boot); } -int sbi_system_warm_final_init(struct sbi_scratch *scratch, u32 hartid) +int sbi_system_final_init(struct sbi_scratch *scratch, u32 hartid, + bool cold_boot) { - return sbi_platform_warm_final_init(sbi_platform_ptr(scratch), hartid); -} - -int sbi_system_cold_early_init(struct sbi_scratch *scratch) -{ - return sbi_platform_cold_early_init(sbi_platform_ptr(scratch)); -} - -int sbi_system_cold_final_init(struct sbi_scratch *scratch) -{ - return sbi_platform_cold_final_init(sbi_platform_ptr(scratch)); + return sbi_platform_final_init(sbi_platform_ptr(scratch), + hartid, cold_boot); } void __attribute__((noreturn)) sbi_system_reboot(struct sbi_scratch *scratch, |