yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-24 22:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-arm: Add support for S1 + S2 MMU translations

Browse source 
Backports commit 9b539263faa5c1b7fce2551092b5c7b6eea92081 from qemu
This commit is contained in:
Edgar E. Iglesias 2018-02-17 13:43:45 -05:00 committed by Lioncash
parent 753a530ac8
commit 942c18ead7
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6547,14 +6547,38 @@ static bool get_phys_addr(CPUARMState *env, target_ulong address,
ARMMMUFaultInfo *fi) 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 /* Call ourselves recursively to do the stage 1 and then stage 2
* to do the stage 1 and then stage 2 translations. The arm_ld*_ptw * translations.
* functions will also need changing to perform ARMMMUIdx_S2NS loads
* rather than direct physical memory loads when appropriate.
* For non-EL2 CPUs a stage1+stage2 translation is just stage 1.
*/ */
assert(!arm_feature(env, ARM_FEATURE_EL2)); if (arm_feature(env, ARM_FEATURE_EL2)) {
mmu_idx += ARMMMUIdx_S1NSE0; hwaddr ipa;
int s2_prot;
int ret;
ret = get_phys_addr(env, address, access_type,
mmu_idx + ARMMMUIdx_S1NSE0, &ipa, attrs,
prot, page_size, fsr, fi);
/* If S1 fails or S2 is disabled, return early. */
if (ret || regime_translation_disabled(env, ARMMMUIdx_S2NS)) {
*phys_ptr = ipa;
return ret;
}
/* S1 is done. Now do S2 translation. */
ret = get_phys_addr_lpae(env, ipa, access_type, ARMMMUIdx_S2NS,
phys_ptr, attrs, &s2_prot,
page_size, fsr, fi);
fi->s2addr = ipa;
/* Combine the S1 and S2 perms. */
*prot &= s2_prot;
return ret;
} else {
/*
* For non-EL2 CPUs a stage1+stage2 translation is just stage 1.
*/
mmu_idx += ARMMMUIdx_S1NSE0;
}
} }
/* The page table entries may downgrade secure to non-secure, but /* The page table entries may downgrade secure to non-secure, but

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

@ -101,6 +101,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
target_el = exception_target_el(env); target_el = exception_target_el(env);
if (fi.stage2) { if (fi.stage2) {
target_el = 2; target_el = 2;
env->cp15.hpfar_el2 = extract64(fi.s2addr, 12, 47) << 4;
} }
same_el = arm_current_el(env) == target_el; same_el = arm_current_el(env) == target_el;
/* AArch64 syndrome does not have an LPAE bit */ /* AArch64 syndrome does not have an LPAE bit */