diff options
author | Xu Lu <luxu.kernel@bytedance.com> | 2023-12-26 12:05:00 +0800 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2024-01-08 19:24:38 +0300 |
commit | 03382b91cb40ae02deeb711b6cd0f4c1a0830600 (patch) | |
tree | e73eafbc55f7f510de95277ca916dd1dba7ad3d6 | |
parent | 6c5dda7850082a78655ba4f11f6842d073423d07 (diff) | |
download | qemu-03382b91cb40ae02deeb711b6cd0f4c1a0830600.zip qemu-03382b91cb40ae02deeb711b6cd0f4c1a0830600.tar.gz qemu-03382b91cb40ae02deeb711b6cd0f4c1a0830600.tar.bz2 |
target/riscv: Fix mcycle/minstret increment behavior
The mcycle/minstret counter's stop flag is mistakenly updated on a copy
on stack. Thus the counter increments even when the CY/IR bit in the
mcountinhibit register is set. This commit corrects its behavior.
Fixes: 3780e33732f88 (target/riscv: Support mcycle/minstret write operation)
Signed-off-by: Xu Lu <luxu.kernel@bytedance.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit 5cb0e7abe1635cb82e0033260dac2b910d142f8c)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r-- | target/riscv/csr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/riscv/csr.c b/target/riscv/csr.c index ea75853..cbb7386 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -898,11 +898,11 @@ static int write_mhpmcounterh(CPURISCVState *env, int csrno, target_ulong val) static RISCVException riscv_pmu_read_ctr(CPURISCVState *env, target_ulong *val, bool upper_half, uint32_t ctr_idx) { - PMUCTRState counter = env->pmu_ctrs[ctr_idx]; - target_ulong ctr_prev = upper_half ? counter.mhpmcounterh_prev : - counter.mhpmcounter_prev; - target_ulong ctr_val = upper_half ? counter.mhpmcounterh_val : - counter.mhpmcounter_val; + PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; + target_ulong ctr_prev = upper_half ? counter->mhpmcounterh_prev : + counter->mhpmcounter_prev; + target_ulong ctr_val = upper_half ? counter->mhpmcounterh_val : + counter->mhpmcounter_val; if (get_field(env->mcountinhibit, BIT(ctr_idx))) { /* @@ -910,12 +910,12 @@ static RISCVException riscv_pmu_read_ctr(CPURISCVState *env, target_ulong *val, * stop the icount counting. Just return the counter value written by * the supervisor to indicate that counter was not incremented. */ - if (!counter.started) { + if (!counter->started) { *val = ctr_val; return RISCV_EXCP_NONE; } else { /* Mark that the counter has been stopped */ - counter.started = false; + counter->started = false; } } |