| Message ID | 20230428143621.142390-13-liweiwei@iscas.ac.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/riscv: Fix PMP related problem | expand |
On Sat, Apr 29, 2023 at 12:38 AM Weiwei Li <liweiwei@iscas.ac.cn> wrote: > > Use pmp_update_rule_addr() and pmp_update_rule_nums() separately to > update rule nums only once for each pmpcfg_csr_write. Then remove > pmp_update_rule() since it become unused. > > Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn> > Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > target/riscv/pmp.c | 16 ++-------------- > 1 file changed, 2 insertions(+), 14 deletions(-) > > diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c > index 330f61b0f1..317c28ba73 100644 > --- a/target/riscv/pmp.c > +++ b/target/riscv/pmp.c > @@ -29,7 +29,6 @@ > static bool pmp_write_cfg(CPURISCVState *env, uint32_t addr_index, > uint8_t val); > static uint8_t pmp_read_cfg(CPURISCVState *env, uint32_t addr_index); > -static void pmp_update_rule(CPURISCVState *env, uint32_t pmp_index); > > /* > * Accessor method to extract address matching type 'a field' from cfg reg > @@ -121,7 +120,7 @@ static bool pmp_write_cfg(CPURISCVState *env, uint32_t pmp_index, uint8_t val) > qemu_log_mask(LOG_GUEST_ERROR, "ignoring pmpcfg write - locked\n"); > } else if (env->pmp_state.pmp[pmp_index].cfg_reg != val) { > env->pmp_state.pmp[pmp_index].cfg_reg = val; > - pmp_update_rule(env, pmp_index); > + pmp_update_rule_addr(env, pmp_index); > return true; > } > } else { > @@ -209,18 +208,6 @@ void pmp_update_rule_nums(CPURISCVState *env) > } > } > > -/* > - * Convert cfg/addr reg values here into simple 'sa' --> start address and 'ea' > - * end address values. > - * This function is called relatively infrequently whereas the check that > - * an address is within a pmp rule is called often, so optimise that one > - */ > -static void pmp_update_rule(CPURISCVState *env, uint32_t pmp_index) > -{ > - pmp_update_rule_addr(env, pmp_index); > - pmp_update_rule_nums(env); > -} > - > static int pmp_is_in_range(CPURISCVState *env, int pmp_index, > target_ulong addr) > { > @@ -481,6 +468,7 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index, > > /* If PMP permission of any addr has been changed, flush TLB pages. */ > if (modified) { > + pmp_update_rule_nums(env); > tlb_flush(env_cpu(env)); > } > } > -- > 2.25.1 > >
diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index 330f61b0f1..317c28ba73 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -29,7 +29,6 @@ static bool pmp_write_cfg(CPURISCVState *env, uint32_t addr_index, uint8_t val); static uint8_t pmp_read_cfg(CPURISCVState *env, uint32_t addr_index); -static void pmp_update_rule(CPURISCVState *env, uint32_t pmp_index); /* * Accessor method to extract address matching type 'a field' from cfg reg @@ -121,7 +120,7 @@ static bool pmp_write_cfg(CPURISCVState *env, uint32_t pmp_index, uint8_t val) qemu_log_mask(LOG_GUEST_ERROR, "ignoring pmpcfg write - locked\n"); } else if (env->pmp_state.pmp[pmp_index].cfg_reg != val) { env->pmp_state.pmp[pmp_index].cfg_reg = val; - pmp_update_rule(env, pmp_index); + pmp_update_rule_addr(env, pmp_index); return true; } } else { @@ -209,18 +208,6 @@ void pmp_update_rule_nums(CPURISCVState *env) } } -/* - * Convert cfg/addr reg values here into simple 'sa' --> start address and 'ea' - * end address values. - * This function is called relatively infrequently whereas the check that - * an address is within a pmp rule is called often, so optimise that one - */ -static void pmp_update_rule(CPURISCVState *env, uint32_t pmp_index) -{ - pmp_update_rule_addr(env, pmp_index); - pmp_update_rule_nums(env); -} - static int pmp_is_in_range(CPURISCVState *env, int pmp_index, target_ulong addr) { @@ -481,6 +468,7 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index, /* If PMP permission of any addr has been changed, flush TLB pages. */ if (modified) { + pmp_update_rule_nums(env); tlb_flush(env_cpu(env)); } }