Message ID | 20190118145805.6852-4-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 2d2a4549cc29850aab891495685a7b31f5254b12 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3360515jaa; Fri, 18 Jan 2019 07:07:18 -0800 (PST) X-Google-Smtp-Source: ALg8bN4h7UuuDsRpy+Xo5+wJBQpRKimXhhjQ5JeAFNZEtBMAytShhkvxFnF+D0yVlifDETiyIxfL X-Received: by 2002:adf:fd50:: with SMTP id h16mr18108857wrs.231.1547824038024; Fri, 18 Jan 2019 07:07:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547824038; cv=none; d=google.com; s=arc-20160816; b=Gus5H9KF5ilE2PrJ53X4R3MzfW3b0cylqTRPaIr3M4GoXNFJVPH3uk2ILzRaxH/gud /c0Pa101v9N2Xrx65v/7ZsfE6Ukauu/ygZrNRb7Uy2yR3i1D/bxbVyCi+koBd8njDf+v Ib2cJSo+fBWpmDIO0xdFwmvr1WwEnkIn/4tzEEozoYLfqveQOMtNky/31W4yRUFlenzy AbI5PsR8peT7ToZM4zRnv4X3NHXO8MopGWcGFIQXoEDkhUC1XdO6T9mt4E5ydi/IBkau AMXxoTfBT21luEgJ92JdFWJnISHrF6LyIX6Rp1/UaotPCnaKsT0o39pK259i7ZElQGtY pyeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=KReoh+u5g8Oa8ZifxcK1bluqHDtLDuUJyX4xs86Px+8=; b=TDAsDIVcO98lDDYo13lUfajAv2VRGUTeih8QZk2x7EVXcwMipnboe/mHXuGTY7rlNH S5Ccqy20tIjXohc5QInh0LsANYYej2Q0L5EfJTVF3Yjc25G2jj+Qoj9g60sQGpsPSvdX EVjbyRazlXlYSu+I0afIcI/ie40epsf5xOPNk5Yt4Fdt9kpR3n2brzJOYmpq0fZjEOxF aq2olTKNXCbIEh813WAxYqbxo6MPhnK3q1xw8pZJv0vYbUwOMvOkd+gdNJLV7vbw69CI L5aV8exoWxnQxWLNNPDLGpd7boXwXSWDf5UrM0wOuBcmj8MzIBvybi9WD1woQaUS8mfs lAgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IrHYOMie; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v17si32448280wrg.200.2019.01.18.07.07.17 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 Jan 2019 07:07:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IrHYOMie; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:41114 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gkVjo-0000Gk-RZ for patch@linaro.org; Fri, 18 Jan 2019 10:07:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gkVbC-0002YQ-Oo for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gkVb2-00076e-DZ for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:19 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38008) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gkVb2-00076F-71 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:12 -0500 Received: by mail-wr1-x434.google.com with SMTP id v13so15436166wrw.5 for <qemu-devel@nongnu.org>; Fri, 18 Jan 2019 06:58:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=KReoh+u5g8Oa8ZifxcK1bluqHDtLDuUJyX4xs86Px+8=; b=IrHYOMie17nAC3ezW3fWHtM79k5lq2zXFBwVzMSmpSpnOZpPhIPKKJfkPUeWNbUzvc pGUcvo2MMVM9IVg+uop/yU8cjfV9qHwZoDEDOs8cSblzbs3FNOa9VgssWzDdKvIUTrCi RWmYsTd8tNSyWoVNy4m5FFuNGdlTlkhLDtEzY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KReoh+u5g8Oa8ZifxcK1bluqHDtLDuUJyX4xs86Px+8=; b=g3TjG+1Sb1Ku91gbC0IfABZ+TUmNBEsbmc0SqE6dTiyqIr5d3T098BJJAy3YqNuQhb JRu7BNUXhqaS850xKdIGTmg/6kh/QoX0kwgy689mAJlg+sByN7DAfyVCOZBIA/10m5qU +0GCN7AKPcVIiQlEJx13WD0zXupilwshvp2pcgJM13h1Yr4vtk92SuLEd+RjVyHN48IU tYmSdrXgMHEIJm8kZRo/0ZJQHsCzLk3WfSkS29BvLvbYuRxpdei/18u7kpBm7k41fUnd hnkaN1osj3dWQcKiOToLkRCVJrihR6qnbn5UYBVGSbKnN8lvkD0UhZyK/JqpdwDCDCtV g7Pg== X-Gm-Message-State: AJcUukcJJrVa/L/6Rpkq+5Vjwu7Tm/+Jtb73ixfHGfOwnvKZ2Nv06bwd BAyr2beWYPQq/nT3rApThhUJ+YAFp9jp6A== X-Received: by 2002:a5d:47d1:: with SMTP id l17mr16598337wrs.319.1547823490979; Fri, 18 Jan 2019 06:58:10 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e27sm92094561wra.67.2019.01.18.06.58.09 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 06:58:10 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Fri, 18 Jan 2019 14:57:19 +0000 Message-Id: <20190118145805.6852-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118145805.6852-1-peter.maydell@linaro.org> References: <20190118145805.6852-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 03/49] target/arm: Allow Aarch32 exception return to switch from Mon->Hyp X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/target/arm/helper.c b/target/arm/helper.c index f00c141ef96..9bf8fbd8f9b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6297,7 +6297,7 @@ static int bad_mode_switch(CPUARMState *env, int mode, CPSRWriteType write_type) return 0; case ARM_CPU_MODE_HYP: return !arm_feature(env, ARM_FEATURE_EL2) - || arm_current_el(env) < 2 || arm_is_secure(env); + || arm_current_el(env) < 2 || arm_is_secure_below_el3(env); case ARM_CPU_MODE_MON: return arm_current_el(env) < 3; default: