yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-06-29 18:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-arm: Add ARMMMUFaultInfo

Browse source 
Introduce ARMMMUFaultInfo to propagate MMU Fault information
across the MMU translation code path. This is in preparation for
adding Stage-2 translation.

No functional changes.

Backports commit e14b5a23d8c83304559f31397f95d22ada60a19a from qemu
This commit is contained in:
Edgar E. Iglesias 2018-02-17 13:31:58 -05:00 committed by Lioncash
parent 9156b8f3ce
commit 716f1ac28c
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
qemu/target-arm/helper.c
View file

@ -12,7 +12,8 @@
static bool get_phys_addr(CPUARMState *env, target_ulong address, static bool get_phys_addr(CPUARMState *env, target_ulong address,
int access_type, ARMMMUIdx mmu_idx, int access_type, ARMMMUIdx mmu_idx,
hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot, hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot,
target_ulong *page_size, uint32_t *fsr); target_ulong *page_size, uint32_t *fsr,
ARMMMUFaultInfo *fi);
/* Definitions for the PMCCNTR and PMCR registers */ /* Definitions for the PMCCNTR and PMCR registers */
#define PMCRD 0x8 #define PMCRD 0x8
@ -1525,9 +1526,10 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value,
bool ret; bool ret;
uint64_t par64; uint64_t par64;
MemTxAttrs attrs = {0}; MemTxAttrs attrs = {0};
ARMMMUFaultInfo fi = {0};
ret = get_phys_addr(env, value, access_type, mmu_idx, ret = get_phys_addr(env, value, access_type, mmu_idx,
&phys_addr, &attrs, &prot, &page_size, &fsr); &phys_addr, &attrs, &prot, &page_size, &fsr, &fi);
if (extended_addresses_enabled(env)) { if (extended_addresses_enabled(env)) {
/* fsr is a DFSR/IFSR value for the long descriptor /* fsr is a DFSR/IFSR value for the long descriptor
* translation table format, but with WnR always clear. * translation table format, but with WnR always clear.
@ -5582,7 +5584,8 @@ static uint64_t arm_ldq_ptw(CPUState *cs, hwaddr addr, bool is_secure)
static bool get_phys_addr_v5(CPUARMState *env, uint32_t address, static bool get_phys_addr_v5(CPUARMState *env, uint32_t address,
int access_type, ARMMMUIdx mmu_idx, int access_type, ARMMMUIdx mmu_idx,
hwaddr *phys_ptr, int *prot, hwaddr *phys_ptr, int *prot,
target_ulong *page_size, uint32_t *fsr) target_ulong *page_size, uint32_t *fsr,
ARMMMUFaultInfo *fi)
{ {
CPUState *cs = CPU(arm_env_get_cpu(env)); CPUState *cs = CPU(arm_env_get_cpu(env));
int code; int code;
@ -5695,7 +5698,8 @@ do_fault:
static bool get_phys_addr_v6(CPUARMState *env, uint32_t address, static bool get_phys_addr_v6(CPUARMState *env, uint32_t address,
int access_type, ARMMMUIdx mmu_idx, int access_type, ARMMMUIdx mmu_idx,
hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot, hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot,
target_ulong *page_size, uint32_t *fsr) target_ulong *page_size, uint32_t *fsr,
ARMMMUFaultInfo *fi)
{ {
CPUState *cs = CPU(arm_env_get_cpu(env)); CPUState *cs = CPU(arm_env_get_cpu(env));
int code; int code;
@ -5905,7 +5909,8 @@ static bool check_s2_startlevel(ARMCPU *cpu, bool is_aa64, int level,
static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
int access_type, ARMMMUIdx mmu_idx, int access_type, ARMMMUIdx mmu_idx,
hwaddr *phys_ptr, MemTxAttrs *txattrs, int *prot, hwaddr *phys_ptr, MemTxAttrs *txattrs, int *prot,
target_ulong *page_size_ptr, uint32_t *fsr) target_ulong *page_size_ptr, uint32_t *fsr,
ARMMMUFaultInfo *fi)
{ {
ARMCPU *cpu = arm_env_get_cpu(env); ARMCPU *cpu = arm_env_get_cpu(env);
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);
@ -6481,7 +6486,8 @@ static bool get_phys_addr_pmsav5(CPUARMState *env, uint32_t address,
static bool get_phys_addr(CPUARMState *env, target_ulong address, static bool get_phys_addr(CPUARMState *env, target_ulong address,
int access_type, ARMMMUIdx mmu_idx, int access_type, ARMMMUIdx mmu_idx,
hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot, hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot,
target_ulong *page_size, uint32_t *fsr) target_ulong *page_size, uint32_t *fsr,
ARMMMUFaultInfo *fi)
{ {
if (mmu_idx == ARMMMUIdx_S12NSE0 || mmu_idx == ARMMMUIdx_S12NSE1) { if (mmu_idx == ARMMMUIdx_S12NSE0 || mmu_idx == ARMMMUIdx_S12NSE1) {
/* TODO: when we support EL2 we should here call ourselves recursively /* TODO: when we support EL2 we should here call ourselves recursively
@ -6540,13 +6546,13 @@ static bool get_phys_addr(CPUARMState *env, target_ulong address,
if (regime_using_lpae_format(env, mmu_idx)) { if (regime_using_lpae_format(env, mmu_idx)) {
return get_phys_addr_lpae(env, address, access_type, mmu_idx, phys_ptr, return get_phys_addr_lpae(env, address, access_type, mmu_idx, phys_ptr,
attrs, prot, page_size, fsr); attrs, prot, page_size, fsr, fi);
} else if (regime_sctlr(env, mmu_idx) & SCTLR_XP) { } else if (regime_sctlr(env, mmu_idx) & SCTLR_XP) {
return get_phys_addr_v6(env, address, access_type, mmu_idx, phys_ptr, return get_phys_addr_v6(env, address, access_type, mmu_idx, phys_ptr,
attrs, prot, page_size, fsr); attrs, prot, page_size, fsr, fi);
} else { } else {
return get_phys_addr_v5(env, address, access_type, mmu_idx, phys_ptr, return get_phys_addr_v5(env, address, access_type, mmu_idx, phys_ptr,
prot, page_size, fsr); prot, page_size, fsr, fi);
} }
} }
@ -6555,7 +6561,8 @@ static bool get_phys_addr(CPUARMState *env, target_ulong address,
* fsr with ARM DFSR/IFSR fault register format value on failure. * fsr with ARM DFSR/IFSR fault register format value on failure.
*/ */
bool arm_tlb_fill(CPUState *cs, vaddr address, bool arm_tlb_fill(CPUState *cs, vaddr address,
int access_type, int mmu_idx, uint32_t *fsr) int access_type, int mmu_idx, uint32_t *fsr,
ARMMMUFaultInfo *fi)
{ {
CPUARMState *env = cs->env_ptr; CPUARMState *env = cs->env_ptr;
hwaddr phys_addr; hwaddr phys_addr;
@ -6565,7 +6572,7 @@ bool arm_tlb_fill(CPUState *cs, vaddr address,
MemTxAttrs attrs = {0}; MemTxAttrs attrs = {0};
ret = get_phys_addr(env, address, access_type, mmu_idx, &phys_addr, ret = get_phys_addr(env, address, access_type, mmu_idx, &phys_addr,
&attrs, &prot, &page_size, fsr); &attrs, &prot, &page_size, fsr, fi);
if (!ret) { if (!ret) {
/* Map a single [sub]page. */ /* Map a single [sub]page. */
@ -6589,9 +6596,10 @@ hwaddr arm_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
bool ret; bool ret;
uint32_t fsr; uint32_t fsr;
MemTxAttrs attrs = {0}; MemTxAttrs attrs = {0};
ARMMMUFaultInfo fi = {0};
ret = get_phys_addr(env, addr, 0, cpu_mmu_index(env, false), &phys_addr, ret = get_phys_addr(env, addr, 0, cpu_mmu_index(env, false), &phys_addr,
&attrs, &prot, &page_size, &fsr); &attrs, &prot, &page_size, &fsr, &fi);
if (ret) { if (ret) {
return -1; return -1;

15
qemu/target-arm/internals.h
View file

@ -416,8 +416,21 @@ bool arm_is_psci_call(ARMCPU *cpu, int excp_type);
void arm_handle_psci_call(ARMCPU *cpu); void arm_handle_psci_call(ARMCPU *cpu);
#endif #endif
/**
* ARMMMUFaultInfo: Information describing an ARM MMU Fault
* @s2addr: Address that caused a fault at stage 2
* @stage2: True if we faulted at stage 2
* @s1ptw: True if we faulted at stage 2 while doing a stage 1 page-table walk
*/
typedef struct ARMMMUFaultInfo ARMMMUFaultInfo;
struct ARMMMUFaultInfo {
target_ulong s2addr;
bool stage2;
bool s1ptw;
};
/* Do a page table walk and add page to TLB if possible */ /* Do a page table walk and add page to TLB if possible */
bool arm_tlb_fill(CPUState *cpu, vaddr address, int rw, int mmu_idx, bool arm_tlb_fill(CPUState *cpu, vaddr address, int rw, int mmu_idx,
uint32_t *fsr); uint32_t *fsr, ARMMMUFaultInfo *fi);
#endif #endif

3
qemu/target-arm/op_helper.c
View file

@ -83,8 +83,9 @@ void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
{ {
bool ret; bool ret;
uint32_t fsr = 0; uint32_t fsr = 0;
ARMMMUFaultInfo fi = {0};
ret = arm_tlb_fill(cs, addr, is_write, mmu_idx, &fsr); ret = arm_tlb_fill(cs, addr, is_write, mmu_idx, &fsr, &fi);
if (unlikely(ret)) { if (unlikely(ret)) {
ARMCPU *cpu = ARM_CPU(cs->uc, cs); ARMCPU *cpu = ARM_CPU(cs->uc, cs);
CPUARMState *env = &cpu->env; CPUARMState *env = &cpu->env;