From: Nicholas Piggin <[email protected]>
The !icount_enabled() path should update itrigger_enabled after changing
privilege, which can change whether or not an icount trigger is enabled.
Fixes: b2d7a7c7e4 ("target/riscv: Implement privilege mode filtering for
cycle/instret")
Signed-off-by: Nicholas Piggin <[email protected]>
Reviewed-by: Daniel Henrique Barboza <[email protected]>
---
target/riscv/tcg/cpu_helper.c | 7 +++++++
target/riscv/tcg/debug.c | 7 +++++++
target/riscv/tcg/debug.h | 3 +++
3 files changed, 17 insertions(+)
diff --git a/target/riscv/tcg/cpu_helper.c b/target/riscv/tcg/cpu_helper.c
index 07d9222652..6c18526c49 100644
--- a/target/riscv/tcg/cpu_helper.c
+++ b/target/riscv/tcg/cpu_helper.c
@@ -844,9 +844,12 @@ void riscv_ctr_add_entry(CPURISCVState *env, uint64_t src,
uint64_t dst,
void riscv_cpu_set_mode(CPURISCVState *env, privilege_mode_t newpriv,
bool virt_en)
{
+ bool change = false;
+
g_assert(newpriv <= PRV_M && newpriv != PRV_RESERVED);
if (newpriv != env->priv || env->virt_enabled != virt_en) {
+ change = true;
if (icount_enabled()) {
riscv_itrigger_update_priv(env);
}
@@ -889,6 +892,10 @@ void riscv_cpu_set_mode(CPURISCVState *env,
privilege_mode_t newpriv,
riscv_cpu_update_mip(env, 0, 0);
}
}
+
+ if (change) {
+ riscv_cpu_debug_change_priv(env);
+ }
}
/*
diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c
index 3c777694e5..a0222e178b 100644
--- a/target/riscv/tcg/debug.c
+++ b/target/riscv/tcg/debug.c
@@ -1121,6 +1121,13 @@ void riscv_trigger_unrealize(CPURISCVState *env)
g_free(env->itrigger_timer);
}
+void riscv_cpu_debug_change_priv(CPURISCVState *env)
+{
+ if (!icount_enabled()) {
+ env->itrigger_enabled = riscv_itrigger_enabled(env);
+ }
+}
+
void riscv_trigger_reset_hold(CPURISCVState *env)
{
target_ulong tdata1 = build_tdata1(env, TRIGGER_TYPE_AD_MATCH, 0, 0);
diff --git a/target/riscv/tcg/debug.h b/target/riscv/tcg/debug.h
index a25d099b37..88d34ecac9 100644
--- a/target/riscv/tcg/debug.h
+++ b/target/riscv/tcg/debug.h
@@ -153,4 +153,7 @@ void riscv_trigger_reset_hold(CPURISCVState *env);
bool riscv_itrigger_enabled(CPURISCVState *env);
void riscv_itrigger_update_priv(CPURISCVState *env);
+
+void riscv_cpu_debug_change_priv(CPURISCVState *env);
+
#endif /* RISCV_DEBUG_H */
--
2.43.0
