From patchwork Tue Oct 21 16:55:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 39173 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4FECC2039B for ; Tue, 21 Oct 2014 17:02:17 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf1099728lbv.4 for ; Tue, 21 Oct 2014 10:02:16 -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:cc: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=5w5MkN4Gc58aqo62EgMITe3WmGgUzrE6y2JZnRNtm3E=; b=XFYSyhg/8gH856CDDnQoUywz79XhBXoac4RQ1yCT+L4ljSJEohCwC9i+ZQIrAdVZw8 ndzoEraYRLIPlY7uNSKOAjMxye0U9TVh+n4TBRMC2Vun8l8MFhRsqxQlOxdib+SxcKF8 rqMLBOtJjFusHXSor6Hrq1xABX/9DoLCWjjHrEB8AXmaBPWnuBdQ5dMJ4tPFqneBW8cE XCNF9dXa+h0+Jogko1H0nUblzJbhCEk5AbvWbazcJG35jByndLwMkuwlZ9TPVI9Qywcx w8upIZYfna8oud+wvTr9E43takzBTo3J9COZjJHdsF0TMuaX3B65wBgO3wxLctKu7KrC 6xMQ== X-Gm-Message-State: ALoCoQl8a5ZHhzm4xKvpempwAwOTPBZFV0WN7ECkBmUP0bTocH/pbhZwMKSQJiAp/2o1PuVdhByb X-Received: by 10.112.95.133 with SMTP id dk5mr5384900lbb.3.1413910935908; Tue, 21 Oct 2014 10:02:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.167 with SMTP id uf7ls80515lac.100.gmail; Tue, 21 Oct 2014 10:02:15 -0700 (PDT) X-Received: by 10.112.140.8 with SMTP id rc8mr35695454lbb.2.1413910935671; Tue, 21 Oct 2014 10:02:15 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id i3si19889627lae.59.2014.10.21.10.02.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Oct 2014 10:02:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id gi9so1410927lab.5 for ; Tue, 21 Oct 2014 10:02:15 -0700 (PDT) X-Received: by 10.112.189.10 with SMTP id ge10mr35816291lbc.23.1413910935046; Tue, 21 Oct 2014 10:02:15 -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.84.229 with SMTP id c5csp541742lbz; Tue, 21 Oct 2014 10:02:14 -0700 (PDT) X-Received: by 10.140.88.70 with SMTP id s64mr1100403qgd.65.1413910933724; Tue, 21 Oct 2014 10:02:13 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id n69si23525078qga.24.2014.10.21.10.02.11 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 21 Oct 2014 10:02:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Received: from localhost ([::1]:52448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgcp0-0007CN-Sr for patch@linaro.org; Tue, 21 Oct 2014 13:02:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42087) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgcjD-0006ng-LF for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:56:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xgcj7-0006s8-9B for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:56:11 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:46758) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgcj7-0006s2-6K for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:56:05 -0400 Received: by mail-qc0-f174.google.com with SMTP id m20so1284085qcx.5 for ; Tue, 21 Oct 2014 09:56:04 -0700 (PDT) X-Received: by 10.140.34.208 with SMTP id l74mr19851734qgl.99.1413910564828; Tue, 21 Oct 2014 09:56:04 -0700 (PDT) Received: from gbellows-linaro.qualcomm.com ([67.52.129.61]) by mx.google.com with ESMTPSA id a3sm11122116qaa.49.2014.10.21.09.56.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Oct 2014 09:56:04 -0700 (PDT) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch Date: Tue, 21 Oct 2014 11:55:26 -0500 Message-Id: <1413910544-20150-15-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1413910544-20150-1-git-send-email-greg.bellows@linaro.org> References: <1413910544-20150-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.216.174 Cc: greg.bellows@linaro.org Subject: [Qemu-devel] [PATCH v7 14/32] target-arm: move AArch32 SCR into security reglist 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: greg.bellows@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.46 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: Fabian Aggeler Define a new ARM CP register info list for the ARMv7 Security Extension feature. Register that list only for ARM cores with Security Extension/EL3 support. Moving AArch32 SCR into Security Extension register group. Signed-off-by: Sergey Fedorov Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows ------------------ v4 -> v5 - Added reset value on SCR_EL3 - Squashed SCR Migration fix (previously patch 33) This patch adds code to mark duplicate CP register registrations as NO_MIGRATE to avoid duplicate migrations. v3 -> v4 - Renamed security_cp_reginfo to v7_el3_cp_reginfo - Conditionalized define on whether v7 or v8 were enabled Signed-off-by: Greg Bellows --- target-arm/helper.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 37cd389..bc82951 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -898,9 +898,6 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .access = PL1_RW, .writefn = vbar_write, .fieldoffset = offsetof(CPUARMState, cp15.vbar_el[1]), .resetvalue = 0 }, - { .name = "SCR", .cp = 15, .crn = 1, .crm = 1, .opc1 = 0, .opc2 = 0, - .access = PL1_RW, .fieldoffset = offsetoflow32(CPUARMState, cp15.scr_el3), - .resetvalue = 0, .writefn = scr_write }, { .name = "CCSIDR", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .crn = 0, .crm = 0, .opc1 = 1, .opc2 = 0, .access = PL1_R, .readfn = ccsidr_read, .type = ARM_CP_NO_MIGRATE }, @@ -2335,11 +2332,21 @@ static const ARMCPRegInfo v8_el3_cp_reginfo[] = { .access = PL3_RW, .writefn = vbar_write, .fieldoffset = offsetof(CPUARMState, cp15.vbar_el[3]), .resetvalue = 0 }, - { .name = "SCR_EL3", .state = ARM_CP_STATE_AA64, - .type = ARM_CP_NO_MIGRATE, + /* SCR will always be registered for v7, but not necessarily for v8, so + * this entry is marked to allow migration to be handled by the v7 + * registration instance. + */ + { .name = "SCR_EL3", .state = ARM_CP_STATE_AA64, .type = ARM_CP_NO_MIGRATE, .opc0 = 3, .opc1 = 6, .crn = 1, .crm = 1, .opc2 = 0, .access = PL3_RW, .fieldoffset = offsetof(CPUARMState, cp15.scr_el3), - .writefn = scr_write }, + .resetvalue = 0, .writefn = scr_write }, + REGINFO_SENTINEL +}; + +static const ARMCPRegInfo v7_el3_cp_reginfo[] = { + { .name = "SCR", .cp = 15, .crn = 1, .crm = 1, .opc1 = 0, .opc2 = 0, + .access = PL3_RW, .fieldoffset = offsetof(CPUARMState, cp15.scr_el3), + .resetvalue = 0, .writefn = scr_write}, REGINFO_SENTINEL }; @@ -2960,7 +2967,12 @@ void register_cp_regs_for_features(ARMCPU *cpu) } } if (arm_feature(env, ARM_FEATURE_EL3)) { - define_arm_cp_regs(cpu, v8_el3_cp_reginfo); + if (arm_feature(env, ARM_FEATURE_V8)) { + define_arm_cp_regs(cpu, v8_el3_cp_reginfo); + } + if (arm_feature(env, ARM_FEATURE_V7)) { + define_arm_cp_regs(cpu, v7_el3_cp_reginfo); + } } if (arm_feature(env, ARM_FEATURE_MPU)) { /* These are the MPU registers prior to PMSAv6. Any new