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,10 +34,8 @@ struct sbi_platform {
u32 hart_count;
u32 hart_stack_size;
u64 disabled_hart_mask;
int (*cold_early_init)(void);
int (*cold_final_init)(void);
int (*warm_early_init)(u32 target_hart);
int (*warm_final_init)(u32 target_hart);
int (*early_init)(u32 hartid, bool cold_boot);
int (*final_init)(u32 hartid, bool cold_boot);
u32 (*pmp_region_count)(u32 target_hart);
int (*pmp_region_info)(u32 target_hart, u32 index,
ulong *prot, ulong *addr, ulong *log2size);
@@ -105,33 +103,19 @@ static inline u32 sbi_platform_hart_stack_size(struct sbi_platform *plat)
return 0;
}
static inline int sbi_platform_cold_early_init(struct sbi_platform *plat)
static inline int sbi_platform_early_init(struct sbi_platform *plat,
u32 hartid, bool cold_boot)
{
if (plat && plat->cold_early_init)
return plat->cold_early_init();
if (plat && plat->early_init)
return plat->early_init(hartid, cold_boot);
return 0;
}
static inline int sbi_platform_cold_final_init(struct sbi_platform *plat)
static inline int sbi_platform_final_init(struct sbi_platform *plat,
u32 hartid, bool cold_boot)
{
if (plat && plat->cold_final_init)
return plat->cold_final_init();
return 0;
}
static inline int sbi_platform_warm_early_init(struct sbi_platform *plat,
u32 target_hart)
{
if (plat && plat->warm_early_init)
return plat->warm_early_init(target_hart);
return 0;
}
static inline int sbi_platform_warm_final_init(struct sbi_platform *plat,
u32 target_hart)
{
if (plat && plat->warm_final_init)
return plat->warm_final_init(target_hart);
if (plat && plat->final_init)
return plat->final_init(hartid, cold_boot);
return 0;
}