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: 395324 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0D7011400F1 for ; Wed, 1 Oct 2014 07:51:23 +1000 (EST) Received: from localhost ([::1]:46540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ5KF-0001dY-Ft for incoming@patchwork.ozlabs.org; Tue, 30 Sep 2014 17:51:15 -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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ooBJa+9VHRFmXZm0X1Y1BmseCQ95RlvWiR4XJ0WRKZk=; b=Xl/hk66i78HUkbWJ/9bHvcu5psIth07FazTItni40IHRFehgqsETZzqKTwR9B4UmH1 o5Y5YGcu4S9JLwHU/ALAZSBIEM+wrNo+iWUeEs7tdfTvaHKMnDAcRKJ01FYXmLj2oLHI ieRXTLb8v032/3+MaIz04MkpIzlIxFU3PMbmPEJ/3HmfjYa7uaZbRbjayLOvDesBvuhD icznVpZ7+VXykUrFF8niJrGMtA21O7FJsZ7wvrCw3kLrRk8JnD0/ioynMRoPb72a09Ax A9qHClVpnllQOr61ggixkscHhAA59eFx1abg0rWeC/Gre66lHJMG6miqilHIfuHSswvt HilA== X-Gm-Message-State: ALoCoQlU/N66qV+Hf8otM2RusokRaLhlmlk5NRE4n1/jmG7h9sn272jehXojt+cItqHShsL6tzVI 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }