david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target-arm: Fix TTBR selecting logic on AArch32 Stage 2 translation

Browse Source 
Address size is 40-bit for the AArch32 stage 2 translation,
and t0sz can be negative (from -8 to 7),
so we need to adjust it to use the existing TTBR selecting logic.

Signed-off-by: Sergey Sorokin <afarallax@yandex.ru>
Message-id: 1464974151-1231644-1-git-send-email-afarallax@yandex.ru
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Sergey Sorokin 2016-06-06 16:59:32 +01:00 committed by Peter Maydell
parent e5fabad7cc
commit 6e99f76261
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
target-arm/helper.c
View File

@ -7279,7 +7279,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
target_ulong page_size; target_ulong page_size;
uint32_t attrs; uint32_t attrs;
int32_t stride = 9; int32_t stride = 9;
int32_t va_size; int32_t addrsize;
int inputsize; int inputsize;
int32_t tbi = 0; int32_t tbi = 0;
TCR *tcr = regime_tcr(env, mmu_idx); TCR *tcr = regime_tcr(env, mmu_idx);
@ -7287,6 +7287,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
uint32_t el = regime_el(env, mmu_idx); uint32_t el = regime_el(env, mmu_idx);
bool ttbr1_valid = true; bool ttbr1_valid = true;
uint64_t descaddrmask; uint64_t descaddrmask;
bool aarch64 = arm_el_is_aa64(env, el);
/* TODO: /* TODO:
* This code does not handle the different format TCR for VTCR_EL2. * This code does not handle the different format TCR for VTCR_EL2.
@ -7294,9 +7295,9 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
* Attribute and permission bit handling should also be checked when adding * Attribute and permission bit handling should also be checked when adding
* support for those page table walks. * support for those page table walks.
*/ */
if (arm_el_is_aa64(env, el)) { if (aarch64) {
level = 0; level = 0;
va_size = 64; addrsize = 64;
if (el > 1) { if (el > 1) {
if (mmu_idx != ARMMMUIdx_S2NS) { if (mmu_idx != ARMMMUIdx_S2NS) {
tbi = extract64(tcr->raw_tcr, 20, 1); tbi = extract64(tcr->raw_tcr, 20, 1);
@ -7318,7 +7319,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
} }
} else { } else {
level = 1; level = 1;
va_size = 32; addrsize = 32;
/* There is no TTBR1 for EL2 */ /* There is no TTBR1 for EL2 */
if (el == 2) { if (el == 2) {
ttbr1_valid = false; ttbr1_valid = false;
@ -7330,7 +7331,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
* This is a Non-secure PL0/1 stage 1 translation, so controlled by * This is a Non-secure PL0/1 stage 1 translation, so controlled by
* TTBCR/TTBR0/TTBR1 in accordance with ARM ARM DDI0406C table B-32: * TTBCR/TTBR0/TTBR1 in accordance with ARM ARM DDI0406C table B-32:
*/ */
if (va_size == 64) { if (aarch64) {
/* AArch64 translation. */ /* AArch64 translation. */
t0sz = extract32(tcr->raw_tcr, 0, 6); t0sz = extract32(tcr->raw_tcr, 0, 6);
t0sz = MIN(t0sz, 39); t0sz = MIN(t0sz, 39);
@ -7342,7 +7343,12 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
/* AArch32 stage 2 translation. */ /* AArch32 stage 2 translation. */
bool sext = extract32(tcr->raw_tcr, 4, 1); bool sext = extract32(tcr->raw_tcr, 4, 1);
bool sign = extract32(tcr->raw_tcr, 3, 1); bool sign = extract32(tcr->raw_tcr, 3, 1);
t0sz = sextract32(tcr->raw_tcr, 0, 4); /* Address size is 40-bit for a stage 2 translation,
* and t0sz can be negative (from -8 to 7),
* so we need to adjust it to use the TTBR selecting logic below.
*/
addrsize = 40;
t0sz = sextract32(tcr->raw_tcr, 0, 4) + 8;
/* If the sign-extend bit is not the same as t0sz[3], the result /* If the sign-extend bit is not the same as t0sz[3], the result
* is unpredictable. Flag this as a guest error. */ * is unpredictable. Flag this as a guest error. */
@ -7352,15 +7358,15 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
} }
} }
t1sz = extract32(tcr->raw_tcr, 16, 6); t1sz = extract32(tcr->raw_tcr, 16, 6);
if (va_size == 64) { if (aarch64) {
t1sz = MIN(t1sz, 39); t1sz = MIN(t1sz, 39);
t1sz = MAX(t1sz, 16); t1sz = MAX(t1sz, 16);
} }
if (t0sz && !extract64(address, va_size - t0sz, t0sz - tbi)) { if (t0sz && !extract64(address, addrsize - t0sz, t0sz - tbi)) {
/* there is a ttbr0 region and we are in it (high bits all zero) */ /* there is a ttbr0 region and we are in it (high bits all zero) */
ttbr_select = 0; ttbr_select = 0;
} else if (ttbr1_valid && t1sz && } else if (ttbr1_valid && t1sz &&
!extract64(~address, va_size - t1sz, t1sz - tbi)) { !extract64(~address, addrsize - t1sz, t1sz - tbi)) {
/* there is a ttbr1 region and we are in it (high bits all one) */ /* there is a ttbr1 region and we are in it (high bits all one) */
ttbr_select = 1; ttbr_select = 1;
} else if (!t0sz) { } else if (!t0sz) {
@ -7387,7 +7393,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
if (el < 2) { if (el < 2) {
epd = extract32(tcr->raw_tcr, 7, 1); epd = extract32(tcr->raw_tcr, 7, 1);
} }
inputsize = va_size - t0sz; inputsize = addrsize - t0sz;
tg = extract32(tcr->raw_tcr, 14, 2); tg = extract32(tcr->raw_tcr, 14, 2);
if (tg == 1) { /* 64KB pages */ if (tg == 1) { /* 64KB pages */
@ -7402,7 +7408,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
ttbr = regime_ttbr(env, mmu_idx, 1); ttbr = regime_ttbr(env, mmu_idx, 1);
epd = extract32(tcr->raw_tcr, 23, 1); epd = extract32(tcr->raw_tcr, 23, 1);
inputsize = va_size - t1sz; inputsize = addrsize - t1sz;
tg = extract32(tcr->raw_tcr, 30, 2); tg = extract32(tcr->raw_tcr, 30, 2);
if (tg == 3) { /* 64KB pages */ if (tg == 3) { /* 64KB pages */
@ -7414,7 +7420,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
} }
/* Here we should have set up all the parameters for the translation: /* Here we should have set up all the parameters for the translation:
* va_size, inputsize, ttbr, epd, stride, tbi * inputsize, ttbr, epd, stride, tbi
*/ */
if (epd) { if (epd) {
@ -7445,7 +7451,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
uint32_t startlevel; uint32_t startlevel;
bool ok; bool ok;
if (va_size == 32 || stride == 9) { if (!aarch64 || stride == 9) {
/* AArch32 or 4KB pages */ /* AArch32 or 4KB pages */
startlevel = 2 - sl0; startlevel = 2 - sl0;
} else { } else {
@ -7454,7 +7460,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
} }
/* Check that the starting level is valid. */ /* Check that the starting level is valid. */
ok = check_s2_mmu_setup(cpu, va_size == 64, startlevel, ok = check_s2_mmu_setup(cpu, aarch64, startlevel,
inputsize, stride); inputsize, stride);
if (!ok) { if (!ok) {
fault_type = translation_fault; fault_type = translation_fault;
@ -7475,7 +7481,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
* up to bit 39 for AArch32, because we don't need other bits in that case * up to bit 39 for AArch32, because we don't need other bits in that case
* to construct next descriptor address (anyway they should be all zeroes). * to construct next descriptor address (anyway they should be all zeroes).
*/ */
descaddrmask = ((1ull << (va_size == 64 ? 48 : 40)) - 1) & descaddrmask = ((1ull << (aarch64 ? 48 : 40)) - 1) &
~indexmask_grainsize; ~indexmask_grainsize;
/* Secure accesses start with the page table in secure memory and /* Secure accesses start with the page table in secure memory and
@ -7558,7 +7564,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
} else { } else {
ns = extract32(attrs, 3, 1); ns = extract32(attrs, 3, 1);
pxn = extract32(attrs, 11, 1); pxn = extract32(attrs, 11, 1);
*prot = get_S1prot(env, mmu_idx, va_size == 64, ap, ns, xn, pxn); *prot = get_S1prot(env, mmu_idx, aarch64, ap, ns, xn, pxn);
} }
fault_type = permission_fault; fault_type = permission_fault;