From patchwork Fri Jul 24 15:20:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 51451 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id 3A86C22D94 for ; Fri, 24 Jul 2015 15:21:07 +0000 (UTC) Received: by wilm20 with SMTP id m20sf7920285wil.2 for ; Fri, 24 Jul 2015 08:21:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=aqQYz0dZ8QK5bmKAbWWJshtHLOSBBXcSIU80Gl9N1PQ=; b=ADsGNUHvByXgopoGw9WaOOuG8g3N/VeAXb0FO9GMJj+fqrYtvUXeQ9p772eAVEvC3m +nKOSpbKAaNKgJr21xFJObhTjW8cbQBBb8vV/jPqv3pZMy0+A1+koHaNsDi+nTVtsJwl 0L9E3s+Vruq/zrxw0htIo/+mRer/Nqb0z+hIVj+wAToHzHDqqip3CmTBNpIRNgPwWFW7 2dpU2lsyXgcmVRx6Mq+W/H8LzMB46Zn3mLAytT8md3u3nTRtPtVV9mQdVRv6F5mHi8ih GRfoar8BsIDk2fXadIjtdC5wD7p57mnshNNWYHUTvG+Y6P7mJAjjnxKXe0Kkh/2D3AAN BYdA== X-Gm-Message-State: ALoCoQnzSsp1aSN0bEcRbFzzPox5ocYodEQrT0dzUdg6jU1971eEnhOrftZmctyxtLY0y7YJfDqH X-Received: by 10.152.120.69 with SMTP id la5mr6381220lab.7.1437751266497; Fri, 24 Jul 2015 08:21:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.73 with SMTP id y9ls352682lay.18.gmail; Fri, 24 Jul 2015 08:21:06 -0700 (PDT) X-Received: by 10.152.204.43 with SMTP id kv11mr14256237lac.15.1437751266354; Fri, 24 Jul 2015 08:21:06 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id l9si7805393lam.36.2015.07.24.08.21.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jul 2015 08:21:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by lahh5 with SMTP id h5so16136660lah.2 for ; Fri, 24 Jul 2015 08:21:06 -0700 (PDT) X-Received: by 10.152.120.135 with SMTP id lc7mr13920839lab.41.1437751266175; Fri, 24 Jul 2015 08:21:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.7.198 with SMTP id l6csp58107lba; Fri, 24 Jul 2015 08:21:05 -0700 (PDT) X-Received: by 10.194.87.4 with SMTP id t4mr30680208wjz.84.1437751265205; Fri, 24 Jul 2015 08:21:05 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id n5si15416997wjq.0.2015.07.24.08.21.04 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 24 Jul 2015 08:21:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZIemV-0005hx-BY; Fri, 24 Jul 2015 16:21:03 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Edgar E. Iglesias" Subject: [PATCH 1/5] target-arm: there is no TTBR1 for 32-bit EL2 stage 1 translations Date: Fri, 24 Jul 2015 16:20:59 +0100 Message-Id: <1437751263-21913-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1437751263-21913-1-git-send-email-peter.maydell@linaro.org> References: <1437751263-21913-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , For EL2 stage 1 translations, there is no TTBR1. We were already handling this for 64-bit EL2; add the code to take the 'no TTBR1' code path for 64-bit EL2 as well. Signed-off-by: Peter Maydell --- target-arm/helper.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index 01f0d0d..1ac6594 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5638,6 +5638,11 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, if (el > 1) { ttbr1_valid = false; } + } else { + /* There is no TTBR1 for EL2 */ + if (el == 2) { + ttbr1_valid = false; + } } /* Determine whether this address is in the region controlled by