From patchwork Tue Sep 30 21:49:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 38183 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 8F3032032C for ; Tue, 30 Sep 2014 21:51:48 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id d1sf1937685wiv.2 for ; Tue, 30 Sep 2014 14:51:47 -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=ooBJa+9VHRFmXZm0X1Y1BmseCQ95RlvWiR4XJ0WRKZk=; b=nCKOTOPOlRKYWz/mj0IL8ATiqM904X68Tuj+37+XznheERiZLqfcgJAiHliercRctF 1zYw8yD2W/GneSXXMMYCUobNyV9sjTqu1UjFV2fDN2RR5RnPWW1MqfGo6MXo+hZJSMqI kLnhfnSRkWGMiA5gcDKb20UUDukY2W/x0ewJYcyKdplVJVXdvcE1ctlJKoF+Rw8EmiCR 1WzRHD4xvWqrs5O0UZ5duZxqacdmTLmIPpSCVeYPlpFVHRsRhyyTlQzAQc0ae74rp08V 9Xi2AW7JgQ9pYQ7x6MD5UAgi3ut21qnRSBnsfHX8UsHpmjGDP2lF7FfvkY7eZGjnupFO 1oyQ== X-Gm-Message-State: ALoCoQkCsZY9TZ+Pia3O4PK4WfHlD3BkDi1o5R8WpFaEHIqSmtHy1/TsXHqCwYS1EnLGyg9jnw9L X-Received: by 10.112.137.230 with SMTP id ql6mr1066455lbb.13.1412113907717; Tue, 30 Sep 2014 14:51:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.26.130 with SMTP id l2ls90864lag.45.gmail; Tue, 30 Sep 2014 14:51:47 -0700 (PDT) X-Received: by 10.112.130.226 with SMTP id oh2mr13304228lbb.100.1412113907584; Tue, 30 Sep 2014 14:51:47 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) by mx.google.com with ESMTPS id s2si24578261lbo.37.2014.09.30.14.51.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 14:51:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id gq15so3191834lab.26 for ; Tue, 30 Sep 2014 14:51:47 -0700 (PDT) X-Received: by 10.112.130.226 with SMTP id oh2mr13304220lbb.100.1412113907488; Tue, 30 Sep 2014 14:51:47 -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.130.169 with SMTP id of9csp429233lbb; Tue, 30 Sep 2014 14:51:47 -0700 (PDT) X-Received: by 10.180.206.230 with SMTP id lr6mr9075811wic.82.1412113906916; Tue, 30 Sep 2014 14:51:46 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id em19si14074841wjd.52.2014.09.30.14.51.46 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 30 Sep 2014 14:51:46 -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]:46540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5Kj-0001dY-Ki for patch@linaro.org; Tue, 30 Sep 2014 17:51:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5J9-0000HV-Iv for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZ5J2-0003Gh-PG for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:07 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:33147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5J2-0003FQ-BZ for qemu-devel@nongnu.org; Tue, 30 Sep 2014 17:50:00 -0400 Received: by mail-pa0-f42.google.com with SMTP id et14so2527908pad.1 for ; Tue, 30 Sep 2014 14:49:58 -0700 (PDT) X-Received: by 10.66.118.137 with SMTP id km9mr2668597pab.138.1412113798799; Tue, 30 Sep 2014 14:49:58 -0700 (PDT) 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 qy1sm16027662pbc.27.2014.09.30.14.49.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 14:49:58 -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, 30 Sep 2014 16:49:15 -0500 Message-Id: <1412113785-21525-4-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1412113785-21525-1-git-send-email-greg.bellows@linaro.org> References: <1412113785-21525-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.220.42 Cc: Sergey Fedorov , Greg Bellows Subject: [Qemu-devel] [PATCH v5 03/33] target-arm: reject switching to monitor mode 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.53 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: Sergey Fedorov ...from non-secure state. Signed-off-by: Sergey Fedorov Signed-off-by: Fabian Aggeler Reviewed-by: Edgar E. Iglesias Signed-off-by: Greg Bellows Reviewed-by: Peter Maydell --- target-arm/helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index 2669e15..d6e3b52 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3531,6 +3531,8 @@ static int bad_mode_switch(CPUARMState *env, int mode) case ARM_CPU_MODE_IRQ: case ARM_CPU_MODE_FIQ: return 0; + case ARM_CPU_MODE_MON: + return !arm_is_secure(env); default: return 1; }