diff options
| author | Anup Patel <anup.patel@wdc.com> | 2020-09-07 15:50:33 +0530 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2020-09-16 09:05:25 +0530 |
| commit | 7ccf6bf54c2d7db6331f3fa319ef4e7019108c28 (patch) | |
| tree | 2e54824ef04c5c3dfcfd475e16c24f89e07112f9 /lib/sbi/riscv_asm.c | |
| parent | 6734304f8c759c782cab12ecfd6c20fb23b8ee44 (diff) | |
lib: sbi: Allow specifying mode in sbi_hart_pmp_check_addr() API
We extend sbi_hart_pmp_check_addr() API so that users can specify
privilege mode of the address for checking PMP access permissions.
To achieve this, we end-up converting "unsigned long *size" parameter
to "unsigned long *log2len" for pmp_get() implementation so that we
can deal with regions of "1UL << __riscv_xlen" size in a special case
in sbi_hart_pmp_check_addr() implementation.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Diffstat (limited to 'lib/sbi/riscv_asm.c')
| -rw-r--r-- | lib/sbi/riscv_asm.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/sbi/riscv_asm.c b/lib/sbi/riscv_asm.c index 799123f..8c54c11 100644 --- a/lib/sbi/riscv_asm.c +++ b/lib/sbi/riscv_asm.c @@ -239,16 +239,16 @@ int pmp_set(unsigned int n, unsigned long prot, unsigned long addr, } int pmp_get(unsigned int n, unsigned long *prot_out, unsigned long *addr_out, - unsigned long *size) + unsigned long *log2len) { int pmpcfg_csr, pmpcfg_shift, pmpaddr_csr; unsigned long cfgmask, pmpcfg, prot; - unsigned long t1, addr, log2len; + unsigned long t1, addr, len; /* check parameters */ - if (n >= PMP_COUNT || !prot_out || !addr_out || !size) + if (n >= PMP_COUNT || !prot_out || !addr_out || !log2len) return SBI_EINVAL; - *prot_out = *addr_out = *size = 0; + *prot_out = *addr_out = *log2len = 0; /* calculate PMP register and offset */ #if __riscv_xlen == 32 @@ -275,23 +275,21 @@ int pmp_get(unsigned int n, unsigned long *prot_out, unsigned long *addr_out, addr = csr_read_num(pmpaddr_csr); if (addr == -1UL) { addr = 0; - log2len = __riscv_xlen; + len = __riscv_xlen; } else { t1 = ctz(~addr); addr = (addr & ~((1UL << t1) - 1)) << PMP_SHIFT; - log2len = (t1 + PMP_SHIFT + 1); + len = (t1 + PMP_SHIFT + 1); } } else { addr = csr_read_num(pmpaddr_csr) << PMP_SHIFT; - log2len = PMP_SHIFT; + len = PMP_SHIFT; } /* return details */ *prot_out = prot; *addr_out = addr; - - if (log2len < __riscv_xlen) - *size = (1UL << log2len); + *log2len = len; return 0; } |