From patchwork Mon Feb 20 23:26:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 655137 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1661563wrc; Mon, 20 Feb 2023 15:28:03 -0800 (PST) X-Google-Smtp-Source: AK7set+ijlrXI6p3ZgL2Kx5+13P8KW7QICRYJVI5UyuRF+GCoH6vzgEM0ocfFM2fJtvM40EA/xut X-Received: by 2002:a05:6214:248c:b0:56e:99f2:1b91 with SMTP id gi12-20020a056214248c00b0056e99f21b91mr3663364qvb.23.1676935683832; Mon, 20 Feb 2023 15:28:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676935683; cv=none; d=google.com; s=arc-20160816; b=ZCByUc3FR8wP2TH6+xWMqWpArajp6bkDYC0VyHR0x9MyxUtSMuBVB9AfKIPSFhBlOg U0LODU5st20AEO+uJJ6fpClCLPF7H0GAFFKC52cmlmq5o2vX17DVo8OufnETNx1Axu4J Jazvrso6u1sqIaiFCT5FmEjdZBCGzaHdnfrYiBOdQnJ6y2pT8z1h981/M6PSjXyI73yR bvnjGGLlVONuFBFWfTuvoRLISaL6bD2jfBV96OkAi+Tsja0p8KRy1qOUJXOu5Y+yzxRq MgLIvEHlWMAH2Cjp4sDvo+mjdPnIkp+0JPWdNSPDUvxHUnKnw+6Uf0saxhwN3hcs6gmk SQzQ== 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:cc:to :from:dkim-signature; bh=mH7WMawWeBvYR6Z0Haoxdyec8KWtOPSKDJkaIsK10I4=; b=NXIFPriXyfkl/LogO01cIyUKyP/tOTBnjlS9LSabLx9Xx5JyEzMwf6qTo5MFccxyym k923QENqjn8AQvbo/1X3em7FsNbu+OazDLNbR07/M+pKRvqTIfchkfa61wlcTCq/0Xff KAVZuZuC3MsG8YPC1dliumKqgDk461TAl1wmd3OSbwFJJblg/YeQZ9NPWKEDMAUw8s9U g7kMqnkpNuM5RAigLJSJbYSJLnyPoFTiO4jFO5vfPC1DdhjcT0/uG7kZI2WFiUtDvmDn ANmKL1Jg4n/9HuqM6b0eb62wzpTx5k7rAT+RnmY0Z6LdcGtfc5G09g/g1USKg8FLJE9H YElg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nvVlE274; 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 dm38-20020a05620a1d6600b006fca83b669dsi10251523qkb.61.2023.02.20.15.28.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Feb 2023 15:28:03 -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=nvVlE274; 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 1pUFYQ-0003jT-2H; Mon, 20 Feb 2023 18:26:42 -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 1pUFYO-0003hz-NU for qemu-devel@nongnu.org; Mon, 20 Feb 2023 18:26:40 -0500 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUFYN-0000JI-30 for qemu-devel@nongnu.org; Mon, 20 Feb 2023 18:26:40 -0500 Received: by mail-pj1-x1029.google.com with SMTP id o16so2898252pjp.3 for ; Mon, 20 Feb 2023 15:26:38 -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=mH7WMawWeBvYR6Z0Haoxdyec8KWtOPSKDJkaIsK10I4=; b=nvVlE274/tK3ExBcRxUCRMfxZtDgtaXLidNuM/h88+aFHH42rv7txuXLvJPi9QU3wp ST3DgC+FuSc9yh1ld89cVh8o5MzK4ChA+tekjIZtUTZMgjePQEXcsVExbfOk3wkgPjR6 szfXtyxk6/gBYsYUgJhNnK74rj5n2OMRlsp2ByKYR3+j4/3oYY3a33LB5HlZfmd7CttQ E19d0y8QLxc+Fn6AGFhR5OgB395ccd2I0JvbuZ+yg5OjyDEIqzQow16l2Sgu/dW6gC9+ NDl6gvlS0FYXm5FpT++5WMa/v32hP4GbcesMDaNh/Zv5vsQj2dfTAMasFn6EBUjGaEgU ev0Q== 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=mH7WMawWeBvYR6Z0Haoxdyec8KWtOPSKDJkaIsK10I4=; b=ldRfqjNF6JHUuZdgD9R7b82vObrJDTHuAubhrEBCGk18t+5VOVIiwdme31wD8sZzHl jmnHYMDRs2yMKmyMCysD0wCCtlYTZvOPYB+f+DMTOnXxOI8pFLF4Rm9PDYgVHpjowHhN d5HqgecPFinvYkJllL4i69VYLngr4LVGMprSYkMUUyrboat62qUcqqfWm74sg3yonJVd rUzcfLnk3sJEijzgBYDaFrDiLNwEOdPZxa8vhHpbwhRzwV9UYtOB09m5B5V0Gkvadyve zkjRTBEZhsdtLKqxeXkI1F+RvQCOwRhXgFC/SGvVLrxppTryOTd2qmDzY18eBpHwHun1 vShQ== X-Gm-Message-State: AO0yUKUTiBPeKwDsQKOXqmVvS2X0FtX+iN8CTqGhD+8/2KFgggSjD04H fO96LqOlHc+GxKJPHfB7OflD249ZnWQdj3KdrE0= X-Received: by 2002:a17:903:2808:b0:19a:ea48:730c with SMTP id kp8-20020a170903280800b0019aea48730cmr1919079plb.46.1676935597252; Mon, 20 Feb 2023 15:26:37 -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 j10-20020a170902690a00b001992e74d058sm2665348plk.7.2023.02.20.15.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 15:26:36 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v2 04/21] target/arm: SCR_EL3.NS may be RES1 Date: Mon, 20 Feb 2023 13:26:09 -1000 Message-Id: <20230220232626.429947-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220232626.429947-1-richard.henderson@linaro.org> References: <20230220232626.429947-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.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=unavailable 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 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 --- target/arm/helper.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/arm/helper.c b/target/arm/helper.c index 42d94e0904..2ebca3e2b6 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;