From patchwork Tue Oct 21 16:55:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 39187 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 17C2D2039B for ; Tue, 21 Oct 2014 17:12:08 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id d1sf1150851wiv.10 for ; Tue, 21 Oct 2014 10:12:02 -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=dGjZMLKRR51j1IS58t1uajhq9VssGpwSBP/hJv5Xh9E=; b=P3+W4JmeQfO8vPJixJXwwH3/bPrhGk4E3w+TRLZSP0kdCiK21QXpLqcbza2Fmx6LKc Nhu+peCNjYDCcDmLlM6hn1RkLp1FAVwHt7yJFIeyLB3IN4ymUCsWf+tUoyjXUk1V0nhj ECtTwYBWs3/hZ8UCQaKJn+bwP4brPL2YjzSxMA9c/QT8FDx9oJW/++HmXzFJ74cE8hjQ oX81YYxqGsgNRGZaKAsqPwT424aPwU9nvtsigBbEChTTLi1v/5aBfd2PvBaDZ1R2Z/w2 rurpbJmLmiyMaggwWpHponS7Titrw11rrIoJMRV5j8b3SwvFmCrYZt3YyTmZkfusiZh7 vAZw== X-Gm-Message-State: ALoCoQkcKczgQc7s9dt+G6M5bz9wyNCKb4eVPA17qd9y6Zx1Dc/dQtugNA7j429wxdUauOHWy6yt X-Received: by 10.180.75.133 with SMTP id c5mr3780446wiw.3.1413911522084; Tue, 21 Oct 2014 10:12:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.227 with SMTP id i3ls72703lae.28.gmail; Tue, 21 Oct 2014 10:12:01 -0700 (PDT) X-Received: by 10.112.147.225 with SMTP id tn1mr36272379lbb.37.1413911521931; Tue, 21 Oct 2014 10:12:01 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id ls3si19866983lac.126.2014.10.21.10.12.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Oct 2014 10:12:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id w7so1390403lbi.8 for ; Tue, 21 Oct 2014 10:12:01 -0700 (PDT) X-Received: by 10.152.6.228 with SMTP id e4mr36196403laa.71.1413911521652; Tue, 21 Oct 2014 10:12:01 -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 c5csp543611lbz; Tue, 21 Oct 2014 10:12:00 -0700 (PDT) X-Received: by 10.224.127.133 with SMTP id g5mr14543729qas.24.1413911520013; Tue, 21 Oct 2014 10:12:00 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l7si23529845qac.52.2014.10.21.10.11.56 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 21 Oct 2014 10:11:57 -0700 (PDT) Received-SPF: temperror (google.com: error in processing during lookup of qemu-devel-bounces+patch=linaro.org@nongnu.org: DNS timeout) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:52530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgcyS-0006Wy-8T for patch@linaro.org; Tue, 21 Oct 2014 13:11:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgcjS-0007Cp-J3 for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:56:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XgcjM-000729-Uf for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:56:26 -0400 Received: from mail-qc0-f169.google.com ([209.85.216.169]:60818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgcjM-00071n-Rg for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:56:20 -0400 Received: by mail-qc0-f169.google.com with SMTP id o8so1320961qcw.14 for ; Tue, 21 Oct 2014 09:56:20 -0700 (PDT) X-Received: by 10.224.61.7 with SMTP id r7mr48467300qah.9.1413910580407; Tue, 21 Oct 2014 09:56:20 -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.19 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Oct 2014 09:56:20 -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:44 -0500 Message-Id: <1413910544-20150-33-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.169 Cc: greg.bellows@linaro.org Subject: [Qemu-devel] [PATCH v7 32/32] 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.177 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 63573c6..1e93d7e 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -610,6 +610,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; @@ -696,6 +697,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; @@ -763,6 +765,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). @@ -830,6 +833,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;