From patchwork Mon Mar 6 15:34:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 659260 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1914819wrb; Mon, 6 Mar 2023 08:45:29 -0800 (PST) X-Google-Smtp-Source: AK7set86hbB2a2T72pBI2uM+wjM9c+YjuV5q99BV/qKR8v05ARkQtfkjOHGvLP9v0CBxqgEXr+RV X-Received: by 2002:ac8:5cd4:0:b0:3ad:202f:8797 with SMTP id s20-20020ac85cd4000000b003ad202f8797mr14187402qta.9.1678121128967; Mon, 06 Mar 2023 08:45:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678121128; cv=none; d=google.com; s=arc-20160816; b=tDxPdojJYWGHHS+zUHtwjF5mUpbTDBKFgIyXFAfhAJWGQHHfPJbwPw0mfCGpcq4Iph cOa4pSS5R37f02jzo5O00Twno17woS6KmQVim2rqiHC4ddWv2fsbxS8WqyfSBFGJJW18 TgIMlpat/xtOevpno1G5t6P2AIO89dAqZh4Q3K6+xUU6b6calseb8YluD0h7tpxk7cti queGcW4GXA//Y2kV+f3Em0rlXuvzKo8FIdvOWvsqemjkqukJ+RONfmmkVkreW3Ks+I2g UMyZUboOwsGLNsJ6BYzgavRGlCsIjTPQpCDFkeB8YWg3ZH/Wbh0mSnaToiq4jw1v08m7 0TVg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=u60JaY9ygpTLAXRdoEzrXQjDtvq2cbnHTzXyUO3Dx2k=; b=dK9US0+AoO+QfFIWO96zoyE7nSJbIR9K3JuBDw7jJnJ6Lx2lRy1MhzHIkU6kMmiH/J tiruQIUo0WII1B8Nx3ATd9rJYIvLcKGtiCuI2QmgdXN0kNnHx1aS25kknJ3eOMs8hQdg 8rNpPPcV2s3Mplo2/FSa5bIquN4UtMO+K9JeRqCpXDyCcNhSEigZd5Y/2fXgv+ZU+G+M LAeiAmtFsD/F7aA0rPxl8llWsEgXou7zQFv/4XjpNp3RKNVr0C8NqWmWLjFoZoSu4vN0 kXMn6kzQM1cTLCDTPKJIgWq681Ru1m3uOu1PFHCzpb8QHNMSyJJqilNXPXnTJuS4hD4s NfnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l+ngQyuN; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bl33-20020a05620a1aa100b00731114e2182si7872216qkb.236.2023.03.06.08.45.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Mar 2023 08:45:28 -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=pass header.i=@linaro.org header.s=google header.b=l+ngQyuN; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZCrV-00046a-8j; Mon, 06 Mar 2023 10:34:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZCrT-00045F-C2 for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:51 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZCrR-000289-Po for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:51 -0500 Received: by mail-wm1-x334.google.com with SMTP id o11-20020a05600c4fcb00b003eb33ea29a8so5452513wmq.1 for ; Mon, 06 Mar 2023 07:34:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678116889; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=u60JaY9ygpTLAXRdoEzrXQjDtvq2cbnHTzXyUO3Dx2k=; b=l+ngQyuN2Nkwv4wODitLUNgMP3+oHoTXVXjM2RmZK5t3vUmGLUJYB7LwgzKlkVykKK BdYjOqWuT6gTy5VdkdYPjLhmcndfgXqsDgDbyHx5Yd6OWiWupU95uJKMZdHakkcvVfb1 QHWJnhVwVlmi7c8wwbH4V+Fw6gy5iM2p8SBIUhiH+w+Zb26jFJvO42UWChtq4TKEwZu2 6yb9HKYbekiUKyZPCBfUqrk4zRbyAgzxPWXDRt6vxdeaMTMDgbEkY9UfZrYKxycxJuQg R1BGrxTckzsT6axfqMwO21zVEDk6kSMHhxutB4pw1FoQi0yTanBrFJqipN54rA3+bz8k Vmug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678116889; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u60JaY9ygpTLAXRdoEzrXQjDtvq2cbnHTzXyUO3Dx2k=; b=zGlsLfVSVOxpIIM9T1x3wzqQ7tSG/qUP9AjbweosqpO6275Zl30+trniFdnaDM/eCV 1jp7Ax7nkIBQ5qqVxEYFr7HEbVsRolwQjLiV42THl7wrHkp2HN3tmH1Xz6kITxX7CxjM dVTfiWlZl9gGAKbPkor3FyJOAJPzBLDy52e13rDS8vzDhJH2pChttGmpJo8M7eBbQ2zp A8mJTPmi/K5Kb7EJo2YFfVEgyiakmhA9emZXjLVcurUprmtDU0FeF11so0begNJXP6Zf GGOnSQnUKg5o3JislHhKAVS6IJ6seiubW2hJb8dwRUVPuYVBJJjzxY35DURZZjOQ+P/I 6QVg== X-Gm-Message-State: AO0yUKVSWnsS/reegbCumvzBZbmQxq43KHkhc7pTV/1Te5+ZjnVK8R57 k23mVXUjAjcBv5apGqH1pMXRjAsl7d9Z+byQkMg= X-Received: by 2002:a05:600c:35d5:b0:3eb:3945:d3fd with SMTP id r21-20020a05600c35d500b003eb3945d3fdmr9598810wmq.14.1678116889120; Mon, 06 Mar 2023 07:34:49 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v7-20020a05600c444700b003eb0d6f48f3sm15287432wmn.27.2023.03.06.07.34.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 07:34:48 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/21] target/arm: Handle m-profile in arm_is_secure Date: Mon, 6 Mar 2023 15:34:29 +0000 Message-Id: <20230306153435.490894-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306153435.490894-1-peter.maydell@linaro.org> References: <20230306153435.490894-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 From: Richard Henderson Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1421 Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20230227225832.816605-2-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index c4bd22808ce..ab187012770 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2421,6 +2421,9 @@ static inline bool arm_is_el3_or_mon(CPUARMState *env) /* Return true if the processor is in secure state */ static inline bool arm_is_secure(CPUARMState *env) { + if (arm_feature(env, ARM_FEATURE_M)) { + return env->v7m.secure; + } if (arm_is_el3_or_mon(env)) { return true; }