Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: sbi: factorize previous mode computation

Browse Source 
Previous privilege mode retrieval from mstatus is done at different
places, factorize it rather than copy/pasting it again.

Signed-off-by: Clément Léger <cleger@rivosinc.com>
Reviewed-by: Samuel Holland <samuel.holland@sifive.com>
This commit is contained in:
Clément Léger
2024-10-18 10:40:03 +02:00
committed by Anup Patel
parent daa282573f
commit 80656bdb1d
6 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/sbi/sbi_trap.h
View File

@@ -245,6 +245,11 @@ static inline bool sbi_regs_from_virt(const struct sbi_trap_regs *regs)
#endif #endif
} }
static inline int sbi_mstatus_prev_mode(unsigned long mstatus)
{
return (mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT;
}
int sbi_trap_redirect(struct sbi_trap_regs *regs, int sbi_trap_redirect(struct sbi_trap_regs *regs,
const struct sbi_trap_info *trap); const struct sbi_trap_info *trap);

4
lib/sbi/sbi_emulate_csr.c
View File

@@ -46,7 +46,7 @@ int sbi_emulate_csr_read(int csr_num, struct sbi_trap_regs *regs,
{ {
int ret = 0; int ret = 0;
struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); struct sbi_scratch *scratch = sbi_scratch_thishart_ptr();
ulong prev_mode = (regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; ulong prev_mode = sbi_mstatus_prev_mode(regs->mstatus);
bool virt = sbi_regs_from_virt(regs); bool virt = sbi_regs_from_virt(regs);
switch (csr_num) { switch (csr_num) {
@@ -152,7 +152,7 @@ int sbi_emulate_csr_write(int csr_num, struct sbi_trap_regs *regs,
ulong csr_val) ulong csr_val)
{ {
int ret = 0; int ret = 0;
ulong prev_mode = (regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; ulong prev_mode = sbi_mstatus_prev_mode(regs->mstatus);
bool virt = sbi_regs_from_virt(regs); bool virt = sbi_regs_from_virt(regs);
switch (csr_num) { switch (csr_num) {

2
lib/sbi/sbi_illegal_insn.c
View File

@@ -52,7 +52,7 @@ static int system_opcode_insn(ulong insn, struct sbi_trap_regs *regs)
int rs1_num = GET_RS1_NUM(insn); int rs1_num = GET_RS1_NUM(insn);
ulong rs1_val = GET_RS1(insn, regs); ulong rs1_val = GET_RS1(insn, regs);
int csr_num = GET_CSR_NUM((u32)insn); int csr_num = GET_CSR_NUM((u32)insn);
ulong prev_mode = (regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; ulong prev_mode = sbi_mstatus_prev_mode(regs->mstatus);
ulong csr_val, new_csr_val; ulong csr_val, new_csr_val;
if (prev_mode == PRV_M) { if (prev_mode == PRV_M) {

2
lib/sbi/sbi_system.c
View File

@@ -158,7 +158,7 @@ int sbi_system_suspend(u32 sleep_type, ulong resume_addr, ulong opaque)
if (ret != SBI_OK) if (ret != SBI_OK)
return ret; return ret;
prev_mode = (csr_read(CSR_MSTATUS) & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; prev_mode = sbi_mstatus_prev_mode(csr_read(CSR_MSTATUS));
if (prev_mode != PRV_S && prev_mode != PRV_U) if (prev_mode != PRV_S && prev_mode != PRV_U)
return SBI_EFAIL; return SBI_EFAIL;

4
lib/sbi/sbi_trap.c
View File

@@ -109,7 +109,7 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs,
bool next_virt = false; bool next_virt = false;
/* Sanity check on previous mode */ /* Sanity check on previous mode */
prev_mode = (regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; prev_mode = sbi_mstatus_prev_mode(regs->mstatus);
if (prev_mode != PRV_S && prev_mode != PRV_U) if (prev_mode != PRV_S && prev_mode != PRV_U)
return SBI_ENOTSUPP; return SBI_ENOTSUPP;
@@ -361,7 +361,7 @@ trap_done:
if (rc) if (rc)
sbi_trap_error(msg, rc, tcntx); sbi_trap_error(msg, rc, tcntx);
if (((regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT) != PRV_M) if (sbi_mstatus_prev_mode(regs->mstatus) != PRV_M)
sbi_sse_process_pending_events(regs); sbi_sse_process_pending_events(regs);
sbi_trap_set_context(scratch, tcntx->prev_context); sbi_trap_set_context(scratch, tcntx->prev_context);

4
lib/sbi/sbi_trap_ldst.c
View File

@@ -318,7 +318,7 @@ static int sbi_ld_access_emulator(int rlen, union sbi_ldst_data *out_val,
struct sbi_trap_regs *regs = &tcntx->regs; struct sbi_trap_regs *regs = &tcntx->regs;
/* If fault came from M mode, just fail */ /* If fault came from M mode, just fail */
if (((regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT) == PRV_M) if (sbi_mstatus_prev_mode(regs->mstatus) == PRV_M)
return SBI_EINVAL; return SBI_EINVAL;
/* If platform emulator failed, we redirect instead of fail */ /* If platform emulator failed, we redirect instead of fail */
@@ -341,7 +341,7 @@ static int sbi_st_access_emulator(int wlen, union sbi_ldst_data in_val,
struct sbi_trap_regs *regs = &tcntx->regs; struct sbi_trap_regs *regs = &tcntx->regs;
/* If fault came from M mode, just fail */ /* If fault came from M mode, just fail */
if (((regs->mstatus & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT) == PRV_M) if (sbi_mstatus_prev_mode(regs->mstatus) == PRV_M)
return SBI_EINVAL; return SBI_EINVAL;
/* If platform emulator failed, we redirect instead of fail */ /* If platform emulator failed, we redirect instead of fail */