Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: Simplify sbi_platform early_init() and final_init() hooks

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/sbi_init.c
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();

22
lib/sbi_system.c
View File

@@ -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,