From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhoXx-0004iB-Da for qemu-devel@nongnu.org; Thu, 01 Oct 2015 20:50:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZhoXv-0000jr-GD for qemu-devel@nongnu.org; Thu, 01 Oct 2015 20:50:01 -0400 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]:35116) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhoXv-0000jj-Bc for qemu-devel@nongnu.org; Thu, 01 Oct 2015 20:49:59 -0400 Received: by pacfv12 with SMTP id fv12so91944816pac.2 for ; Thu, 01 Oct 2015 17:49:59 -0700 (PDT) From: "Edgar E. Iglesias" Date: Thu, 1 Oct 2015 17:49:28 -0700 Message-Id: <1443746968-9389-9-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1443746968-9389-1-git-send-email-edgar.iglesias@gmail.com> References: <1443746968-9389-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH v2 8/8] target-arm: Add support for S1 + S2 MMU translations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: edgar.iglesias@xilinx.com, serge.fdrv@gmail.com, alex.bennee@linaro.org, agraf@suse.de From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- target-arm/helper.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 2d1532a..113d6f3 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -7024,14 +7024,44 @@ static bool get_phys_addr(CPUARMState *env, target_ulong address, ARMMMUFaultInfo *fi) { if (mmu_idx == ARMMMUIdx_S12NSE0 || mmu_idx == ARMMMUIdx_S12NSE1) { - /* TODO: when we support EL2 we should here call ourselves recursively - * to do the stage 1 and then stage 2 translations. The arm_ld*_ptw - * 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. + /* Call ourselves recursively to do the stage 1 and then stage 2 + * translations. */ - assert(!arm_feature(env, ARM_FEATURE_EL2)); - mmu_idx += ARMMMUIdx_S1NSE0; + if (arm_feature(env, ARM_FEATURE_EL2)) { + 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)) { + if (ret && fi->stage2) { + /* This is a S2 error while doing S1 PTW. */ + env->cp15.hpfar_el2 = extract64(fi->s2addr, 12, 47) << 4; + } + *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); + if (ret) { + env->cp15.hpfar_el2 = extract64(ipa, 12, 47) << 4; + } + /* 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 -- 1.9.1