Mirrors/opensbi
4
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2025-10-09 18:12:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib: sbi_hsm: Use 64-bit CSR macro for menvcfg

Browse Source 
Simplify the code and remove preprocessor checks by treating menvcfg and
menvcfgh together as one 64-bit value.

Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20250908055646.2391370-3-samuel.holland@sifive.com
Signed-off-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Samuel Holland
2025-09-07 22:56:40 -07:00
committed by Anup Patel
parent f04ae48263
commit d9afef57b7
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/sbi/sbi_hsm.c
View File

@@ -48,10 +48,7 @@ struct sbi_hsm_data {
unsigned long saved_mip; unsigned long saved_mip;
unsigned long saved_medeleg; unsigned long saved_medeleg;
unsigned long saved_mideleg; unsigned long saved_mideleg;
unsigned long saved_menvcfg; u64 saved_menvcfg;
#if __riscv_xlen == 32
unsigned long saved_menvcfgh;
#endif
atomic_t start_ticket; atomic_t start_ticket;
}; };
@@ -431,12 +428,8 @@ void __sbi_hsm_suspend_non_ret_save(struct sbi_scratch *scratch)
hdata->saved_mip = csr_read(CSR_MIP) & (MIP_SSIP | MIP_STIP); hdata->saved_mip = csr_read(CSR_MIP) & (MIP_SSIP | MIP_STIP);
hdata->saved_medeleg = csr_read(CSR_MEDELEG); hdata->saved_medeleg = csr_read(CSR_MEDELEG);
hdata->saved_mideleg = csr_read(CSR_MIDELEG); hdata->saved_mideleg = csr_read(CSR_MIDELEG);
if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_12) { if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_12)
#if __riscv_xlen == 32 hdata->saved_menvcfg = csr_read64(CSR_MENVCFG);
hdata->saved_menvcfgh = csr_read(CSR_MENVCFGH);
#endif
hdata->saved_menvcfg = csr_read(CSR_MENVCFG);
}
} }
static void __sbi_hsm_suspend_non_ret_restore(struct sbi_scratch *scratch) static void __sbi_hsm_suspend_non_ret_restore(struct sbi_scratch *scratch)
@@ -444,12 +437,8 @@ static void __sbi_hsm_suspend_non_ret_restore(struct sbi_scratch *scratch)
struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch, struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch,
hart_data_offset); hart_data_offset);
if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_12) { if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_12)
csr_write(CSR_MENVCFG, hdata->saved_menvcfg); csr_write64(CSR_MENVCFG, hdata->saved_menvcfg);
#if __riscv_xlen == 32
csr_write(CSR_MENVCFGH, hdata->saved_menvcfgh);
#endif
}
csr_write(CSR_MIDELEG, hdata->saved_mideleg); csr_write(CSR_MIDELEG, hdata->saved_mideleg);
csr_write(CSR_MEDELEG, hdata->saved_medeleg); csr_write(CSR_MEDELEG, hdata->saved_medeleg);
csr_write(CSR_MIE, hdata->saved_mie); csr_write(CSR_MIE, hdata->saved_mie);