lib: sbi: Fix PMP granularity handling in sbi_hart_map_saddr()

The sbi_hart_map_saddr() must create PMP mapping of size greater
than or equal to PMP granularity otherwise PMP mapping does not
work when size parameter less than sbi_hart_pmp_granularity(scratch).

Fixes: 6e44ef686a9b ("lib: sbi: Add functions to map/unmap shared memory")
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Samuel Holland <samuel.holland@sifive.com>

diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c
index 77eef49cbf8cf358ee352619cf46c9a578bfb167..bf8792af73bb8b688e135804e31c511a570a0ccd 100644 (file)
--- a/lib/sbi/sbi_hart.c
+++ b/lib/sbi/sbi_hart.c
@@ -508,7 +508,8 @@ int sbi_hart_map_saddr(unsigned long addr, unsigned long size)
        if (is_pmp_entry_mapped(SBI_SMEPMP_RESV_ENTRY))
                return SBI_ENOSPC;
 
-       for (order = log2roundup(size) ; order <= __riscv_xlen; order++) {
+       for (order = log2roundup(MAX(sbi_hart_pmp_granularity(scratch), size));
+            order <= __riscv_xlen; order++) {
                if (order < __riscv_xlen) {
                        base = addr & ~((1UL << order) - 1UL);
                        if ((base <= addr) &&