From patchwork Fri Oct 10 16:03:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 38616 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 53DE1205D8 for ; Fri, 10 Oct 2014 16:18:53 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id gq15sf2291870lab.3 for ; Fri, 10 Oct 2014 09:18:52 -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=Gx/1eeSF4Lw/chFpvjBhUjdIGD1u33YtmTY9623Epjo=; b=TlLe2Kqb2D2w+jxT7S8YKMzq5o3R7aWHZzQXy/UrIvuXUTtYAv4ZAx15P0q8MnMg0G ENDCzqAOie/mrpyrXoOP6iEmyp4cgy/6PRa+ax+L/tUSKEOhjdCadjJnc/UoPHI8liCB orQ/6oLEIGqoWLwTfL5L3AFMbiy75GvtBW/iV7gIue4KGEGux2XF4XyWYbQiwUx/6Eok sF+TfEOZ1rje837pVpfbh2QE641T7svhWPvqFlP3XbSEuSsV6yYAdfrJogUQHEC5+Drm itsN3rv5bz2LlLxDmteJ+kqjqCqj6DXdi2un7vJMgo6Dv8N3Zu43jMhgTM4WIkflvZfz BRAA== X-Gm-Message-State: ALoCoQmIfmASnJ/6HYPQ8UwZgG18BWAKcjL6e+XMBnQ6uSGF8IFyiYK9myDnyBBnWXoBkFDzTc7Y X-Received: by 10.112.52.165 with SMTP id u5mr810380lbo.12.1412957929060; Fri, 10 Oct 2014 09:18:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.52 with SMTP id o20ls61226laa.3.gmail; Fri, 10 Oct 2014 09:18:48 -0700 (PDT) X-Received: by 10.112.144.228 with SMTP id sp4mr5874720lbb.54.1412957928918; Fri, 10 Oct 2014 09:18:48 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com [209.85.217.178]) by mx.google.com with ESMTPS id li6si9974542lbc.87.2014.10.10.09.18.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:18:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id w7so3403638lbi.37 for ; Fri, 10 Oct 2014 09:18:48 -0700 (PDT) X-Received: by 10.152.7.145 with SMTP id j17mr5849436laa.67.1412957928409; Fri, 10 Oct 2014 09:18:48 -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 c5csp458548lbz; Fri, 10 Oct 2014 09:18:47 -0700 (PDT) X-Received: by 10.202.226.2 with SMTP id z2mr1941515oig.103.1412957927167; Fri, 10 Oct 2014 09:18:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g21si11626228qge.128.2014.10.10.09.18.46 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:18:47 -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]:49547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccty-0005PI-7R for patch@linaro.org; Fri, 10 Oct 2014 12:18:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccft-0006zZ-MK for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xccfo-000837-Q7 for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:13 -0400 Received: from mail-oi0-f42.google.com ([209.85.218.42]:56395) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xccfo-00082u-L4 for qemu-devel@nongnu.org; Fri, 10 Oct 2014 12:04:08 -0400 Received: by mail-oi0-f42.google.com with SMTP id a141so7143671oig.29 for ; Fri, 10 Oct 2014 09:04:08 -0700 (PDT) X-Received: by 10.202.132.17 with SMTP id g17mr1353170oid.119.1412957048301; Fri, 10 Oct 2014 09:04:08 -0700 (PDT) Received: from gbellows-linaro.bellowshome.net (99-179-1-128.lightspeed.austtx.sbcglobal.net. [99.179.1.128]) by mx.google.com with ESMTPSA id d6sm5382455obt.12.2014.10.10.09.04.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 09:04:07 -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: Fri, 10 Oct 2014 11:03:25 -0500 Message-Id: <1412957023-11105-15-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1412957023-11105-1-git-send-email-greg.bellows@linaro.org> References: <1412957023-11105-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.218.42 Subject: [Qemu-devel] [PATCH v6 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.217.178 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 f709b4a..a831b40 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