From patchwork Wed Dec 3 20:06:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 41878 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 09A4725E88 for ; Wed, 3 Dec 2014 20:17:19 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id u10sf10036852lbd.10 for ; Wed, 03 Dec 2014 12:17:18 -0800 (PST) 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=POSNG53s21Dj/SI3S+U8dWsicTNn5ghKkYX/Y5ee2ag=; b=Uet1iiIhN+rDikjiOfv/w0VYZST/ITFtoqqjGUocR0RSIiPmEmIqK7/qu/7knSvyIk oTtFfBH8jzUmjvubKmUiVlL7M01Zqi8JeXX4oVUi5+6DR7rIVF0SfmHS9Uh3c8nx6N05 3EJa68Le9TQTfhaW+/MzUiAJ6nFyxjej2T0kRRTVbL+t4bE4n6lqAi2ZZwWkBU23YGnJ 29ej3xcxRXjWW16JzhaFCNrj0yIwK4ntdKFAQfs3pefegYoRzcH6B+az8b6csyE9i2Pp 0WUDrUAQg5it8QrgKXQ/Xjgv0dVVLzxWzfAkaJt0L2umXyotQh/MntE88zKwZZA/M5a4 nJog== X-Gm-Message-State: ALoCoQkv1ZYkMvvDb9Iy2Fs16UWxnNNfUVvNX8g0f5l+mAPv2Yc2nupz75uUQbBruEav6RsQh4ra X-Received: by 10.180.106.67 with SMTP id gs3mr16739956wib.3.1417637837955; Wed, 03 Dec 2014 12:17:17 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.74 with SMTP id q10ls206328laq.43.gmail; Wed, 03 Dec 2014 12:17:17 -0800 (PST) X-Received: by 10.152.203.137 with SMTP id kq9mr5851620lac.51.1417637837664; Wed, 03 Dec 2014 12:17:17 -0800 (PST) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id ku5si23996932lac.26.2014.12.03.12.17.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Dec 2014 12:17:17 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id p9so13046512lbv.28 for ; Wed, 03 Dec 2014 12:17:17 -0800 (PST) X-Received: by 10.153.7.170 with SMTP id dd10mr5930655lad.44.1417637837546; Wed, 03 Dec 2014 12:17:17 -0800 (PST) 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.184.201 with SMTP id ew9csp732331lbc; Wed, 3 Dec 2014 12:17:17 -0800 (PST) X-Received: by 10.194.179.166 with SMTP id dh6mr5976431wjc.87.1417637836514; Wed, 03 Dec 2014 12:17:16 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id qb10si41444716wjc.137.2014.12.03.12.17.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Dec 2014 12:17:16 -0800 (PST) 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]:43237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGMN-0004Pt-9O for patch@linaro.org; Wed, 03 Dec 2014 15:17:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGC4-0006u5-4d for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwGBy-0003aV-Ku for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:35 -0500 Received: from mail-oi0-f49.google.com ([209.85.218.49]:35983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGBy-0003aJ-Fv for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:30 -0500 Received: by mail-oi0-f49.google.com with SMTP id i138so11344146oig.22 for ; Wed, 03 Dec 2014 12:06:30 -0800 (PST) X-Received: by 10.202.188.85 with SMTP id m82mr4121097oif.26.1417637190149; Wed, 03 Dec 2014 12:06:30 -0800 (PST) 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 mq4sm11787321obb.22.2014.12.03.12.06.28 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Dec 2014 12:06:29 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch, peter.maydell@linaro.org Date: Wed, 3 Dec 2014 14:06:07 -0600 Message-Id: <1417637167-20640-14-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1417637167-20640-1-git-send-email-greg.bellows@linaro.org> References: <1417637167-20640-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.49 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH 13/13] target-arm: add cpu feature EL3 to CPUs with Security Extensions 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.169 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 Set ARM_FEATURE_EL3 feature for CPUs that implement Security Extensions. Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows --- target-arm/cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 0e660f9..9e8d40c 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -669,6 +669,7 @@ static void arm1176_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_CACHE_DIRTY_REG); set_feature(&cpu->env, ARM_FEATURE_CACHE_BLOCK_OPS); + set_feature(&cpu->env, ARM_FEATURE_EL3); cpu->midr = 0x410fb767; cpu->reset_fpsid = 0x410120b5; cpu->mvfr0 = 0x11111111; @@ -757,6 +758,7 @@ static void cortex_a8_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_NEON); set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); + set_feature(&cpu->env, ARM_FEATURE_EL3); cpu->midr = 0x410fc080; cpu->reset_fpsid = 0x410330c0; cpu->mvfr0 = 0x11110222; @@ -824,6 +826,7 @@ static void cortex_a9_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_VFP_FP16); set_feature(&cpu->env, ARM_FEATURE_NEON); set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); + set_feature(&cpu->env, ARM_FEATURE_EL3); /* Note that A9 supports the MP extensions even for * A9UP and single-core A9MP (which are both different * and valid configurations; we don't model A9UP). @@ -891,6 +894,7 @@ static void cortex_a15_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); set_feature(&cpu->env, ARM_FEATURE_LPAE); + set_feature(&cpu->env, ARM_FEATURE_EL3); cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A15; cpu->midr = 0x412fc0f1; cpu->reset_fpsid = 0x410430f0;