From patchwork Mon Dec 15 18:51:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 42288 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 CE5E32456A for ; Mon, 15 Dec 2014 19:01:27 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id gq15sf7688575lab.7 for ; Mon, 15 Dec 2014 11:01:26 -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=AN++mJOMzDJnKiqx/bWu/zhiR2xHZWJQL3KIKDazZ1o=; b=cRwPvV+nb5pDUjLc7iq5kZZr9Z3GyhmWU1rj8efhS1cYx4I/bKouUPyLFw/03oqmF/ FI4/P+j1MSurw3TSERb6c762dBuKn687PCGL/u6BasOTcsRPvA6YDQmjydI2plLM6/Tl TFeWSqZkiuqSEjATbrYN+se0Kx0I6CRE8EHTmmFZElhVtmyADbJO7/HZcsJ227b0f6eC BtKYNQmNfi0jzEqhuXtWK06I4vLL4+HyY4YodltNtWjPP9wlsB7Coe5HVFVTAH7/S9RL 28uolUU/O9RyaD8WPrU3dwK3PnKJmN8gFiXREwJMp+s2eJBxRePoGK5EkqZ7r3NDxRlp 7/UA== X-Gm-Message-State: ALoCoQnijvqHuhKWBNJlBBC8HM/2l6v2XxZ9civ4ZFl7W0J++UfyqHAxXK+YozH2XBrJFpnNE6mr X-Received: by 10.194.95.74 with SMTP id di10mr5001271wjb.0.1418670086713; Mon, 15 Dec 2014 11:01:26 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.7 with SMTP id f7ls268624laa.8.gmail; Mon, 15 Dec 2014 11:01:26 -0800 (PST) X-Received: by 10.112.172.194 with SMTP id be2mr4060808lbc.53.1418670086560; Mon, 15 Dec 2014 11:01:26 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id vh9si11271124lac.134.2014.12.15.11.01.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Dec 2014 11:01:26 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id p9so9475492lbv.7 for ; Mon, 15 Dec 2014 11:01:26 -0800 (PST) X-Received: by 10.112.138.137 with SMTP id qq9mr31653184lbb.80.1418670086129; Mon, 15 Dec 2014 11:01:26 -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.142.69 with SMTP id ru5csp810836lbb; Mon, 15 Dec 2014 11:01:25 -0800 (PST) X-Received: by 10.140.86.175 with SMTP id p44mr30101319qgd.54.1418670085184; Mon, 15 Dec 2014 11:01:25 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m3si9459681qao.39.2014.12.15.11.01.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Dec 2014 11:01:25 -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]:41536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0atY-000892-97 for patch@linaro.org; Mon, 15 Dec 2014 14:01:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0akS-0000x1-1V for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:52:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0akM-0005zW-NS for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:51:59 -0500 Received: from mail-pd0-f177.google.com ([209.85.192.177]:59942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0akM-0005zH-JC for qemu-devel@nongnu.org; Mon, 15 Dec 2014 13:51:54 -0500 Received: by mail-pd0-f177.google.com with SMTP id ft15so12013538pdb.8 for ; Mon, 15 Dec 2014 10:51:54 -0800 (PST) X-Received: by 10.66.119.193 with SMTP id kw1mr24959914pab.45.1418669513979; Mon, 15 Dec 2014 10:51:53 -0800 (PST) Received: from gbellows-linaro.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com. [67.52.129.61]) by mx.google.com with ESMTPSA id bq7sm9972513pdb.50.2014.12.15.10.51.52 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Dec 2014 10:51:53 -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: Mon, 15 Dec 2014 12:51:19 -0600 Message-Id: <1418669479-23908-16-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1418669479-23908-1-git-send-email-greg.bellows@linaro.org> References: <1418669479-23908-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.192.177 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v3 15/15] 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.176 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 Reviewed-by: Peter Maydell --- target-arm/cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 069e090..285947f 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -668,6 +668,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; @@ -756,6 +757,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; @@ -823,6 +825,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). @@ -890,6 +893,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;