diff options
| author | Anup Patel <[email protected]> | 2025-12-09 19:22:31 +0530 |
|---|---|---|
| committer | Anup Patel <[email protected]> | 2025-12-16 20:16:47 +0530 |
| commit | 644a344226320d12e6e2678236ef8fe67bd37904 (patch) | |
| tree | 832e68847175fdc7f9546ee30552b6e52a9b927d | |
| parent | 4339e85794571077f6436d8998b09dbd5755d258 (diff) | |
lib: sbi: Introduce sbi_hart_pmp_unconfigure() function
Currently, the unconfiguring PMP is implemented directly inside
switch_to_next_domain_context() whereas rest of the PMP programming
is done via functions implemented in sbi_hart.c.
Introduce a separate sbi_hart_pmp_unconfigure() function so that
all PMP programming is in one place.
Signed-off-by: Anup Patel <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Anup Patel <[email protected]>
| -rw-r--r-- | include/sbi/sbi_hart.h | 1 | ||||
| -rw-r--r-- | lib/sbi/sbi_domain_context.c | 10 | ||||
| -rw-r--r-- | lib/sbi/sbi_hart.c | 14 |
3 files changed, 16 insertions, 9 deletions
diff --git a/include/sbi/sbi_hart.h b/include/sbi/sbi_hart.h index c51b0689..d313527a 100644 --- a/include/sbi/sbi_hart.h +++ b/include/sbi/sbi_hart.h @@ -150,6 +150,7 @@ unsigned int sbi_hart_pmp_addrbits(struct sbi_scratch *scratch); unsigned int sbi_hart_mhpm_bits(struct sbi_scratch *scratch); bool sbi_hart_smepmp_is_fw_region(unsigned int pmp_idx); int sbi_hart_pmp_configure(struct sbi_scratch *scratch); +void sbi_hart_pmp_unconfigure(struct sbi_scratch *scratch); int sbi_hart_map_saddr(unsigned long base, unsigned long size); int sbi_hart_unmap_saddr(void); int sbi_hart_priv_version(struct sbi_scratch *scratch); diff --git a/lib/sbi/sbi_domain_context.c b/lib/sbi/sbi_domain_context.c index a66438e4..adfd271b 100644 --- a/lib/sbi/sbi_domain_context.c +++ b/lib/sbi/sbi_domain_context.c @@ -104,7 +104,6 @@ static int switch_to_next_domain_context(struct hart_context *ctx, struct sbi_trap_context *trap_ctx; struct sbi_domain *current_dom, *target_dom; struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); - unsigned int pmp_count = sbi_hart_pmp_count(scratch); if (!ctx || !dom_ctx || ctx == dom_ctx) return SBI_EINVAL; @@ -123,14 +122,7 @@ static int switch_to_next_domain_context(struct hart_context *ctx, spin_unlock(&target_dom->assigned_harts_lock); /* Reconfigure PMP settings for the new domain */ - for (int i = 0; i < pmp_count; i++) { - /* Don't revoke firmware access permissions */ - if (sbi_hart_smepmp_is_fw_region(i)) - continue; - - sbi_platform_pmp_disable(sbi_platform_thishart_ptr(), i); - pmp_disable(i); - } + sbi_hart_pmp_unconfigure(scratch); sbi_hart_pmp_configure(scratch); /* Save current CSR context and restore target domain's CSR context */ diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index 295a6783..4ec7a611 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -578,6 +578,20 @@ int sbi_hart_pmp_configure(struct sbi_scratch *scratch) return rc; } +void sbi_hart_pmp_unconfigure(struct sbi_scratch *scratch) +{ + int i, pmp_count = sbi_hart_pmp_count(scratch); + + for (i = 0; i < pmp_count; i++) { + /* Don't revoke firmware access permissions */ + if (sbi_hart_smepmp_is_fw_region(i)) + continue; + + sbi_platform_pmp_disable(sbi_platform_ptr(scratch), i); + pmp_disable(i); + } +} + int sbi_hart_priv_version(struct sbi_scratch *scratch) { struct sbi_hart_features *hfeatures = |