From patchwork Wed Feb 22 02:33:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1746086 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=TfPmPXGZ; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PM0dK2vX7z23j7 for ; Wed, 22 Feb 2023 13:35:49 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUexP-0007Zd-Nk; Tue, 21 Feb 2023 21:34:11 -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 1pUex6-0007Jy-51 for qemu-devel@nongnu.org; Tue, 21 Feb 2023 21:33:55 -0500 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUex4-0001bT-MU for qemu-devel@nongnu.org; Tue, 21 Feb 2023 21:33:51 -0500 Received: by mail-pj1-x102b.google.com with SMTP id qi12-20020a17090b274c00b002341621377cso6969169pjb.2 for ; Tue, 21 Feb 2023 18:33:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eh6Hd17AKGFWk8yBVtARAQj9lZij9aVa5jyFKRWxRtQ=; b=TfPmPXGZysN96bsM6EUpb9vA4/oGjhgDcNfpnqvcf0aXTqa+LAflL68DYHumj/SCED 3TKYlpYwDyRuUU82kH2cMr+Zd5aYuvcJxZVIZqEo/ozIZQ8HxH3H/W/zojk9vTS6uM5Y 5+496PPOT1N27GKiFoxvMfeb/e9nbHCIqI90IDPYUJ7FX20Ge+KPc7QNhvM6FAXODn/Z iLAbIhX8H9i4Mp/ieSecEuCOtJ6kEOLVbVcZUe4+U3vmxJIMVDldfqC/pF8MDp2u1MMv Sdv998KI+vn7GVMhseZN3w9LNkCdlE56es/yVSVM4ZTmUcEfCDmUdc7jH2q82Qvgktuf +9pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eh6Hd17AKGFWk8yBVtARAQj9lZij9aVa5jyFKRWxRtQ=; b=RwoYZL9qMpaHU6c6RUhir0AoPIyMeBkdBIoOGxvkYbYfJPYrhHpZHw/6D/g/jIIk1u V5FgVrc1UF5mmgG6n2FyEFXyD+1boGwiNxh83zN1jyxYRNYac2jOCwWSQSFtSNpnYgZF PdvaMQ/bvkFawEVpdrdHWEa24oflum6MX2KHxnYe5TczD5PxR0TvAdKLoaKXQ5x4vkUi x6Q+if0zA26IB+kZrRl0Jn9TKgKTjy8iH8BF2cNJoPVLhkl/qr/WzF8Ni6FyzctsSO8O gG4meBp7l8w8u3FAPZlUbkhWOgYDLo72MbboH0O8WGnbghZa9Bosppk3jwX5+C//sVsx Kn3w== X-Gm-Message-State: AO0yUKViQwS5myo1tMLQCfbUoK91nxTRJyNvLF43c03hgdGWclANCR/r L96rgyPbIBJXnBGT5Y9Zrq9CU7NxAhTypSvq6iU= X-Google-Smtp-Source: AK7set/wVPROGO6CTRqRbRD/uZNkqtxA7DDBLiM4+vJa5couLmahcfO+8UcweL+AjqueJ/WoNN/mdg== X-Received: by 2002:a17:902:e545:b0:198:ec2c:d4e6 with SMTP id n5-20020a170902e54500b00198ec2cd4e6mr9377571plf.38.1677033229298; Tue, 21 Feb 2023 18:33:49 -0800 (PST) Received: from stoup.. (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id k3-20020a170902e90300b00198fde9178csm10520112pld.197.2023.02.21.18.33.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 18:33:48 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v3 07/25] target/arm: SCR_EL3.NS may be RES1 Date: Tue, 21 Feb 2023 16:33:18 -1000 Message-Id: <20230222023336.915045-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230222023336.915045-1-richard.henderson@linaro.org> References: <20230222023336.915045-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org With RME, SEL2 must also be present to support secure state. The NS bit is RES1 if SEL2 is not present. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/helper.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/arm/helper.c b/target/arm/helper.c index 3650234c73..ae8b3f6a48 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1856,6 +1856,9 @@ static void scr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) } if (cpu_isar_feature(aa64_sel2, cpu)) { valid_mask |= SCR_EEL2; + } else if (cpu_isar_feature(aa64_rme, cpu)) { + /* With RME and without SEL2, NS is RES1 (R_GSWWH, I_DJJQJ). */ + value |= SCR_NS; } if (cpu_isar_feature(aa64_mte, cpu)) { valid_mask |= SCR_ATA;