Fix some PMP implementation
v2 cover Fix some PMP implementation
This patch set contains the fixes for wrong index of pmpcfg CSR on rv64, and the pmp range in CSR function table.
Changed in v2:
- Move out the shifting operation from loop. Suggested by Bin Meng.
Zong Li (2):
target/riscv: Fix the range of pmpcfg of CSR funcion table target/riscv/pmp.c: Fix the index offset on RV64
target/riscv/csr.c | 2 +- target/riscv/pmp.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-)
Signature · 1 line
2.27.0
PATCH v2 1/2 target/riscv: Fix the range of pmpcfg of CSR funcion table
The range of Physical Memory Protection should be from CSR_PMPCFG0 to CSR_PMPCFG3, not to CSR_PMPADDR9.
--- target/riscv/csr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/csr.c +1 -1
@@ -1353,7 +1353,7 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MTINST] = { hmode, read_mtinst, write_mtinst },/* Physical Memory Protection */ - [CSR_PMPCFG0 ... CSR_PMPADDR9] = { pmp, read_pmpcfg, write_pmpcfg }, + [CSR_PMPCFG0 ... CSR_PMPCFG3] = { pmp, read_pmpcfg, write_pmpcfg }, [CSR_PMPADDR0 ... CSR_PMPADDR15] = { pmp, read_pmpaddr, write_pmpaddr }, /* Performance Counters */
Signature · 1 line
2.27.0
PATCH v2 2/2 target/riscv/pmp.c: Fix the index offset on RV64
In reply to Zong LiOn RV64, the reg_index is 2 (pmpcfg2 CSR) after the seventh pmp entry, it is not 1 (pmpcfg1 CSR) like RV32. In the original implementation, the second parameter of pmp_write_cfg is "reg_index * sizeof(target_ulong)", and we get the the result which is started from 16 if reg_index is 2, but we expect that it should be started from 8. Separate the implementation for RV32 and RV64 respectively.
Changed in v2:
- Move out the shifting operation from loop. Suggested by Bin Meng
--- target/riscv/pmp.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
target/riscv/pmp.c +16 -3
@@ -309,6 +309,7 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index, {int i;uint8_t cfg_val; +uint32_t pmp_entry_base;trace_pmpcfg_csr_write (env->mhartid, reg_index, val);
@@ -318,10 +319,15 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index,return ; } +#if defined(TARGET_RISCV32 ) + pmp_entry_base = (reg_index *sizeof (target_ulong)); +#elif defined(TARGET_RISCV64 ) + pmp_entry_base = (reg_index >>1 ) *sizeof (target_ulong); +#endif +for (i =0 ; i <sizeof (target_ulong); i++) { cfg_val = (val >>8 * i) &0xff ; -pmp_write_cfg (env, (reg_index *sizeof (target_ulong)) + i, - cfg_val); +pmp_write_cfg (env, pmp_entry_base + i, cfg_val); } }
@@ -332,11 +338,18 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index,target_ulong pmpcfg_csr_read (CPURISCVState *env,uint32_t reg_index) {int i; +uint32_t pmp_entry_base;target_ulong cfg_val =0 ;target_ulong val =0 ; +#if defined(TARGET_RISCV32 ) + pmp_entry_base = (reg_index *sizeof (target_ulong)); +#elif defined(TARGET_RISCV64 ) + pmp_entry_base = (reg_index >>1 ) *sizeof (target_ulong); +#endif +for (i =0 ; i <sizeof (target_ulong); i++) { - val =pmp_read_cfg (env, (reg_index *sizeof (target_ulong)) + i); + val =pmp_read_cfg (env, pmp_entry_base + i); cfg_val |= (val << (i *8 )); }trace_pmpcfg_csr_read (env->mhartid, reg_index, cfg_val);
Signature · 1 line
2.27.0
Re: [PATCH v2 2/2] target/riscv/pmp.c: Fix the index offset on RV64
Hi Zong,
Quoted 11 lines · Zong Li
On RV64, the
reg_indexis 2 (pmpcfg2 CSR) after the seventh pmp entry, it is not 1 (pmpcfg1 CSR) like RV32. In the original implementation, the second parameter ofpmp_write_cfgis "reg_index*sizeof(target_ulong)", and we get the the result which is started from 16 ifreg_indexis 2, but we expect that it should be started from 8. Separate the implementation for RV32 and RV64 respectively.Changed in v2:
- Move out the shifting operation from loop. Suggested by Bin Meng
The changelog should go after --- below
Quoted 19 lines
Signed-off-by Zong Li <[email protected]>--- target/riscv/pmp.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)target/riscv/pmp.c +1
-0@@ -309,6 +309,7 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index, {int i;uint8_t cfg_val; +uint32_t pmp_entry_base;trace_pmpcfg_csr_write (env->mhartid, reg_index, val);
target/riscv/pmp.c void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index, · line 326
Quoted 8 lines
target/riscv/pmp.c +5
-0@@ -318,10 +319,15 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index,return ; } +#if defined(TARGET_RISCV32 ) + pmp_entry_base = (reg_index *sizeof (target_ulong)); +#elif defined(TARGET_RISCV64 ) + pmp_entry_base = (reg_index >>1 ) *sizeof (target_ulong); +#endif
This is not necessary. You can simply do:
#if defined(TARGET_RISCV64)
reg_index >>= 1;#endif
Quoted 19 lines
target/riscv/pmp.c +5
-2+for (i =0 ; i <sizeof (target_ulong); i++) { cfg_val = (val >>8 * i) &0xff ; -pmp_write_cfg (env, (reg_index *sizeof (target_ulong)) + i, - cfg_val); +pmp_write_cfg (env, pmp_entry_base + i, cfg_val); } }@@ -332,11 +338,18 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index,target_ulong pmpcfg_csr_read (CPURISCVState *env,uint32_t reg_index) {int i; +uint32_t pmp_entry_base;target_ulong cfg_val =0 ;target_ulong val =0 ; +#if defined(TARGET_RISCV32 ) + pmp_entry_base = (reg_index *sizeof (target_ulong));
target/riscv/pmp.c void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index, · line 355
Quoted 10 lines
target/riscv/pmp.c +5
-1+#elif defined(TARGET_RISCV64 ) + pmp_entry_base = (reg_index >>1 ) *sizeof (target_ulong); +#endif +for (i =0 ; i <sizeof (target_ulong); i++) { - val =pmp_read_cfg (env, (reg_index *sizeof (target_ulong)) + i); + val =pmp_read_cfg (env, pmp_entry_base + i); cfg_val |= (val << (i *8 )); }trace_pmpcfg_csr_read (env->mhartid, reg_index, cfg_val);
Regards,
Bin