From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4B615CCD19A for ; Mon, 17 Nov 2025 01:42:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vKoEi-0002Z4-L7; Sun, 16 Nov 2025 20:40:58 -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 1vKoEZ-0002VM-K8 for qemu-devel@nongnu.org; Sun, 16 Nov 2025 20:40:49 -0500 Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vKoEX-0005xE-NV for qemu-devel@nongnu.org; Sun, 16 Nov 2025 20:40:47 -0500 Received: by mail-qt1-x830.google.com with SMTP id d75a77b69052e-4eda6a8cc12so37261581cf.0 for ; Sun, 16 Nov 2025 17:40:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763343644; x=1763948444; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Ua3Vv1O2/qdb0xwse9RFkHNI0RUlYG2jHSbXkJRhi0w=; b=VP7N0YqgxTgZPl8kWTygAPADoioICZyXCI9m9WJCV2Cm2Y2Z/Jy4bDFah13AQF9vto 3w5sXwW09k6yFamBBoCpAp9s8JQRX5VMoHzPax3c+HZ1clNs3GwMeOE4Cx35pEAlXGMU APn3hQqaPt4WYz5ctpTF32z0GH8GAwzVN7BwyiB3RZAgvUN6R4HitOSAQrWJpJ9rIbnI EGJO6A+1IsyMUTUr0Ba1Zb3TZwJF0Xn3Z7FH4O2omaRComvife+nKiC3d4OujX3o1NPf HYPEGBs9sNp1SQ/BszOnh5TTvJtLAipg8R2RzJMyhlrV4VoPwDXBsTC6BKuXqLsQjFYm GYBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763343644; x=1763948444; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Ua3Vv1O2/qdb0xwse9RFkHNI0RUlYG2jHSbXkJRhi0w=; b=es+0viMCwrYjR26OJ0KSMELkoIh9QoIR2upMH6kigiW5xd7WrWLQ9WOMVv5+b+7AIe SKTqOsksYbA1RPf60BIypuQQRmwZJH1A32gw8j0flKTWi2QM4Nq9G4mM5Cjr3FRB49r7 WpJmHREXacukyTPB6KkUYdPljFKX9hA7VFXb8sQI0KE6uSzUlA/wKGyMTDyuIH2iTNy+ 5iPjGFlYQ/me0mgF20KreGdJUIziZot7bk6/BKZTSQvVGEPfxOGf7p5aTAGfbKj6Nlqs XC9q4M2lJG5BILur3m9POSTZI3qBtCSHNHuOs4dZLHDsc5357mNp3KDHvBik5G+HMEdK Tpew== X-Gm-Message-State: AOJu0YxOSPF5ezEVt8sGrG8JzDO5Mxb0KTx8ykbFYTR66AVt4uacwogH gwDehnEhz3pNexgDE5HK83HIPnf2QNqqobAWdY7iSxRZLTG8WxR0Wcqj X-Gm-Gg: ASbGncveaYk45BQ780uoiQavWkq07OR8pwcDcs9OLhsC96sjKFBJZX8fjsH+X5ohZCA Ftg+2ZMlXE5dxTg2eWx6YVsDhJGxVzyxOelf0L1xn142k4ry8QQU/JGKdBljbKpFhVPHA6kOe6X EHSVsK6D5JW+FUB4CtCHrd3IY75+pnleaFSAVneL1s8ACVzYxlQ9AkDBzV7YbG5Eo6cJYALl+Iz 0U1pZOUS43IfdxQFGfPDABdPpLzDhiTQV0ICXI+iYjPcFPlR5j0KNiiVpfNHpnEsasE681kUDvJ OXs1ERxwNPGYoinX1MBGQ6pIiNnE7qKET9Yu0EJHend+bW9gGk309ennA2rqiNZhhVPM63Ei+GU flPW0xD/mfHQHPDdyUOWoe0p+OVilug4EDxnWnUiIBCDpcBqktevyxNDzRIIDpwKhYqSkE+UHEP 4n8wzrSdHlAvt8cISZqZU= X-Google-Smtp-Source: AGHT+IG78k1jDlP82lcOMeh+n1YRV7USWsk6x+nIRALX2ZybuW+R7Wme5PWVa2mkGsbygin+bxNx8w== X-Received: by 2002:ac8:5a8f:0:b0:4e8:8934:6df1 with SMTP id d75a77b69052e-4edf21a8a19mr156206651cf.79.1763343644378; Sun, 16 Nov 2025 17:40:44 -0800 (PST) Received: from [10.0.0.22] ([185.213.193.149]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4ee1c21ea34sm18246551cf.30.2025.11.16.17.40.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Nov 2025 17:40:43 -0800 (PST) From: Gabriel Brookman Date: Sun, 16 Nov 2025 20:40:20 -0500 Subject: [PATCH RFC v2 03/10] target/arm: add TCSO bitmasks to SCTLR MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251116-feat-mte4-v2-3-9a7122b7fa76@gmail.com> References: <20251116-feat-mte4-v2-0-9a7122b7fa76@gmail.com> In-Reply-To: <20251116-feat-mte4-v2-0-9a7122b7fa76@gmail.com> To: qemu-devel@nongnu.org Cc: Peter Maydell , Gustavo Romero , qemu-arm@nongnu.org, Gabriel Brookman X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1763343639; l=1752; i=brookmangabriel@gmail.com; s=20251009; h=from:subject:message-id; bh=lGvL5Ysz7rdcnO180K4nS60cQt3k70dZuKD3GpqAV48=; b=xqtxzZKLu8L9xYRFDWc/dCD6H9Fhq9/zDZ9JDwlsLAfdEub7vxL6LlI+IbC2FtCCFCXKXNmaC IHV+hdd/rp1DuRsAYixFDADhwJuOqZP/Y1hu1Q4rEbKV1rjGDY8L4Rn X-Developer-Key: i=brookmangabriel@gmail.com; a=ed25519; pk=m9TtPDal6WzoHNnQiHHKf8dTrv3DUCPUUTujuo8vNrw= Received-SPF: pass client-ip=2607:f8b0:4864:20::830; envelope-from=brookmangabriel@gmail.com; helo=mail-qt1-x830.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, FREEMAIL_FROM=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org These are the bitmasks used to control the FEAT_MTE_STORE_ONLY feature. They are now named and setting these fields of SCTLR is ignored if MTE is disabled, as per convention. Signed-off-by: Gabriel Brookman --- target/arm/cpu.h | 2 ++ target/arm/helper.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 39f2b2e54d..6fe85b5e3a 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1424,6 +1424,8 @@ void pmu_init(ARMCPU *cpu); #define SCTLR_EnAS0 (1ULL << 55) /* FEAT_LS64_ACCDATA */ #define SCTLR_EnALS (1ULL << 56) /* FEAT_LS64 */ #define SCTLR_EPAN (1ULL << 57) /* FEAT_PAN3 */ +#define SCTLR_TCSO0 (1ULL << 58) /* FEAT_MTE_STORE_ONLY */ +#define SCTLR_TCSO (1ULL << 59) /* FEAT_MTE_STORE_ONLY */ #define SCTLR_EnTP2 (1ULL << 60) /* FEAT_SME */ #define SCTLR_NMI (1ULL << 61) /* FEAT_NMI */ #define SCTLR_SPINTMASK (1ULL << 62) /* FEAT_NMI */ diff --git a/target/arm/helper.c b/target/arm/helper.c index 27ebc6f29b..17ddfaccf8 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -3364,10 +3364,10 @@ static void sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri, if (ri->state == ARM_CP_STATE_AA64 && !cpu_isar_feature(aa64_mte, cpu)) { if (ri->opc1 == 6) { /* SCTLR_EL3 */ - value &= ~(SCTLR_ITFSB | SCTLR_TCF | SCTLR_ATA); + value &= ~(SCTLR_ITFSB | SCTLR_TCF | SCTLR_ATA | SCTLR_TCSO); } else { value &= ~(SCTLR_ITFSB | SCTLR_TCF0 | SCTLR_TCF | - SCTLR_ATA0 | SCTLR_ATA); + SCTLR_ATA0 | SCTLR_ATA | SCTLR_TCSO | SCTLR_TCSO0); } } -- 2.51.2