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>
This commit is contained in:
Anup Patel
2018-12-26 18:21:22 +05:30
committed by Anup Patel
parent cfa3fba14f
commit 7b59571758
8 changed files with 47 additions and 69 deletions

View File

@@ -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();