lib: sbi: fix number of PMP entries detection

CSR_PMPADDRn lower bits may read all-0 or all-1, depending on the configuration. For TOR it is all-0, for NAPOT - all-1. Thus if PMP entry was pre-configured as NAPOT, original code would stop scanning because value read back not equal to the written one. Mask lower bits before comparison to fix this Signed-off-by: Vladimir Kondratiev <[email protected]>
riscv-software-src · Sep 2, 2024 · 797dba3 · 797dba3
1 parent c4940a9
commit 797dba3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c
@@ -817,7 +817,7 @@ static int hart_detect_features(struct sbi_scratch *scratch)
 		} else {						\
 			csr_write_allowed(__csr, &trap, __wrval);	\
 			if (!trap.cause) {				\
-				if (csr_swap(__csr, oldval) == __wrval)	\
+				if ((csr_swap(__csr, oldval) & __wrval) == __wrval)	\
 					(hfeatures->__field)++;		\
 				else					\
 					goto __skip;			\