From nobody Sun Dec 14 06:34:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1762939386; cv=none; d=zohomail.com; s=zohoarc; b=bO3Li13rX6udTXWBZCmf50P11JzAyXb+vVnwIJdv/+1PlOS7qBJWbofMRrog+hpTZsScBhgRCB5WNwgx36kO5mI6OlnMvSoiMsgEChq17v0VDxzWGkucIg0j57oIZBo+JEp7r9yPdv2U16k/6rZ9rZaJi8mI24bv2XadflNPc6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762939386; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3pWIda8e2UrEXXWq+lxi04bS+9Uhurh/4yQC9gLnIYs=; b=kpWrsB+L+EO7XH5PLvdiy7SDhVdWmahlAxYgGCV5Lmr4HXueHdkworZKHPsXy1mOjwpD/aepi9dgKHz3wA32jOHzz0mqYu3V4gMETGVLRINut3GxS2T5vjnuk2Tju9dFCagyOe1jnNdQIjjR3BpAr/hzi8J0wt5a97MJU4TQbAA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762939385987485.5970824854212; Wed, 12 Nov 2025 01:23:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vJ73h-0007Of-Tp; Wed, 12 Nov 2025 04:22:34 -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 1vJ730-0007Cb-JG for qemu-devel@nongnu.org; Wed, 12 Nov 2025 04:21:51 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vJ72u-0000Jw-G2 for qemu-devel@nongnu.org; Wed, 12 Nov 2025 04:21:49 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-42b31c610fcso471815f8f.0 for ; Wed, 12 Nov 2025 01:21:28 -0800 (PST) Received: from jimm-x1.. ([2a10:d582:31e:0:df7:7499:aeed:c296]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42abe62bf35sm32572495f8f.7.2025.11.12.01.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 01:21:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762939287; x=1763544087; darn=nongnu.org; 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=3pWIda8e2UrEXXWq+lxi04bS+9Uhurh/4yQC9gLnIYs=; b=fPfyF5hKVyr3iZa9GTSdpaDHppCHnnEahpbOedK286gV52on7a5yVtbtRQklQ1/smA KzjCalrZOuZNgTzE21GBifJu598hNqVV2obK0EFH7WaOJh+N+S1C17B9FmMM1A9Qbcge 9mUh+LRWL4DUETYcuKCv5yn5Vsl7G8IPp75Wl6PecilXwvDG7vKC851FlPKlEiYpv8ZZ uO9w6mE4ekLbjzJlcLKK1f5rIiQVsYmElV+KvJf03QN+rD98VsPwOYqyGCxGeTWeAWQf QXOMHkRp8k91jxg+++g5UBWQ7Zo1/2+HjTbZCYnoyun8Y9VDZTE8EWA/YTGROH2+WVgh Fe+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762939287; x=1763544087; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3pWIda8e2UrEXXWq+lxi04bS+9Uhurh/4yQC9gLnIYs=; b=fM6r9/D57fg3/AApr9P1uTGJ3uj6jHl4RtkBSrgCt5V0e6lwnIo9Xep28PYwE6lMJP eUSO5fWel/eUcA6CfYd6F8Lb78Sb+Ng1NMfw0b7BNPz/GSwiWPopK7c7VL6f2uEmmKMD kQ+/LZ+oU71zSAF6eSlm5EVOW7FfZAxFa/aZXdtrAk/21SF2jXQ7lXW2csA7HNqzeLcR AJEv3h2+sI2NXkeA40nSSrfDlFaUD8w1yTMVkjQD0v+gmKrsh3tda4nsOmPK6Qyl2MjQ 2nzJkB2HG4XMTumKFDYOlMPaPXnPoI8hQUwTGlRxC0yilRAs5FBXfdzfGeYO3ZQrz9hp 6uBw== X-Gm-Message-State: AOJu0Yzxz+TL0ih5+4EbRsp5F7/aO3xZsMd2Zzg2SJxwguM1mNt4cQHc qi2GSfvJ3NksEZqFkaQf1+HL9VDHFfpPG9UHgUc8l9P6qc1IhebC/Qtoqif5LjM3HWSV3j6IXrM cMf1SpXg= X-Gm-Gg: ASbGncsLqRvxMOw4B7BBCTSd9m6y2vOKtolEAxuBJt8oxYYuXrxMwTEjYBsSMzhog8+ G/kWK/6LxjcwhwP7rNOOptyOvF+oAXMdXQKWt2R/BuogF/gyd6s3ekOLl3aYu3aoptNHFgIrt13 Q1ToiVV8NGMh0LKt2alNICIDy4QyrowdSUDA3vqLEaVg/OdMEQ5i0kHndNxCKvASgVn4F4uCjKv ZyJG9fXR5+iXqHez3XxlxNkSwNxhfaFzrBpDKNyNCp5GBpDbAiTjd4sj7009HkIEgA+xtgStF1L AjsBEJ2zy9p306siTbTKHzVbgSFD/3owzkbnAty+tYNRmj+ymiXyQgRgDpwkWmD3hXHgxVb3Mg1 pUyjwUkFIHhBlnZJhx9ZQUeOYNXcVZC6IC4ELQTWzhiNMYd/DT/pRI19FOyN7i7l7ji1hwuChkk h3 X-Google-Smtp-Source: AGHT+IHFbuEN5HICSyOn0+tfLKgeGHIeAIzmuZNoT6F1/uT8jvGGVcVFbg1iMuQG2/d6NX/1T/vcLg== X-Received: by 2002:a05:6000:24c9:b0:429:d170:b3ac with SMTP id ffacd0b85a97d-42b4bb8f198mr2228118f8f.13.1762939287450; Wed, 12 Nov 2025 01:21:27 -0800 (PST) From: Jim MacArthur To: qemu-devel@nongnu.org Cc: Jim MacArthur Subject: [PATCH 1/3] target/arm: Enable ID_AA64MMFR4_EL1 register Date: Wed, 12 Nov 2025 09:17:50 +0000 Message-ID: <20251112092048.450090-2-jim.macarthur@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251112092048.450090-1-jim.macarthur@linaro.org> References: <20251112092048.450090-1-jim.macarthur@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=jim.macarthur@linaro.org; helo=mail-wr1-x430.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762939388295158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jim MacArthur Reviewed-by: Richard Henderson --- target/arm/cpu-sysregs.h.inc | 1 + target/arm/helper.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu-sysregs.h.inc b/target/arm/cpu-sysregs.h.inc index 2bb2861c62..2ba49d8478 100644 --- a/target/arm/cpu-sysregs.h.inc +++ b/target/arm/cpu-sysregs.h.inc @@ -14,6 +14,7 @@ DEF(ID_AA64MMFR0_EL1, 3, 0, 0, 7, 0) DEF(ID_AA64MMFR1_EL1, 3, 0, 0, 7, 1) DEF(ID_AA64MMFR2_EL1, 3, 0, 0, 7, 2) DEF(ID_AA64MMFR3_EL1, 3, 0, 0, 7, 3) +DEF(ID_AA64MMFR4_EL1, 3, 0, 0, 7, 4) DEF(ID_PFR0_EL1, 3, 0, 0, 1, 0) DEF(ID_PFR1_EL1, 3, 0, 0, 1, 1) DEF(ID_DFR0_EL1, 3, 0, 0, 1, 2) diff --git a/target/arm/helper.c b/target/arm/helper.c index 27ebc6f29b..c20334fa65 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6566,11 +6566,11 @@ void register_cp_regs_for_features(ARMCPU *cpu) .access =3D PL1_R, .type =3D ARM_CP_CONST, .accessfn =3D access_aa64_tid3, .resetvalue =3D GET_IDREG(isar, ID_AA64MMFR3) }, - { .name =3D "ID_AA64MMFR4_EL1_RESERVED", .state =3D ARM_CP_STA= TE_AA64, + { .name =3D "ID_AA64MMFR4_EL1", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 0, .crm =3D 7, .opc2 =3D = 4, .access =3D PL1_R, .type =3D ARM_CP_CONST, .accessfn =3D access_aa64_tid3, - .resetvalue =3D 0 }, + .resetvalue =3D GET_IDREG(isar, ID_AA64MMFR4) }, { .name =3D "ID_AA64MMFR5_EL1_RESERVED", .state =3D ARM_CP_STA= TE_AA64, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 0, .crm =3D 7, .opc2 =3D = 5, .access =3D PL1_R, .type =3D ARM_CP_CONST, --=20 2.43.0 From nobody Sun Dec 14 06:34:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1762939387; cv=none; d=zohomail.com; s=zohoarc; b=EHI+9mOCrWXVe28XUy7maHxb2m8BVRuJXhzFssByfFiMlhw+Jckc+o0vq3/Sy4kZ7gusgiANhu2bvvxRbaQniXnLeBfHDD6RTZgWB2q/ZoaGtVrmY8joPOHGZjxdkLSQc3ywWN9OPLM9A17dj6byxBuhERJCPEin4wGhnXkHHk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762939387; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GZO47SYLDvpAJq0EByp09SrmEd2ewInfj97sZ5NPvqI=; b=gdkqX4eOeIg0Jjs6D5Slk8F8FQgqk5jd7hDnrWBHJhgKIye1cbMx4BkdP12KfNUj+ae8U0PoLuNDvC6VvyzOrS6OZSOTwIs05kI/cZTyE+85WO/XBrI4/NjJUmUoAKI7UxVjE0J0eQENoOc0XDYvHycyBpC7FdMjtYRZCGj+3vg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762939387840183.315111097961; Wed, 12 Nov 2025 01:23:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vJ73h-0007OO-3g; Wed, 12 Nov 2025 04:22:33 -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 1vJ731-0007D3-En for qemu-devel@nongnu.org; Wed, 12 Nov 2025 04:21:51 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vJ72x-0000K3-B3 for qemu-devel@nongnu.org; Wed, 12 Nov 2025 04:21:50 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-42b3b29153fso286872f8f.3 for ; Wed, 12 Nov 2025 01:21:30 -0800 (PST) Received: from jimm-x1.. ([2a10:d582:31e:0:df7:7499:aeed:c296]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42abe62bf35sm32572495f8f.7.2025.11.12.01.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 01:21:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762939289; x=1763544089; darn=nongnu.org; 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=GZO47SYLDvpAJq0EByp09SrmEd2ewInfj97sZ5NPvqI=; b=E+YTj+QHfehP3F7MOLrH1p4LaXiswcNBAIguc3/kS+hRVfmLSDSv/aCYwe0f8uo0gV OqAab1Dzo2+rkEzosEW9u3MutDFSwMfxsUU2mw54N7pGfyoS905XbzkybxEMEL7HXEhL VXQTEldau6AG4Cnxy4g/VE/EbxjAJuaF5YNK7XzFZR5By/Tr7ZS2rSprpWUePb8ikqO6 JR+xhCRGT+PFvs572RM/3nPrWdAbzeRBIhU+pIzLjXjSLwcGpdoZjyAENROTTHFw413U 2Mug/UnNY+AMoJX1yui+EP6ajpxwhj/g14f4fsn3ZzbdT3QMi2urhWxQKod7mATHjCdc 4tEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762939289; x=1763544089; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GZO47SYLDvpAJq0EByp09SrmEd2ewInfj97sZ5NPvqI=; b=N7qZMV+qRVEkIzaA6OLDwCfRHUfLCJdbSBXIPlHYvhhemG8qIUyAHSDWtO548fGWcM ooVk37qXreAmuBeXLlHfUmq9ZnXMcLF999UE7Un2iLU6pQWcNrJVrnN9ArFK26CqxL35 wUBSrCM/px+K99vKp3dD54Pd7EOZmbFTs8kOjxes1ZvxSrV/lLROvh9KxZJdFldx0BQR tI3hMdINWJxytVFzFW+Jmiy+VieqgQwyRs54tHi4VSKU3ywYzUNqrcUn7VqfDvS+sG+B +6T3FAvwvlGm65wYCtJwrLgHz1/X2DJjdiI8SQ67U4mtEz/CfxxPsfUrCm3cxssDH0TV IgzA== X-Gm-Message-State: AOJu0Yz8WsiNfo9rhtgWBYc3i6wqvWSVUb22gov/j2tigVT1GA2ZAxmf IGteMDxWEsFCoFgoRuAn/DlIsi2L18xvADzR6/bmPv+AcVrbK6p+FYcC7DllYUR/eT50Y5MjWq6 J5X52k80= X-Gm-Gg: ASbGncvS3/hjh2yFivNmFBhG7e+qfGMBcIPWDjBzPESuh6ZpOIg8unLbnBYPGr4RCQx 9LpVV8iD3UwWOzt3H7HMshPZ90ShSj59FBEytWcJfQ9Sx3jwtZUIbrUJzw5VNxqi7BVev5Uqg1w ADQ/gPCyAiZHPV3JDcJ1NBxY20gtg1V9c176gb6UXtoX+1NgQkhnHdLNQKXME896RYPu/QVhu7X 6Pja1gcqEcyg5YxhTC3rotP9aUmXQRNV2wYyOM1+zBeuY7P1fh8gzIKnKmkna3+beGyLeXCYE1g rEDL0aZSLZODDop6bkmj9owWz16wQeXWyeqbsxd+UEw5Ma8JbF+4tBPS7/Om8xBu9OUxf7YgYZa Ga6Y80QHz+dl9J3jNFYRFxg2A0korAI0OYyyafGno3PGpEOqi/MpHWkOkaZ/3Smkkoa0HSwB6VO Ib X-Google-Smtp-Source: AGHT+IHTSFFV4e1m6COwwu7tdPoEEB85r8va8lEA0h34WVc0thlOPLZZLQUB4WWNLy7dObeU0ibWbw== X-Received: by 2002:a05:6000:2204:b0:429:c4bb:fbd6 with SMTP id ffacd0b85a97d-42b4bdac73emr1968012f8f.31.1762939289080; Wed, 12 Nov 2025 01:21:29 -0800 (PST) From: Jim MacArthur To: qemu-devel@nongnu.org Cc: Jim MacArthur Subject: [PATCH 2/3] target/arm: Enable ASID2 for cpu_max, allow writes to FNG1, FNG0, A2 Date: Wed, 12 Nov 2025 09:17:51 +0000 Message-ID: <20251112092048.450090-3-jim.macarthur@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251112092048.450090-1-jim.macarthur@linaro.org> References: <20251112092048.450090-1-jim.macarthur@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=jim.macarthur@linaro.org; helo=mail-wr1-x434.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762939388331158500 Content-Type: text/plain; charset="utf-8" This just allows read/write of three feature bits. ASID is still ignored. Any writes to TTBR0_EL0 and TTBR1_EL0, including changing the ASID, will still cause a complete flush of the TLB. Signed-off-by: Jim MacArthur Reviewed-by: Richard Henderson --- target/arm/cpu-features.h | 7 +++++++ target/arm/helper.c | 3 +++ target/arm/tcg/cpu64.c | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 579fa8f8f4..d56bda9ce0 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -346,6 +346,8 @@ FIELD(ID_AA64MMFR3, SDERR, 52, 4) FIELD(ID_AA64MMFR3, ADERR, 56, 4) FIELD(ID_AA64MMFR3, SPEC_FPACC, 60, 4) =20 +FIELD(ID_AA64MMFR4, ASID2, 8, 4) + FIELD(ID_AA64DFR0, DEBUGVER, 0, 4) FIELD(ID_AA64DFR0, TRACEVER, 4, 4) FIELD(ID_AA64DFR0, PMUVER, 8, 4) @@ -1369,6 +1371,11 @@ static inline bool isar_feature_aa64_aie(const ARMIS= ARegisters *id) return FIELD_EX64_IDREG(id, ID_AA64MMFR3, AIE) !=3D 0; } =20 +static inline bool isar_feature_aa64_asid2(const ARMISARegisters *id) +{ + return FIELD_EX64_IDREG(id, ID_AA64MMFR4, ASID2) !=3D 0; +} + static inline bool isar_feature_aa64_mec(const ARMISARegisters *id) { return FIELD_EX64_IDREG(id, ID_AA64MMFR3, MEC) !=3D 0; diff --git a/target/arm/helper.c b/target/arm/helper.c index c20334fa65..b380ade957 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6102,6 +6102,9 @@ static void tcr2_el1_write(CPUARMState *env, const AR= MCPRegInfo *ri, if (cpu_isar_feature(aa64_aie, cpu)) { valid_mask |=3D TCR2_AIE; } + if (cpu_isar_feature(aa64_asid2, cpu)) { + valid_mask |=3D TCR2_FNG1 | TCR2_FNG0 | TCR2_A2; + } value &=3D valid_mask; raw_write(env, ri, value); } diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index 6871956382..ef4c0c8d73 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -1334,6 +1334,10 @@ void aarch64_max_tcg_initfn(Object *obj) t =3D FIELD_DP64(t, ID_AA64MMFR3, AIE, 1); /* FEAT_AIE */ SET_IDREG(isar, ID_AA64MMFR3, t); =20 + t =3D GET_IDREG(isar, ID_AA64MMFR4); + t =3D FIELD_DP64(t, ID_AA64MMFR4, ASID2, 1); /* FEAT_ASID2 */ + SET_IDREG(isar, ID_AA64MMFR4, t); + t =3D GET_IDREG(isar, ID_AA64ZFR0); t =3D FIELD_DP64(t, ID_AA64ZFR0, SVEVER, 2); /* FEAT_SVE2p1 */ t =3D FIELD_DP64(t, ID_AA64ZFR0, AES, 2); /* FEAT_SVE_PMULL128 */ --=20 2.43.0 From nobody Sun Dec 14 06:34:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1762939394; cv=none; d=zohomail.com; s=zohoarc; b=Z1J5ALmeiw4Ok9eDzTDP7QAX9Kpag+lwFdTk+OCGS3XHsvUwusoORt1zSTVVOSGl2xLO99EKzpUDlldMEx+SPgfRqwof8cSihbwxTjrydP6ZGs4sc50+8jAkQJks4GcWZJ8hCQOUSqcGoh+Kvg6US+0Ey8QlY6cKIFS9h3wClGc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762939394; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QCmbuzlFctFTuAvlqtwNCWvtyNBdqtOcVTo7CS0tXFs=; b=mzCfbp8/9mtrhziAIA4oDk9YYLBrLdTq2l7oUyxheWQMnaoJ0CYysIYkSlNXnkytMFDtWCa+/fd5ZhQ66ho9/JazztutjkPekf/p97Wt1FzXvDZmbxgHGpFN88OAinPmJoD/PpEAjrj8kYpdWLGfrkcJrglYfQjdawpnuDgK+TU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762939394430645.9037968316305; Wed, 12 Nov 2025 01:23:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vJ74D-0007b5-Ak; Wed, 12 Nov 2025 04:23:05 -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 1vJ731-0007DB-Fe for qemu-devel@nongnu.org; Wed, 12 Nov 2025 04:21:51 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vJ72x-0000KB-B4 for qemu-devel@nongnu.org; Wed, 12 Nov 2025 04:21:50 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-42b32ff5d10so289848f8f.1 for ; Wed, 12 Nov 2025 01:21:31 -0800 (PST) Received: from jimm-x1.. ([2a10:d582:31e:0:df7:7499:aeed:c296]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42abe62bf35sm32572495f8f.7.2025.11.12.01.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 01:21:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762939290; x=1763544090; darn=nongnu.org; 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=QCmbuzlFctFTuAvlqtwNCWvtyNBdqtOcVTo7CS0tXFs=; b=pUfqDScbRue/J434YxWCr9SVCRPJTe2HnoqpLN2VrcFsYEfqNTl4uQf7aveYOZg4hY SRZbBRLtpfdFZ0Hs2Wwsh2kpBc8nh46rSIZqK/jws3j2Lcnsc6qFY/kLf5mIx3ac1ZM3 LfOQopVSkDTL3ZEcejvf20uJuZnwY9xzH+S8kc4t6S62l1GBvrKzs5v7UTDOtj/5FZ4O D7fc0o+EbjTXn87Fsgz1PpUslgZZc4a71LcxO26oAa1dHDRaTzq4atf5Jiv1/VAS29kp OqlN++36pECHOSCt1v6lRlwhKFWrY8F8LZcdt9aJhrl3rqDOYuZNc50Uyr8CBnbMxadU IBcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762939290; x=1763544090; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QCmbuzlFctFTuAvlqtwNCWvtyNBdqtOcVTo7CS0tXFs=; b=Y5hKJK0BZvol1GMDJ2hWdfLxpZDGDts7kY8c3O5e8Vg4kvFZxS80F1ek7GF7znQc7X coYpaBRJhNF1B8Mo/9Ehrlzan8j8aw06F9N3xDzBK1JEnrkjFTJlJyO0tRsbPWcEUvVZ OE44gCGw8CvfQhMsm6+zE+7/GlcoPtoGNwdx0VPCTGrqkMPFh3wmAgDUWO/CYLZPWGFF +DhZ/6Kag7i1EGNwFuWuoSd72DiXbdh59db06E+MSdjTkL81XEb1wfovTrWXSPYkqeU5 3yICrXVwOAgep72y18XOE5Fa2CWQtuVq025OcCK2f3VBpXfLlPTFWkJCs3THLmpbCmQW 4PwQ== X-Gm-Message-State: AOJu0YzxiqygNmW/VVC+UWvjr5s9+73kbi0My1b3+w7DLJfLowu2wxuk e1EHSmH0bcHtT0D3A9pbvRyEb11OsGDj4yUeVemn9DGcEJvraQx/z6tfflQpk1JXCJ7QiXDj2fc i72Ykz8M= X-Gm-Gg: ASbGncsZPyFmi8ETSLEnZypgTMjGSl3BU30xxQp050tXUSLvFCXfnr5KIW5o0JEBZMX t5795yvJg06Mm9zIdkWdqK7H7oaeLBa5BLo6+gDueNhT1r9kCcTweONouy7DuhXp/frQw7fMR9l ClVEoToikzastatoxsXUi68OcYSWh3geia/vO3eAUG0nCzg0WpH7CH6EDT41tkHxP5RaqfS0IqN SVggkJ6m+0d4T1Gu+sAZ6qFUP5b/T4UNTB0zgB/D7iWwFY8VCKjOUy8TWFv6ltdpMHbVlmGUwWY wKXuepjQaj3pj51MGx/5oTt29wAv2Z/c7COfTa/7Zdc0+kdlsRrhM5uSDyLclk1yMw1JeYru2Kx yV8m7ODxtsyeDOBh7nKkdcAGgqBdMku2CDZZluZxC5Dp9Qkr4NPnBA56KXwXhT67lp89taWSyz5 0O X-Google-Smtp-Source: AGHT+IHlE57c72CdsAnmOxHaB6SKY7AsVSIJ45fP4I1Pyqu5HNBCrEmRVLOtSWNvjxyMjYHHpqG3ng== X-Received: by 2002:a05:6000:2891:b0:429:cc39:99c0 with SMTP id ffacd0b85a97d-42b4b817244mr1863936f8f.1.1762939290096; Wed, 12 Nov 2025 01:21:30 -0800 (PST) From: Jim MacArthur To: qemu-devel@nongnu.org Cc: Jim MacArthur Subject: [PATCH 3/3] tests: Add test for ASID2 and write/read of feature bits Date: Wed, 12 Nov 2025 09:17:52 +0000 Message-ID: <20251112092048.450090-4-jim.macarthur@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251112092048.450090-1-jim.macarthur@linaro.org> References: <20251112092048.450090-1-jim.macarthur@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=jim.macarthur@linaro.org; helo=mail-wr1-x42e.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762939396371153000 Content-Type: text/plain; charset="utf-8" Tests ASID2 is present and FNG1, FNG0, and A2 are writable, and read value shows the update. Signed-off-by: Jim MacArthur --- tests/tcg/aarch64/system/asid2.c | 53 ++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 tests/tcg/aarch64/system/asid2.c diff --git a/tests/tcg/aarch64/system/asid2.c b/tests/tcg/aarch64/system/as= id2.c new file mode 100644 index 0000000000..53dbdc13cc --- /dev/null +++ b/tests/tcg/aarch64/system/asid2.c @@ -0,0 +1,53 @@ +/* + * ASID2 Feature presence and enabled TCR2_EL1 bits test + * + * Copyright (c) 2025 Linaro Ltd + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include + +#define ID_AA64MMFR4_EL1 "S3_0_C0_C7_4" +#define TCR2_EL1 "S3_0_C2_C0_3" + +int main() +{ + /* + * Test for presence of ASID2 and three feature bits enabled by it: + * https://developer.arm.com/documentation/109697/2025_09/Feature-desc= riptions/The-Armv9-5-architecture-extension + * Bits added are FNG1, FNG0, and A2. These should be RES0 if A2 is + * not enabled and read as the written value if A2 is enabled. + */ + + uint64_t out; + uint64_t idreg; + + /* Mask is FNG1, FNG0, and A2 */ + const uint64_t feature_mask =3D (1ULL << 18 | 1ULL << 17 | 1ULL << 16); + const uint64_t in =3D feature_mask; + + asm("mrs %[x1], " ID_AA64MMFR4_EL1 "\n\t" + : [x1] "=3Dr" (idreg)); + if ((idreg & 0xF00) =3D=3D 0x100) { + /* ASID2 is enabled */ + } else { + ml_printf("FAIL: ASID2 not present in ID_AA64MMFR4 (%lx)\n", idreg= ); + return 1; + } + + asm("msr " TCR2_EL1 ", %[x0]\n\t" + "mrs %[x1], " TCR2_EL1 "\n\t" + : [x1] "=3Dr" (out) + : [x0] "r" (in)); + + if ((out & feature_mask) =3D=3D in) { + ml_printf("OK\n"); + return 0; + } else { + ml_printf("FAIL: read value %lx !=3D written value %lx\n", + out & feature_mask, in); + return 1; + } +} --=20 2.43.0