[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 06/12] target/arm: Convert get_phys_addr_pmsav5() to n
From: |
Peter Maydell |
Subject: |
[Qemu-arm] [PATCH 06/12] target/arm: Convert get_phys_addr_pmsav5() to not return FSC values |
Date: |
Tue, 5 Dec 2017 19:46:26 +0000 |
Make get_phys_addr_pmsav5() return a fault type in the ARMMMUFaultInfo
structure, which we convert to the FSC at the callsite.
Note that PMSAv5 does not define any guest-visible fault status
register, so the different "fsr" values we were previously
returning are entirely arbitrary. So we can just switch to using
the most appropriae fi->type values without worrying that we
need to special-case FaultInfo->FSC conversion for PMSAv5.
Signed-off-by: Peter Maydell <address@hidden>
---
target/arm/helper.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index a2a0784..57286a7 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -9547,7 +9547,8 @@ static bool get_phys_addr_pmsav8(CPUARMState *env,
uint32_t address,
static bool get_phys_addr_pmsav5(CPUARMState *env, uint32_t address,
MMUAccessType access_type, ARMMMUIdx mmu_idx,
- hwaddr *phys_ptr, int *prot, uint32_t *fsr)
+ hwaddr *phys_ptr, int *prot,
+ ARMMMUFaultInfo *fi)
{
int n;
uint32_t mask;
@@ -9576,7 +9577,7 @@ static bool get_phys_addr_pmsav5(CPUARMState *env,
uint32_t address,
}
}
if (n < 0) {
- *fsr = 2;
+ fi->type = ARMFault_Background;
return true;
}
@@ -9588,11 +9589,13 @@ static bool get_phys_addr_pmsav5(CPUARMState *env,
uint32_t address,
mask = (mask >> (n * 4)) & 0xf;
switch (mask) {
case 0:
- *fsr = 1;
+ fi->type = ARMFault_Permission;
+ fi->level = 1;
return true;
case 1:
if (is_user) {
- *fsr = 1;
+ fi->type = ARMFault_Permission;
+ fi->level = 1;
return true;
}
*prot = PAGE_READ | PAGE_WRITE;
@@ -9608,7 +9611,8 @@ static bool get_phys_addr_pmsav5(CPUARMState *env,
uint32_t address,
break;
case 5:
if (is_user) {
- *fsr = 1;
+ fi->type = ARMFault_Permission;
+ fi->level = 1;
return true;
}
*prot = PAGE_READ;
@@ -9618,7 +9622,8 @@ static bool get_phys_addr_pmsav5(CPUARMState *env,
uint32_t address,
break;
default:
/* Bad permission. */
- *fsr = 1;
+ fi->type = ARMFault_Permission;
+ fi->level = 1;
return true;
}
*prot |= PAGE_EXEC;
@@ -9823,7 +9828,8 @@ static bool get_phys_addr(CPUARMState *env, target_ulong
address,
} else {
/* Pre-v7 MPU */
ret = get_phys_addr_pmsav5(env, address, access_type, mmu_idx,
- phys_ptr, prot, fsr);
+ phys_ptr, prot, fi);
+ *fsr = arm_fi_to_sfsc(fi);
}
qemu_log_mask(CPU_LOG_MMU, "PMSA MPU lookup for %s at 0x%08" PRIx32
" mmu_idx %u -> %s (prot %c%c%c)\n",
--
2.7.4
- [Qemu-arm] [PATCH 00/12] Refactor get_phys_addr() not to return FSR values, Peter Maydell, 2017/12/05
- [Qemu-arm] [PATCH 11/12] target/arm: Remove fsr argument from get_phys_addr() and arm_tlb_fill(), Peter Maydell, 2017/12/05
- [Qemu-arm] [PATCH 12/12] target/arm: Extend PAR format determination, Peter Maydell, 2017/12/05
- [Qemu-arm] [PATCH 10/12] target/arm: Ignore fsr from get_phys_addr() in do_ats_write(), Peter Maydell, 2017/12/05
- [Qemu-arm] [PATCH 09/12] target/arm: Use ARMMMUFaultInfo in deliver_fault(), Peter Maydell, 2017/12/05
- [Qemu-arm] [PATCH 07/12] target/arm: Convert get_phys_addr_pmsav7() to not return FSC values, Peter Maydell, 2017/12/05
- [Qemu-arm] [PATCH 08/12] target/arm: Convert get_phys_addr_pmsav8() to not return FSC values, Peter Maydell, 2017/12/05
- [Qemu-arm] [PATCH 06/12] target/arm: Convert get_phys_addr_pmsav5() to not return FSC values,
Peter Maydell <=
- [Qemu-arm] [PATCH 04/12] target/arm: Convert get_phys_addr_v6() to not return FSC values, Peter Maydell, 2017/12/05
- [Qemu-arm] [PATCH 02/12] target/arm: Remove fsr argument from arm_ld*_ptw(), Peter Maydell, 2017/12/05
- [Qemu-arm] [PATCH 05/12] target/arm: Convert get_phys_addr_lpae() to not return FSC values, Peter Maydell, 2017/12/05
- [Qemu-arm] [PATCH 03/12] target/arm: Convert get_phys_addr_v5() to not return FSC values, Peter Maydell, 2017/12/05
- [Qemu-arm] [PATCH 01/12] target/arm: Provide fault type enum and FSR conversion functions, Peter Maydell, 2017/12/05
- Re: [Qemu-arm] [Qemu-devel] [PATCH 00/12] Refactor get_phys_addr() not to return FSR values, Richard Henderson, 2017/12/07
- Re: [Qemu-arm] [Qemu-devel] [PATCH 00/12] Refactor get_phys_addr() not to return FSR values, Stefano Stabellini, 2017/12/08
- Re: [Qemu-arm] [PATCH 00/12] Refactor get_phys_addr() not to return FSR values, Edgar E. Iglesias, 2017/12/11