From patchwork Tue Jun 2 16:33:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 49430 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 23E5B20BD1 for ; Tue, 2 Jun 2015 16:45:46 +0000 (UTC) Received: by wgme6 with SMTP id e6sf41765286wgm.3 for ; Tue, 02 Jun 2015 09:45:45 -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=U5gTQ+qKe/TuCVlyjySlAhDfx9QKZ6KL4s23TbmkLTQ=; b=eYEfJHOzXXcB06N/a4gGMtHCu/nbVoF9SVL2ubqvtKVz5Bc+wk7VHfMU+BYJkb9cYu d++0XMn7nUVLBeUFeE7aAO4Lc8Ub6ioLhBCELi94VEROw0sNKWsbKt4aUyXHG3q5Ut7W aZYUdGDPwiaQ3jemI3OqIc/pQT2R9mnPOiRfolu+srgPmCDq5C0Pk+TtRXKM5mjeUzlV Ad7ch0vvjFQ4kjdCWhomWOQ90sAT7XBlEeAmGh4mKowRlF5iTKY5Nsj798aOaBNZ8TiB bkrNj/QgaDxr3mqfOQ7jKl2Zj3xyNCj58rhpJYlmj+pn9Hw7rxRRhCWI6cJpci1dOBSi 5brw== X-Gm-Message-State: ALoCoQlJTqgzffGsQnwKCNybLZa7mAA6TBtKm6fgAizWiuNUYCpgfHpHQTZMNMVoaq1raRPLTlaJ X-Received: by 10.112.171.41 with SMTP id ar9mr26609849lbc.24.1433263545399; Tue, 02 Jun 2015 09:45:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.88.41 with SMTP id bd9ls640997lab.109.gmail; Tue, 02 Jun 2015 09:45:45 -0700 (PDT) X-Received: by 10.152.19.162 with SMTP id g2mr26973330lae.46.1433263545255; Tue, 02 Jun 2015 09:45:45 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id a4si3871686lae.4.2015.06.02.09.45.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2015 09:45:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbcue7 with SMTP id ue7so108365978lbc.0 for ; Tue, 02 Jun 2015 09:45:45 -0700 (PDT) X-Received: by 10.112.234.200 with SMTP id ug8mr26753575lbc.117.1433263545172; Tue, 02 Jun 2015 09:45:45 -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 hn6csp3204848lbb; Tue, 2 Jun 2015 09:45:44 -0700 (PDT) X-Received: by 10.55.22.130 with SMTP id 2mr50046141qkw.45.1433263543419; Tue, 02 Jun 2015 09:45:43 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e76si8174108qhc.43.2015.06.02.09.45.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 02 Jun 2015 09:45:43 -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]:59893 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzpJu-0008Rg-Lp for patch@linaro.org; Tue, 02 Jun 2015 12:45:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yzp8d-0001uB-Nb for qemu-devel@nongnu.org; Tue, 02 Jun 2015 12:34:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yzp8c-0000yw-2T for qemu-devel@nongnu.org; Tue, 02 Jun 2015 12:34:03 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yzp8b-0000r2-Im for qemu-devel@nongnu.org; Tue, 02 Jun 2015 12:34:01 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Yzp8S-00030W-Nv 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:32 +0100 Message-Id: <1433262832-11527-3-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 02/22] target-arm: Add MAIR_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.217.175 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-4-git-send-email-edgar.iglesias@gmail.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target-arm/helper.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index a0b414c..427cfab 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2517,6 +2517,13 @@ static const ARMCPRegInfo v8_el3_no_el2_cp_reginfo[] = { { .name = "CPTR_EL2", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 2, .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, + { .name = "MAIR_EL2", .state = ARM_CP_STATE_BOTH, + .opc0 = 3, .opc1 = 4, .crn = 10, .crm = 2, .opc2 = 0, + .access = PL2_RW, .type = ARM_CP_CONST, + .resetvalue = 0 }, + { .name = "HMAIR1", .state = ARM_CP_STATE_AA32, + .opc1 = 4, .crn = 10, .crm = 2, .opc2 = 1, + .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, REGINFO_SENTINEL }; @@ -2588,6 +2595,14 @@ static const ARMCPRegInfo v8_el2_cp_reginfo[] = { .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 2, .access = PL2_RW, .accessfn = cptr_access, .resetvalue = 0, .fieldoffset = offsetof(CPUARMState, cp15.cptr_el[2]) }, + { .name = "MAIR_EL2", .state = ARM_CP_STATE_BOTH, + .opc0 = 3, .opc1 = 4, .crn = 10, .crm = 2, .opc2 = 0, + .access = PL2_RW, .fieldoffset = offsetof(CPUARMState, cp15.mair_el[2]), + .resetvalue = 0 }, + { .name = "HMAIR1", .state = ARM_CP_STATE_AA32, + .opc1 = 4, .crn = 10, .crm = 2, .opc2 = 1, + .access = PL2_RW, .type = ARM_CP_ALIAS, + .fieldoffset = offsetofhigh32(CPUARMState, cp15.mair_el[2]) }, REGINFO_SENTINEL };