Virtualization
/
opensbi
mirror of https://gitlab.com/qemu-project/opensbi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib: sbi: Fix PMP address bits detection 

We should ensure that pmpcfg0.pmp0cfg is set to zero before using
pmpaddr0 CSR for detecting implemented PMP address bits.

Fixes: bf21632860 ("lib: sbi: Detect PMP granularity and number
of address bits")
Signed-off-by: Vasan VS <vasan.vs@gmail.com>
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Dong Du <Dd_nirvana@sjtu.edu.cn>
This commit is contained in:
Vasan VS 2021-11-08 10:24:56 +05:30 committed by Anup Patel
parent b8845e4204
commit 31fe5a7a3d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/sbi/sbi_hart.c
View File

@ -338,6 +338,10 @@ static unsigned long hart_pmp_get_allowed_addr(void)
unsigned long val = 0; unsigned long val = 0;
struct sbi_trap_info trap = {0}; struct sbi_trap_info trap = {0};
csr_write_allowed(CSR_PMPCFG0, (ulong)&trap, 0);
if (trap.cause)
return 0;
csr_write_allowed(CSR_PMPADDR0, (ulong)&trap, PMP_ADDR_MASK); csr_write_allowed(CSR_PMPADDR0, (ulong)&trap, PMP_ADDR_MASK);
if (!trap.cause) { if (!trap.cause) {
val = csr_read_allowed(CSR_PMPADDR0, (ulong)&trap); val = csr_read_allowed(CSR_PMPADDR0, (ulong)&trap);