From patchwork Wed Nov 5 23:23:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 40248 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4E020240A6 for ; Wed, 5 Nov 2014 23:39:03 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id f15sf1116716lbj.7 for ; Wed, 05 Nov 2014 15:39:02 -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=cUCotcUPCMujELjZI5YGZkP5cgcncGtgYs4m739z4sY=; b=LEdJjqdoukr/Gy4V4TbvQH97FT6U7swrN8bAHVVXcQ8pZCXpwH1GvezHAiuE9Zvcf3 qYi4hE0Chv/g4gJbigj/69+xAe9rgtV3Y2adk3HpdcEEFOcsboyiPyY8bQ/3J0xXhbjo ia5vapw1AKBYXm92hW4MjRKcYcEfkm5Xv+2RT5EJuj+wfPsSpGrLxSV2Kze7Q6SujpHm IDUil1WievtNzMWeKjvn8u9fJUtlKGKLT3GYvbH+0Lp3kqZFdBrmhwrEZU24KA+pnXTf JgWkMK32KZt6+RQ73aa7livWwF5T1lfSTMOYR7TClDqmE6I+jnZxGW23Hk6jLQS1uQB0 lRxQ== X-Gm-Message-State: ALoCoQkN+z1Ln8INLAobVDrWVq+W61w9LS+m+E+8B54BoLjmUfLh1ozk9HSdi6tZ2dlJrAwkcakU X-Received: by 10.112.16.35 with SMTP id c3mr85609lbd.13.1415230742173; Wed, 05 Nov 2014 15:39:02 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.103 with SMTP id x7ls10420laj.37.gmail; Wed, 05 Nov 2014 15:39:01 -0800 (PST) X-Received: by 10.152.5.169 with SMTP id t9mr630561lat.90.1415230741654; Wed, 05 Nov 2014 15:39:01 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id ms6si8871102lbb.19.2014.11.05.15.39.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Nov 2014 15:39:01 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id q1so1641185lam.38 for ; Wed, 05 Nov 2014 15:39:01 -0800 (PST) X-Received: by 10.152.42.226 with SMTP id r2mr581477lal.29.1415230741203; Wed, 05 Nov 2014 15:39:01 -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 ew9csp372659lbc; Wed, 5 Nov 2014 15:39:00 -0800 (PST) X-Received: by 10.224.23.9 with SMTP id p9mr986598qab.92.1415230739841; Wed, 05 Nov 2014 15:38:59 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f8si9092468qag.41.2014.11.05.15.38.59 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 05 Nov 2014 15:38:59 -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]:49106 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmAAF-0004oY-1N for patch@linaro.org; Wed, 05 Nov 2014 18:38:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xm9vs-0004yz-H0 for qemu-devel@nongnu.org; Wed, 05 Nov 2014 18:24:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xm9vn-0004lG-4U for qemu-devel@nongnu.org; Wed, 05 Nov 2014 18:24:08 -0500 Received: from mail-pd0-f178.google.com ([209.85.192.178]:39137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xm9vm-0004lA-Vo for qemu-devel@nongnu.org; Wed, 05 Nov 2014 18:24:03 -0500 Received: by mail-pd0-f178.google.com with SMTP id fp1so1696205pdb.9 for ; Wed, 05 Nov 2014 15:24:02 -0800 (PST) X-Received: by 10.70.15.228 with SMTP id a4mr370282pdd.77.1415229841884; Wed, 05 Nov 2014 15:24:01 -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 r4sm4086349pdm.93.2014.11.05.15.24.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Nov 2014 15:24:01 -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, 5 Nov 2014 17:23:13 -0600 Message-Id: <1415229793-3278-27-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1415229793-3278-1-git-send-email-greg.bellows@linaro.org> References: <1415229793-3278-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.178 Cc: greg.bellows@linaro.org Subject: [Qemu-devel] [PATCH v9 26/26] 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.215.51 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 53b311a..4c36e2e 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -613,6 +613,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; @@ -699,6 +700,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; @@ -766,6 +768,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). @@ -833,6 +836,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;