From patchwork Mon Jun 30 23:09:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 32806 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D6712203F4 for ; Mon, 30 Jun 2014 23:13:34 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rd18sf56556995iec.6 for ; Mon, 30 Jun 2014 16:13:34 -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=WcFVCMZcFZdyyx+tVafXMa2f8pyg4rLXeDMXTGDWp4g=; b=dZym8u6JN2VyM+MqjGq2g0IIKVCMVSDfViVOxqgXGaEQZR3XYW80y2XC0FapenvLFe BfMGqhSRMVLki+b8dg1aEqQTU9gMzCwUDmkV+O2d/fVpyvy2nmjyZCD0joWtzpNabQ73 +6xy+bhlmC12qNpJg4jM1wAoHnjFiydzvjlwc0Io9fQBpGZhI4V52NLSen0WkzBRIhRc bOnybshlPQvmWKBSQkA3dlTK22syeFIxdMi3AMnb2Z/w3ozPL5kmu6eFHHk7mcveX0ye Wgb1B443zQsYfi8T/Z4ajmU2anhmRdpBh/zVJFpphR0CaSeVtV7xpyYy6sC72Oc1lOFM 0Snw== X-Gm-Message-State: ALoCoQltn6RmWI5wlGbbSlcaCcWtoHjguorWpZy+IdkVac77nFVT0ZjaqSWbH29m0o/nhHbTRCrb X-Received: by 10.182.255.225 with SMTP id at1mr24988654obd.29.1404170014212; Mon, 30 Jun 2014 16:13:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.34.196 with SMTP id l62ls1649667qgl.35.gmail; Mon, 30 Jun 2014 16:13:34 -0700 (PDT) X-Received: by 10.221.49.200 with SMTP id vb8mr27291603vcb.17.1404170014011; Mon, 30 Jun 2014 16:13:34 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id n1si10710227vem.71.2014.06.30.16.13.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 16:13:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id hy10so8197679vcb.31 for ; Mon, 30 Jun 2014 16:13:33 -0700 (PDT) X-Received: by 10.52.24.68 with SMTP id s4mr5097115vdf.37.1404170013916; Mon, 30 Jun 2014 16:13:33 -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.221.37.5 with SMTP id tc5csp174900vcb; Mon, 30 Jun 2014 16:13:33 -0700 (PDT) X-Received: by 10.224.63.194 with SMTP id c2mr64630549qai.21.1404170013102; Mon, 30 Jun 2014 16:13:33 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z94si27292783qge.6.2014.06.30.16.13.32 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 30 Jun 2014 16:13:33 -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]:37028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1klQ-0008L6-Ha for patch@linaro.org; Mon, 30 Jun 2014 19:13:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kic-0005Y7-KR for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1kiW-00038v-Kx for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:38 -0400 Received: from mail-ob0-f172.google.com ([209.85.214.172]:46006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kiW-00038Z-GI for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:32 -0400 Received: by mail-ob0-f172.google.com with SMTP id uy5so9734130obc.31 for ; Mon, 30 Jun 2014 16:10:31 -0700 (PDT) X-Received: by 10.60.124.162 with SMTP id mj2mr17072095oeb.22.1404169831720; Mon, 30 Jun 2014 16:10:31 -0700 (PDT) Received: from gbellows-linaro.bellowshome.net (99-179-1-128.lightspeed.austtx.sbcglobal.net. [99.179.1.128]) by mx.google.com with ESMTPSA id cu7sm76370192oec.12.2014.06.30.16.10.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 16:10:30 -0700 (PDT) From: greg.bellows@linaro.org To: qemu-devel@nongnu.org Date: Mon, 30 Jun 2014 18:09:05 -0500 Message-Id: <1404169773-20264-6-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1404169773-20264-1-git-send-email-greg.bellows@linaro.org> References: <1404169773-20264-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.214.172 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, Sergey Fedorov , Fabian Aggeler , Greg Bellows , serge.fdrv@gmail.com, edgar.iglesias@gmail.com, christoffer.dall@linaro.org Subject: [Qemu-devel] [PATCH v4 05/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.220.172 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 --- target-arm/helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index 1ea30fe..ed1e3c7 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3064,6 +3064,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; }