From patchwork Tue Jun 2 16:33:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 49426 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DF8A120BD1 for ; Tue, 2 Jun 2015 16:43:11 +0000 (UTC) Received: by labpg10 with SMTP id pg10sf13618387lab.2 for ; Tue, 02 Jun 2015 09:43:10 -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:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=r9UA0Lv3nc4MfbX6kyrlZ0RTSRoxPcyg/AhQaY8WEAI=; b=PO1milZuhvOlhNWlTJpKa+zkbPNxEJG8YKPyf9YHOi1XxkdvV/DpIIq+JqA27WvPFL 7enEK4hxmy3hV8pmhlSMlLSZO20EUmwZ+fD9VwK7fnE4YqIzAnk83IrlJ6fPNng61nfa YTYQLW/jLG7S0hlIVbxXGPZcTIugFezY2/unSH1/7BrJvLvyQ3DlLeHiXy4/FlvUzNVA OXxU3h9RlKw2fbRDiO+Ue86vZ40lIpaOxwZfoTeL5FGMo8N4RQ+foKPSuitMTBtm+9WR GXPhMHxnoPGMWWwrBMzXF+f98O9QkHBo2BJpLz/14hUEvDYEAlJVyPokEzBFNI88k5WC D6Hg== X-Gm-Message-State: ALoCoQl9Um9cCHYCl9kRexdBH1dYlY5h3oX0l2tR41CgyPs7K/n/ROoL0P+U4uBiKENeqldd0XH2 X-Received: by 10.112.161.105 with SMTP id xr9mr26593389lbb.20.1433263390860; Tue, 02 Jun 2015 09:43:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.10 with SMTP id p10ls831332lag.29.gmail; Tue, 02 Jun 2015 09:43:10 -0700 (PDT) X-Received: by 10.112.72.228 with SMTP id g4mr27039985lbv.90.1433263390712; Tue, 02 Jun 2015 09:43:10 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id k18si15547969lbh.10.2015.06.02.09.43.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2015 09:43:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by labpy14 with SMTP id py14so118349922lab.0 for ; Tue, 02 Jun 2015 09:43:10 -0700 (PDT) X-Received: by 10.152.36.161 with SMTP id r1mr27172902laj.88.1433263390616; Tue, 02 Jun 2015 09:43:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp3203413lbb; Tue, 2 Jun 2015 09:43:09 -0700 (PDT) X-Received: by 10.140.102.180 with SMTP id w49mr29512286qge.82.1433263389232; Tue, 02 Jun 2015 09:43:09 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j2si16313392qgj.3.2015.06.02.09.43.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 02 Jun 2015 09:43:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:59835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzpHQ-0002GS-9G for patch@linaro.org; Tue, 02 Jun 2015 12:43:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yzp8b-0001rf-NT for qemu-devel@nongnu.org; Tue, 02 Jun 2015 12:34:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yzp8a-0000xK-Kn for qemu-devel@nongnu.org; Tue, 02 Jun 2015 12:34:01 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yzp8a-0000r2-CG for qemu-devel@nongnu.org; Tue, 02 Jun 2015 12:34:00 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Yzp8S-00030s-UP for qemu-devel@nongnu.org; Tue, 02 Jun 2015 17:33:52 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 2 Jun 2015 17:33:36 +0100 Message-Id: <1433262832-11527-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1433262832-11527-1-git-send-email-peter.maydell@linaro.org> References: <1433262832-11527-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 06/22] target-arm: Add TTBR0_EL2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.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.43 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias Message-id: 1432881807-18164-8-git-send-email-edgar.iglesias@gmail.com [PMM: Switch to preferred opc1/crm order for 64-bit AArch32 cpregs; drop unneeded use of vmsa_ttbr_writefn] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target-arm/helper.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index 27cfd12..54c7041 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2533,6 +2533,12 @@ static const ARMCPRegInfo v8_el3_no_el2_cp_reginfo[] = { { .name = "TPIDR_EL2", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .opc1 = 4, .crn = 13, .crm = 0, .opc2 = 2, .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, + { .name = "TTBR0_EL2", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 4, .crn = 2, .crm = 0, .opc2 = 0, + .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, + { .name = "HTTBR", .cp = 15, .opc1 = 4, .crm = 2, + .access = PL2_RW, .type = ARM_CP_64BIT | ARM_CP_CONST, + .resetvalue = 0 }, REGINFO_SENTINEL }; @@ -2625,6 +2631,14 @@ static const ARMCPRegInfo v8_el2_cp_reginfo[] = { .opc0 = 3, .opc1 = 4, .crn = 13, .crm = 0, .opc2 = 2, .access = PL2_RW, .resetvalue = 0, .fieldoffset = offsetof(CPUARMState, cp15.tpidr_el[2]) }, + { .name = "TTBR0_EL2", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 4, .crn = 2, .crm = 0, .opc2 = 0, + .access = PL2_RW, .resetvalue = 0, + .fieldoffset = offsetof(CPUARMState, cp15.ttbr0_el[2]) }, + { .name = "HTTBR", .cp = 15, .opc1 = 4, .crm = 2, + .access = PL2_RW, .type = ARM_CP_64BIT | ARM_CP_ALIAS, + .resetvalue = 0, + .fieldoffset = offsetof(CPUARMState, cp15.ttbr0_el[2]) }, REGINFO_SENTINEL };