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: 401613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7991B140076 for ; Wed, 22 Oct 2014 04:01:45 +1100 (AEDT) Received: from localhost ([::1]:52448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgcoZ-0007CN-Bx for incoming@patchwork.ozlabs.org; Tue, 21 Oct 2014 13:01:43 -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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5w5MkN4Gc58aqo62EgMITe3WmGgUzrE6y2JZnRNtm3E=; b=gbNbMUkUg3Fdn6r83CZD6m6rKmxTTmSm3tbY/Ps2uh4U/hK7NGYh/dWKULQ16UrKQs h8YGph+OaD5nBH8vazbDCedTe1a+S+v6OFZSXdUVuiBMCt0WpAjbq6xuUx4thiqtxHXn 45UBnmT5459k3bTBuvcUyKxTU2jVhZkZ9ZSLe26eQAtJSKu2gq+akU3c8t4OUoeAente bO+QGwmqNxtsj+6ucqjJAEN72kk9xF/hZrtdzx/8dO265Fku7xc2YHcjCY1W2PFcuZ1y YsOe/rQfPCs7AMS51JtGimQA5ML7idAIYSuUVnxonzw+fuC97ktLhQcTplKXulxXuxv6 K1AA== X-Gm-Message-State: ALoCoQlrc5ybdJU6xT8MyKmDd99nfL4+gRPQQ7sfw8YOJeVb0cVbSlR2tSwM+38Qvtxh+mQ1E2aS 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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