[#59539] riscv: Clear sstatus.SPP on SRET

p-woj · adrabarek · commit 250e5781e1fb · 2024-06-26T21:35:44.000+02:00
diff --git a/arch/riscv/op_helper.c b/arch/riscv/op_helper.c
@@ -841,7 +841,7 @@ target_ulong helper_sret(CPUState *env, target_ulong cpu_pc_deb)
         set_field(sstatus, (env->privilege_architecture >= RISCV_PRIV1_10) ? SSTATUS_SIE : 1 << prev_priv,
             get_field(sstatus, SSTATUS_SPIE));
     sstatus = set_field(sstatus, SSTATUS_SPIE, 1);
-    sstatus = set_field(sstatus, SSTATUS_SPP, prev_priv);
+    sstatus = set_field(sstatus, SSTATUS_SPP, PRV_U);
     if (env->privilege_architecture >= RISCV_PRIV1_12) {
         sstatus = set_field(sstatus, MSTATUS_MPRV, 0);
     }

Original file line number	Diff line number	Diff line change
`@@ -841,7 +841,7 @@ target_ulong helper_sret(CPUState *env, target_ulong cpu_pc_deb)`
`841`	`841`	`set_field(sstatus, (env->privilege_architecture >= RISCV_PRIV1_10) ? SSTATUS_SIE : 1 << prev_priv,`
`842`	`842`	`get_field(sstatus, SSTATUS_SPIE));`
`843`	`843`	`sstatus = set_field(sstatus, SSTATUS_SPIE, 1);`
`844`		`- sstatus = set_field(sstatus, SSTATUS_SPP, prev_priv);`
	`844`	`+ sstatus = set_field(sstatus, SSTATUS_SPP, PRV_U);`
`845`	`845`	`if (env->privilege_architecture >= RISCV_PRIV1_12) {`
`846`	`846`	`sstatus = set_field(sstatus, MSTATUS_MPRV, 0);`
`847`	`847`	`}`