diff options
| author | Bo Gan <ganboing@gmail.com> | 2025-12-18 02:42:38 -0800 |
|---|---|---|
| committer | Anup Patel <anuppate@hu-anuppate-blr.qualcomm.com> | 2025-12-21 20:33:18 +0530 |
| commit | 2c1bf5bb73194ca035bcd5ab3fbc6653de3162e1 (patch) | |
| tree | f37d7d0f93c902e571873739c51eefb938e7f897 | |
| parent | 707aa3231af8c19779e8ca07a950c3a6b331489a (diff) | |
| download | opensbi-2c1bf5bb73194ca035bcd5ab3fbc6653de3162e1.zip opensbi-2c1bf5bb73194ca035bcd5ab3fbc6653de3162e1.tar.gz opensbi-2c1bf5bb73194ca035bcd5ab3fbc6653de3162e1.tar.bz2 | |
lib: sbi_domain: add sbi_domain_get_oldpmp_flags
Factor out logic in `sbi_hart_oldpmp_configure` into function
`sbi_domain_get_oldpmp_flags`, analogous to `sbi_domain_get_smepmp_flags`.
Platform specific hart-protection implementation can now leverage it.
Signed-off-by: Bo Gan <ganboing@gmail.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20251218104243.562667-3-ganboing@gmail.com
Signed-off-by: Anup Patel <anup@brainfault.org>
| -rw-r--r-- | include/sbi/sbi_domain.h | 7 | ||||
| -rw-r--r-- | lib/sbi/sbi_domain.c | 22 | ||||
| -rw-r--r-- | lib/sbi/sbi_hart_pmp.c | 17 |
3 files changed, 30 insertions, 16 deletions
diff --git a/include/sbi/sbi_domain.h b/include/sbi/sbi_domain.h index 1196d60..3360e09 100644 --- a/include/sbi/sbi_domain.h +++ b/include/sbi/sbi_domain.h @@ -254,6 +254,13 @@ void sbi_domain_memregion_init(unsigned long addr, struct sbi_domain_memregion *reg); /** + * Return the oldpmp pmpcfg LRWX encoding for the flags in @reg. + * + * @param reg pointer to memory region; its flags field encodes permissions. + */ +unsigned int sbi_domain_get_oldpmp_flags(struct sbi_domain_memregion *reg); + +/** * Return the Smepmp pmpcfg LRWX encoding for the flags in @reg. * * @param reg pointer to memory region; its flags field encodes permissions. diff --git a/lib/sbi/sbi_domain.c b/lib/sbi/sbi_domain.c index 96d10c7..74cc1e3 100644 --- a/lib/sbi/sbi_domain.c +++ b/lib/sbi/sbi_domain.c @@ -121,6 +121,28 @@ void sbi_domain_memregion_init(unsigned long addr, } } +unsigned int sbi_domain_get_oldpmp_flags(struct sbi_domain_memregion *reg) +{ + + unsigned int pmp_flags = 0; + + /* + * If permissions are to be enforced for all modes on + * this region, the lock bit should be set. + */ + if (reg->flags & SBI_DOMAIN_MEMREGION_ENF_PERMISSIONS) + pmp_flags |= PMP_L; + + if (reg->flags & SBI_DOMAIN_MEMREGION_SU_READABLE) + pmp_flags |= PMP_R; + if (reg->flags & SBI_DOMAIN_MEMREGION_SU_WRITABLE) + pmp_flags |= PMP_W; + if (reg->flags & SBI_DOMAIN_MEMREGION_SU_EXECUTABLE) + pmp_flags |= PMP_X; + + return pmp_flags; +} + unsigned int sbi_domain_get_smepmp_flags(struct sbi_domain_memregion *reg) { unsigned int pmp_flags = 0; diff --git a/lib/sbi/sbi_hart_pmp.c b/lib/sbi/sbi_hart_pmp.c index 7f970ca..be45912 100644 --- a/lib/sbi/sbi_hart_pmp.c +++ b/lib/sbi/sbi_hart_pmp.c @@ -272,22 +272,7 @@ static int sbi_hart_oldpmp_configure(struct sbi_scratch *scratch) if (!is_valid_pmp_idx(pmp_count, pmp_idx)) return SBI_EFAIL; - pmp_flags = 0; - - /* - * If permissions are to be enforced for all modes on - * this region, the lock bit should be set. - */ - if (reg->flags & SBI_DOMAIN_MEMREGION_ENF_PERMISSIONS) - pmp_flags |= PMP_L; - - if (reg->flags & SBI_DOMAIN_MEMREGION_SU_READABLE) - pmp_flags |= PMP_R; - if (reg->flags & SBI_DOMAIN_MEMREGION_SU_WRITABLE) - pmp_flags |= PMP_W; - if (reg->flags & SBI_DOMAIN_MEMREGION_SU_EXECUTABLE) - pmp_flags |= PMP_X; - + pmp_flags = sbi_domain_get_oldpmp_flags(reg); pmp_addr = reg->base >> PMP_SHIFT; if (pmp_log2gran <= reg->order && pmp_addr < pmp_addr_max) { sbi_platform_pmp_set(sbi_platform_ptr(scratch), |