mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/riscv: Move pmp_get_tlb_size apart from get_physical_address_pmp

Browse Source 
pmp_get_tlb_size can be separated from get_physical_address_pmp and is only
needed when ret == TRANSLATE_SUCCESS.

Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn>
Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn>
Reviewed-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20230517091519.34439-3-liweiwei@iscas.ac.cn>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Weiwei Li 2023-05-17 17:15:09 +08:00 committed by Alistair Francis
parent dc7b599332
commit bfc7ee1224
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/riscv/cpu_helper.c
View File

@ -688,14 +688,11 @@ void riscv_cpu_set_mode(CPURISCVState *env, target_ulong newpriv)
* *
* @env: CPURISCVState * @env: CPURISCVState
* @prot: The returned protection attributes * @prot: The returned protection attributes
* @tlb_size: TLB page size containing addr. It could be modified after PMP
* permission checking. NULL if not set TLB page for addr.
* @addr: The physical address to be checked permission * @addr: The physical address to be checked permission
* @access_type: The type of MMU access * @access_type: The type of MMU access
* @mode: Indicates current privilege level. * @mode: Indicates current privilege level.
*/ */
static int get_physical_address_pmp(CPURISCVState *env, int *prot, static int get_physical_address_pmp(CPURISCVState *env, int *prot, hwaddr addr,
target_ulong *tlb_size, hwaddr addr,
int size, MMUAccessType access_type, int size, MMUAccessType access_type,
int mode) int mode)
{ {
@ -715,9 +712,6 @@ static int get_physical_address_pmp(CPURISCVState *env, int *prot,
} }
*prot = pmp_priv_to_page_prot(pmp_priv); *prot = pmp_priv_to_page_prot(pmp_priv);
if (tlb_size != NULL) {
*tlb_size = pmp_get_tlb_size(env, addr);
}
return TRANSLATE_SUCCESS; return TRANSLATE_SUCCESS;
} }
@ -906,7 +900,7 @@ restart:
} }
int pmp_prot; int pmp_prot;
int pmp_ret = get_physical_address_pmp(env, &pmp_prot, NULL, pte_addr, int pmp_ret = get_physical_address_pmp(env, &pmp_prot, pte_addr,
sizeof(target_ulong), sizeof(target_ulong),
MMU_DATA_LOAD, PRV_S); MMU_DATA_LOAD, PRV_S);
if (pmp_ret != TRANSLATE_SUCCESS) { if (pmp_ret != TRANSLATE_SUCCESS) {
@ -1302,8 +1296,9 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
prot &= prot2; prot &= prot2;
if (ret == TRANSLATE_SUCCESS) { if (ret == TRANSLATE_SUCCESS) {
ret = get_physical_address_pmp(env, &prot_pmp, &tlb_size, pa, ret = get_physical_address_pmp(env, &prot_pmp, pa,
size, access_type, mode); size, access_type, mode);
tlb_size = pmp_get_tlb_size(env, pa);
qemu_log_mask(CPU_LOG_MMU, qemu_log_mask(CPU_LOG_MMU,
"%s PMP address=" HWADDR_FMT_plx " ret %d prot" "%s PMP address=" HWADDR_FMT_plx " ret %d prot"
@ -1335,8 +1330,9 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
__func__, address, ret, pa, prot); __func__, address, ret, pa, prot);
if (ret == TRANSLATE_SUCCESS) { if (ret == TRANSLATE_SUCCESS) {
ret = get_physical_address_pmp(env, &prot_pmp, &tlb_size, pa, ret = get_physical_address_pmp(env, &prot_pmp, pa,
size, access_type, mode); size, access_type, mode);
tlb_size = pmp_get_tlb_size(env, pa);
qemu_log_mask(CPU_LOG_MMU, qemu_log_mask(CPU_LOG_MMU,
"%s PMP address=" HWADDR_FMT_plx " ret %d prot" "%s PMP address=" HWADDR_FMT_plx " ret %d prot"