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

lib: sbi: Configure PMP late in coldboot and warmboot path

Browse Source 
We factor-out PMP configuration from sbi_hart_init() as a separate
sbi_hart_pmp_configure() function and do the PMP configuration very
late in coldboot and warmboot path just before platform_final_init().

Eventually, this enable us to configure PMP totally based on OpenSBI
domain where OpenSBI domains can be parsed from device-tree in any of
the platform operations except platform_final_init().

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Anup Patel
2020-09-20 10:09:32 +05:30
committed by Anup Patel
parent a12d46a5e7
commit a126886bfa
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/sbi/sbi_hart.h
View File

@@ -45,6 +45,7 @@ void sbi_hart_pmp_dump(struct sbi_scratch *scratch);
int sbi_hart_pmp_check_addr(struct sbi_scratch *scratch, int sbi_hart_pmp_check_addr(struct sbi_scratch *scratch,
unsigned long daddr, unsigned long mode, unsigned long daddr, unsigned long mode,
unsigned long attr); unsigned long attr);
int sbi_hart_pmp_configure(struct sbi_scratch *scratch);
bool sbi_hart_has_feature(struct sbi_scratch *scratch, unsigned long feature); bool sbi_hart_has_feature(struct sbi_scratch *scratch, unsigned long feature);
void sbi_hart_get_features_str(struct sbi_scratch *scratch, void sbi_hart_get_features_str(struct sbi_scratch *scratch,
char *features_str, int nfstr); char *features_str, int nfstr);

4
lib/sbi/sbi_hart.c
View File

@@ -224,7 +224,7 @@ int sbi_hart_pmp_check_addr(struct sbi_scratch *scratch,
return SBI_OK; return SBI_OK;
} }
static int pmp_init(struct sbi_scratch *scratch, u32 hartid) int sbi_hart_pmp_configure(struct sbi_scratch *scratch)
{ {
u32 pmp_idx = 0; u32 pmp_idx = 0;
unsigned long fw_start, fw_size_log2; unsigned long fw_start, fw_size_log2;
@@ -462,7 +462,7 @@ int sbi_hart_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot)
if (rc) if (rc)
return rc; return rc;
return pmp_init(scratch, hartid); return 0;
} }
void __attribute__((noreturn)) sbi_hart_hang(void) void __attribute__((noreturn)) sbi_hart_hang(void)

8
lib/sbi/sbi_init.c
View File

@@ -210,6 +210,10 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
if (rc) if (rc)
sbi_hart_hang(); sbi_hart_hang();
rc = sbi_hart_pmp_configure(scratch);
if (rc)
sbi_hart_hang();
rc = sbi_platform_final_init(plat, TRUE); rc = sbi_platform_final_init(plat, TRUE);
if (rc) if (rc)
sbi_hart_hang(); sbi_hart_hang();
@@ -266,6 +270,10 @@ static void __noreturn init_warmboot(struct sbi_scratch *scratch, u32 hartid)
if (rc) if (rc)
sbi_hart_hang(); sbi_hart_hang();
rc = sbi_hart_pmp_configure(scratch);
if (rc)
sbi_hart_hang();
rc = sbi_platform_final_init(plat, FALSE); rc = sbi_platform_final_init(plat, FALSE);
if (rc) if (rc)
sbi_hart_hang(); sbi_hart_hang();