From patchwork Tue Oct 21 16:55: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: 39167 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0DE592039B for ; Tue, 21 Oct 2014 16:58:30 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf1090723lbv.8 for ; Tue, 21 Oct 2014 09:58:29 -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=iGjngqAba02y6KtSGrKxmUpaTkG8GCPlP3+R5CTGoRw=; b=NUjI9QTL7kyZk6LsYDuJHF5+ZCV5b916NHmVyqw1sfWDeUtFOaHcMruzVW90uBJb+1 XBMienou03E/9dtVm5592dsjqSEv8g19iXlPAki2m7sNHDrsmygX05iNV0QVYVD3zXpc OD0LcvqwubJv7zmjY/QYGhgG5zREcjE3QmA7fLeoeSfkkzOIQqt3Mg+DYpKwwlKNqBhJ fkHJf4SMzFbavgy7eQ06oWAPF2nOd+n6wHTCwOge5el+Xourwcpq4kMBrZciU3Dxofhi KkYw1VWTQaaLbSMMBEhF/jRrs/m08BZ8v7AhGs0GefGf13QpMIVLJu7maQmzcAPoHc+s giwA== X-Gm-Message-State: ALoCoQm9IWmtzp1pN+r4n07X+ErjmwNZxzWFalAdLZEHiyntwQ++2KrFdezvk/8zJiCrHccuiYb5 X-Received: by 10.112.99.72 with SMTP id eo8mr1970139lbb.7.1413910709729; Tue, 21 Oct 2014 09:58:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.228 with SMTP id y4ls75892lae.76.gmail; Tue, 21 Oct 2014 09:58:29 -0700 (PDT) X-Received: by 10.112.95.133 with SMTP id dk5mr36693644lbb.53.1413910709426; Tue, 21 Oct 2014 09:58:29 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id d9si19858414lad.79.2014.10.21.09.58.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Oct 2014 09:58:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id hz20so1429377lab.39 for ; Tue, 21 Oct 2014 09:58:29 -0700 (PDT) X-Received: by 10.112.12.35 with SMTP id v3mr17925436lbb.80.1413910709052; Tue, 21 Oct 2014 09:58:29 -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.84.229 with SMTP id c5csp541019lbz; Tue, 21 Oct 2014 09:58:28 -0700 (PDT) X-Received: by 10.180.219.74 with SMTP id pm10mr31381755wic.22.1413910708295; Tue, 21 Oct 2014 09:58:28 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id bf5si15469709wjc.82.2014.10.21.09.58.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 21 Oct 2014 09:58:28 -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]:52416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgclO-0001Gl-CH for patch@linaro.org; Tue, 21 Oct 2014 12:58:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgcj4-0006dF-6Z for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:56:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xgciy-0006n1-9X for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:56:02 -0400 Received: from mail-qa0-f52.google.com ([209.85.216.52]:32976) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgciy-0006mv-58 for qemu-devel@nongnu.org; Tue, 21 Oct 2014 12:55:56 -0400 Received: by mail-qa0-f52.google.com with SMTP id dc16so1109173qab.25 for ; Tue, 21 Oct 2014 09:55:55 -0700 (PDT) X-Received: by 10.229.251.129 with SMTP id ms1mr39638033qcb.8.1413910554896; Tue, 21 Oct 2014 09:55:54 -0700 (PDT) Received: from gbellows-linaro.qualcomm.com ([67.52.129.61]) by mx.google.com with ESMTPSA id a3sm11122116qaa.49.2014.10.21.09.55.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Oct 2014 09:55:54 -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, 21 Oct 2014 11:55:15 -0500 Message-Id: <1413910544-20150-4-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1413910544-20150-1-git-send-email-greg.bellows@linaro.org> References: <1413910544-20150-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.216.52 Cc: greg.bellows@linaro.org Subject: [Qemu-devel] [PATCH v7 03/32] 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.52 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 Reject switching to monitor mode from non-secure state. Signed-off-by: Sergey Fedorov Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows Reviewed-by: Edgar E. Iglesias 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 d837820..c36ee6a 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; }