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: Save mideleg across non-retentive suspend

Browse Source 
OpenSBI updates mideleg when registering or unregistering the PMU SSE
event. The updated CSR value must be saved across non-retentive suspend,
or PMU SSE events will not be delivered after the hart is resumed.

Fixes: b31a0a2427 ("lib: sbi: pmu: Add SSE register/unregister() callbacks")
Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20250908055646.2391370-1-samuel.holland@sifive.com
Signed-off-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Samuel Holland
2025-09-07 22:56:38 -07:00
committed by Anup Patel
parent cb70dffa0a
commit 55135abcd5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/sbi/sbi_hsm.c
View File

@@ -47,6 +47,7 @@ struct sbi_hsm_data {
unsigned long saved_mie; unsigned long saved_mie;
unsigned long saved_mip; unsigned long saved_mip;
unsigned long saved_medeleg; unsigned long saved_medeleg;
unsigned long saved_mideleg;
unsigned long saved_menvcfg; unsigned long saved_menvcfg;
#if __riscv_xlen == 32 #if __riscv_xlen == 32
unsigned long saved_menvcfgh; unsigned long saved_menvcfgh;
@@ -429,6 +430,7 @@ void __sbi_hsm_suspend_non_ret_save(struct sbi_scratch *scratch)
hdata->saved_mie = csr_read(CSR_MIE); hdata->saved_mie = csr_read(CSR_MIE);
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);
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 #if __riscv_xlen == 32
hdata->saved_menvcfgh = csr_read(CSR_MENVCFGH); hdata->saved_menvcfgh = csr_read(CSR_MENVCFGH);
@@ -448,6 +450,7 @@ static void __sbi_hsm_suspend_non_ret_restore(struct sbi_scratch *scratch)
csr_write(CSR_MENVCFGH, hdata->saved_menvcfgh); csr_write(CSR_MENVCFGH, hdata->saved_menvcfgh);
#endif #endif
} }
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);
csr_set(CSR_MIP, (hdata->saved_mip & (MIP_SSIP | MIP_STIP))); csr_set(CSR_MIP, (hdata->saved_mip & (MIP_SSIP | MIP_STIP)));