From patchwork Thu Jul 30 18:36:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 51724 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id 94FD222E7D for ; Thu, 30 Jul 2015 18:36:42 +0000 (UTC) Received: by lagw2 with SMTP id w2sf16721387lag.3 for ; Thu, 30 Jul 2015 11:36:41 -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=zakrwcTYlE5S5+CnCw2rVl+01MPqBst+CkrO1zzFTEw=; b=EvLj1xX/COUtojSCPEgdUAHP+KXNZCIUFgxL0OpnOkD4FNcTWZuo7tQG4twBZjqLLg 2siP3c2VfIWpXahinX/QAy8guraWZV6Y9az02x047GRyaNzuIPqYHe2NcQ8tMpP4a6UW 6ouHPNPLRpFV3eWqK78kZ3amQ59drNab84cXpkM8NMUmmP4ffwwX80xrZcW7MT5x5rZI lA4OHt3zEcJQeqG1bQrf0PGQXkO23CXHVYfztAMM5GGBe40DC1oEvBg/y3H060wSPj9D DicKH0TMB90oMKjpEzpW1KhJOTKbXij9Tmk2BLH3C+m6h59Dnt7qZBey5jTgAT5LY7dO 9ZOA== X-Gm-Message-State: ALoCoQmjVOgoUTfIrUIsLXv4JG3Qk/Z1qDkckGUGQJBn3nfngHztbBQFwmNHPxKIfuFeHGN5BpGp X-Received: by 10.112.122.42 with SMTP id lp10mr12217161lbb.5.1438281401554; Thu, 30 Jul 2015 11:36:41 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.120.198 with SMTP id le6ls198881lab.56.gmail; Thu, 30 Jul 2015 11:36:41 -0700 (PDT) X-Received: by 10.112.159.226 with SMTP id xf2mr41423013lbb.74.1438281401420; Thu, 30 Jul 2015 11:36:41 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id yk6si1470932lbb.90.2015.07.30.11.36.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jul 2015 11:36:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lagw2 with SMTP id w2so30419346lag.3 for ; Thu, 30 Jul 2015 11:36:41 -0700 (PDT) X-Received: by 10.152.4.163 with SMTP id l3mr46588410lal.35.1438281401320; Thu, 30 Jul 2015 11:36:41 -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 l6csp784783lba; Thu, 30 Jul 2015 11:36:40 -0700 (PDT) X-Received: by 10.194.236.161 with SMTP id uv1mr96406990wjc.158.1438281400454; Thu, 30 Jul 2015 11:36:40 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id bv5si443661wib.114.2015.07.30.11.36.40 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 30 Jul 2015 11:36:40 -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 1ZKsh4-0004ss-6s; Thu, 30 Jul 2015 19:36:38 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Edgar E. Iglesias" Subject: [PATCH 1/4] target-arm: Add missing MAIR_EL3 and TPIDR_EL3 registers Date: Thu, 30 Jul 2015 19:36:35 +0100 Message-Id: <1438281398-18746-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1438281398-18746-1-git-send-email-peter.maydell@linaro.org> References: <1438281398-18746-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.49 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: , Add the AArch64 registers MAIR_EL3 and TPIDR_EL3, which are the only two which we had implemented the 32-bit Secure equivalents of but not the 64-bit Secure versions. Signed-off-by: Peter Maydell --- target-arm/helper.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index 01f0d0d..d59616e 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1022,6 +1022,10 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .opc0 = 3, .opc1 = 0, .crn = 10, .crm = 2, .opc2 = 0, .access = PL1_RW, .fieldoffset = offsetof(CPUARMState, cp15.mair_el[1]), .resetvalue = 0 }, + { .name = "MAIR_EL3", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 6, .crn = 10, .crm = 2, .opc2 = 0, + .access = PL3_RW, .fieldoffset = offsetof(CPUARMState, cp15.mair_el[3]), + .resetvalue = 0 }, /* For non-long-descriptor page tables these are PRRR and NMRR; * regardless they still act as reads-as-written for QEMU. */ @@ -2790,6 +2794,10 @@ static const ARMCPRegInfo el3_cp_reginfo[] = { .opc0 = 3, .opc1 = 6, .crn = 1, .crm = 1, .opc2 = 2, .access = PL3_RW, .accessfn = cptr_access, .resetvalue = 0, .fieldoffset = offsetof(CPUARMState, cp15.cptr_el[3]) }, + { .name = "TPIDR_EL3", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 6, .crn = 13, .crm = 0, .opc2 = 2, + .access = PL3_RW, .resetvalue = 0, + .fieldoffset = offsetof(CPUARMState, cp15.tpidr_el[3]) }, REGINFO_SENTINEL };