From patchwork Fri Jun 10 16:07:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 580609 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp1892856max; Fri, 10 Jun 2022 09:18:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjrxSWmUkC+o+8rYamyOHmzCmmAhFJWxvDSKszMM/Cqq95PulzO9bqBGxVfUrtJyIzLnB4 X-Received: by 2002:ac8:5dcd:0:b0:304:e489:f1e6 with SMTP id e13-20020ac85dcd000000b00304e489f1e6mr28480677qtx.357.1654877911168; Fri, 10 Jun 2022 09:18:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654877911; cv=none; d=google.com; s=arc-20160816; b=a47SCHL25Hgu0BMydqnMwYRp1GThxISAOAbZ6FYlb/zRgZR/LIxWoqH8ak4fiVXaoT 1fMAHD8u1/xLCAA1cOzMStS0p6X48Ykvjg+/Nf1lOB0VoFf5jP9V8N2fe2XkiyFqGqH6 YND7wMvB3C4C0j+6W1zUdIpdURYlUYcWaeMDC6stMNKM8lKImxs+AxG8yJoCTTEHWyTN ASxX2Ec8gw6QtpQ/yUdC6vif1m+Vl3u7f/sLlT13P2WQtz/wF5ecYYEhprZG+YOdjY2a ZQYKoQDAZ3hKWRrjbV6Qyg+H1fOcpjjVj+a9IUBVK8PpakSWPNF4Zh8c28tLE2h7XH29 DVew== 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=73I9mSJrfj4k0UebE4ABLGvyy06k/REBdeI0QA2SvRY=; b=X9kTboyBFsWniAUyg7Lvgx62pY15Add8VkxqInUSmPuAXx9tiQslcWJoUcgyQvY93H +PW2+yPhPqmJ28KuohqM2Gnaqc7iWE6Ad5Z26xgk0KtIT8OEtNcqh5jVJPKT0eN4tSOi mLwk+8pb0+k89i+m85pEUvYGCSgKKWb/MJ+qwLtj3u8DU+bNDJ1J2dhIQB+EtoPHoEYy HZFBUU9SYAHEewH+MxknrPsTlSKbT4g+vYBEc3ocI8J3Y7UQtwZbNaK1wtDj5sDElDi2 xwk782eO9w1g/9N1yVw328nrgSJJlb6EPrjZHVIVULBjp/4M0czWoi/W0lUFpzimGRBz vtVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="gU16C/hR"; 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 9-20020ac85909000000b00304f76a80a6si6591717qty.738.2022.06.10.09.18.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Jun 2022 09:18:31 -0700 (PDT) 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="gU16C/hR"; 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]:50962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzhLC-0000i6-Ky for patch@linaro.org; Fri, 10 Jun 2022 12:18:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzhBE-00089k-EK for qemu-devel@nongnu.org; Fri, 10 Jun 2022 12:08:12 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:40519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzhB7-0007IM-Ir for qemu-devel@nongnu.org; Fri, 10 Jun 2022 12:08:12 -0400 Received: by mail-wm1-x330.google.com with SMTP id j5-20020a05600c1c0500b0039c5dbbfa48so1356349wms.5 for ; Fri, 10 Jun 2022 09:08:04 -0700 (PDT) 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=73I9mSJrfj4k0UebE4ABLGvyy06k/REBdeI0QA2SvRY=; b=gU16C/hRF9+ZMUqcDr2hWmiSLj8MyVXhaZ668CS/QKMh66B0GoZQbfu7NY9PbodUsB 5OGQxPFACryDOSsl+IxiwfAgzXhFhwau2/zrQY0bUX6oh6MFjcKfSCzSCreCY8+PeNMm rVhXIYRjzl3IxBJJFzbZqYfB20XpCA6ilGuePKsUp4Fv/1tEVv7Ime4VICtMXEZCDSr/ ICnvkXyMRH+r7zhUKV87GDI9wPNg5b7ud8ugpXFBYIMKmfegahASb52N7pYZSwn0dSSD k9htR+PeLtVVpfUj5WSxTykjc8lbZVrs0pRir8zZCjJ+egWtEp+J7J60CEYLmuqDr1rm vTaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=73I9mSJrfj4k0UebE4ABLGvyy06k/REBdeI0QA2SvRY=; b=UPtU4ekJ3YmqVYr/ZrSnZUKzjMhvHr588jxZs2h3VIN3cccFhvrMswGnYYdWSC1WH3 d03yfk4i015biCKfKajWZjejPH6bx5pcgPJamg4UF8tvd/5miDVwiVwPOPVPWwqAp4uj 3iMsYr4wAc/n+vCSW5pcfiIMiSKO33eqnxI4536L5AWuCFO2vidsz7ETIloeeWXGZEN5 XXNEEWa8Mnwy1Q44/5YLsdGC/9XzB/YbLi3PN3efzZ4X4gdmklTlEs5js1L2BV7TEi1j KrjgHFk8cCNJjvLxGvxB7Xa4MNyoETSHsWvMwqJSikGCJTiR1kll72TvwAnyiBYcH5sN /oRw== X-Gm-Message-State: AOAM530BWexWkUID9fS6TBHbMC8Issua67DlZRqTbmN5YDAhze58IzQu Q2tF8Uc2/J8Zc0bqvMZYqIBJ6Xq4f8gtlg== X-Received: by 2002:a05:600c:583:b0:39c:3637:b9f with SMTP id o3-20020a05600c058300b0039c36370b9fmr445620wmd.79.1654877282949; Fri, 10 Jun 2022 09:08:02 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id bp11-20020a5d5a8b000000b0020c5253d926sm14276053wrb.114.2022.06.10.09.08.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jun 2022 09:08:02 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 26/28] target/arm: SCR_EL3.RW is RAO/WI without AArch32 EL[12] Date: Fri, 10 Jun 2022 17:07:36 +0100 Message-Id: <20220610160738.2230762-27-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220610160738.2230762-1-peter.maydell@linaro.org> References: <20220610160738.2230762-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 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" From: Richard Henderson Since DDI0487F.a, the RW bit is RAO/WI. When specifically targeting such a cpu, e.g. cortex-a76, it is legitimate to ignore the bit within the secure monitor. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1062 Signed-off-by: Richard Henderson Message-id: 20220609214657.1217913-3-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/cpu.h | 5 +++++ target/arm/helper.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 161ac9fa2ee..df677b2d5d2 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3854,6 +3854,11 @@ static inline bool isar_feature_aa64_aa32_el1(const ARMISARegisters *id) return FIELD_EX64(id->id_aa64pfr0, ID_AA64PFR0, EL1) >= 2; } +static inline bool isar_feature_aa64_aa32_el2(const ARMISARegisters *id) +{ + return FIELD_EX64(id->id_aa64pfr0, ID_AA64PFR0, EL2) >= 2; +} + static inline bool isar_feature_aa64_ras(const ARMISARegisters *id) { return FIELD_EX64(id->id_aa64pfr0, ID_AA64PFR0, RAS) != 0; diff --git a/target/arm/helper.c b/target/arm/helper.c index ff9f9fe6ee4..6457e6301cd 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1747,6 +1747,10 @@ static void scr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) value |= SCR_FW | SCR_AW; /* RES1 */ valid_mask &= ~SCR_NET; /* RES0 */ + if (!cpu_isar_feature(aa64_aa32_el1, cpu) && + !cpu_isar_feature(aa64_aa32_el2, cpu)) { + value |= SCR_RW; /* RAO/WI */ + } if (cpu_isar_feature(aa64_ras, cpu)) { valid_mask |= SCR_TERR; }