From nobody Mon Feb 9 10:10:26 2026 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=1764677013; cv=none; d=zohomail.com; s=zohoarc; b=nxNjie/18bglaKagQGzWjzqNAuDMeeKqbUHm7sf7k5Xd0avQqHNcbFxRN/jIoMI1HuOZ5sLBbQTwQtrv3WtyVXu5bQ8TE/Qz7EDG/onz0jQ4s9stibj9hWtwxOwcj8mWOKGffBHDzfbCgU1AnBtvzgq5gjM+4iLtbqCbhNBMiSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764677013; 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=aY3JLTfk6023NIzsomra2lLYY+6fGG4b1HvkUGXqjqqNrbJyIMi3dIhqNS/3b4C8I2wNxuUuViMq8bUxF4sTYB5XkMV+2RRZkhyz0R6YaY0a/vsw4N1H8mrkK/BQZykoEHDUKnkip9p5wZzlexF7Aaf+GE6Hfctw6pTf+yd2+6o= 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 1764677013559444.85654760726777; Tue, 2 Dec 2025 04:03:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQP5w-0006c5-TZ; Tue, 02 Dec 2025 07:03:00 -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 1vQP5t-0006aG-Sj for qemu-devel@nongnu.org; Tue, 02 Dec 2025 07:02:57 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vQP5s-0006TZ-43 for qemu-devel@nongnu.org; Tue, 02 Dec 2025 07:02:57 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-477770019e4so45189305e9.3 for ; Tue, 02 Dec 2025 04:02:54 -0800 (PST) Received: from jimm-x1.. ([2a10:d582:31e:0:d0df:e484:1145:883f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4790b0e21e8sm381169835e9.15.2025.12.02.04.02.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 04:02:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764676973; x=1765281773; 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=b7yl0SAsbV38hEIskAbccXsEI3efA5lyMPGt89TEYVO02Pvvdn/I2yvLTNtJh0dTtw 5nQzz9WFNHGHyWHaR8bwh3c/Ne8cPy1dSrKCU2KrSPcY/tdKhvuf0ys4NSzJSfl4kVBQ KU0JUFEgrA59SrV708ORucjHpClH/3QjnbHtvqDZqnEqz90qhOKaknNM3s2qphrIoyRu wwDKvNH5VTr+ihak2LgHi6IV8/395oizwtjwHzy8kGUUa43Xy8LH7jzZJpsHfKPFs96C TkG9NrObPSK6Q0AB4mCLq7T7QOTBUC1m6HS/PPwbJUHONjz+CrW57FLou7OkUeLgmSsl LJbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764676973; x=1765281773; 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=GB7R3cS53e/vjOZPr01fEmBBvTcsGxXQb8eCjsgtNKOmucLKActtm1rVZTsKGju8nc cJVKlYqkf9PcavJ7txQUDFvfHdquuOWb43rBJoRs3olg13adi58Lt3PRXarbrRDbWVnJ R4di7uuRedK5nUAcuttjQ9UIBnnAJZZcoG5n/YDw2ULi7PyR9n3IYkzvJyAvHEtzNCfb np0uZjd94hSeLGEU3zkuUNlu1Mwe0WLVNNQhJv6pWr60ja6vr3OSY2ihm6AWxT7SBgvr BAC7VUuw/XaLCrt0xmWgxkK+kGnhblonWloZDJOKZzl1/JvDoHBSvUrufTBERBVue0IG OKbw== X-Gm-Message-State: AOJu0YzHq4ncjHizCmuWUGM72Xn69mVLnDUlK/brxIOmPmLkgZ+ZyXxK uWfQ3Pl41/FlUHJhPurBHueIcAdajkz4uYIGwf4/hp+qRaE/OtpFatJvvoYGlffmjqyzYnXc+oI H/fFM X-Gm-Gg: ASbGncvb7Brsbui0hdyFEQleK0lZZ2hQaxjNPBxl1C2arpAkeIIxmtfhRN/PbxGb0q0 noTagQslpNt8gn12cL2ehlPnPMgIibfEjQ8XKUGIbe41WDPdQYlhnOcgIAhcrAx3WslPc8wLZ05 G2iMvxjKa1pII3dEXZ/tw0zMFOo83TjrWS1PlQoBjkLfv5H3coBvg1mCeY3JCBpEHC1FgiYH9at C/MHbly16Do+0/ur/quW8QVhEnZcPPm4FIcR3IB+/ZvcaKlP/EMZ7/ClKGQNOuZASojxUfn10b6 UBsXNN7SELKNtFKFHq8infTpizBI0Em3QlYmHsb7T99TDnVZPWUPghhL19NoYVzB0yjC1qAAlyz wZJMibaEs1ZtPQL6dGKqR5Y5EiGUJj6qVvq3IAgc2weL0CA/jWjvn1vbd/uzIHUzVMOJirnW34v rm6nRE+PHqeBwh X-Google-Smtp-Source: AGHT+IE5b/oTjboP4thoJJ1gnXDwACZ9b9/ceSSkWXRGfAyK+mn0WpljWj4t7DKTLgspIwfyb7QMCA== X-Received: by 2002:a05:600c:1c27:b0:471:13dd:bae7 with SMTP id 5b1f17b1804b1-47904b2bfd9mr308568975e9.30.1764676972735; Tue, 02 Dec 2025 04:02:52 -0800 (PST) From: Jim MacArthur To: qemu-devel@nongnu.org Cc: Jim MacArthur Subject: [PATCH V4 1/4] target/arm: Enable ID_AA64MMFR4_EL1 register. Date: Tue, 2 Dec 2025 12:00:38 +0000 Message-ID: <20251202120250.763150-2-jim.macarthur@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251202120250.763150-1-jim.macarthur@linaro.org> References: <20251202120250.763150-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::331; envelope-from=jim.macarthur@linaro.org; helo=mail-wm1-x331.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: 1764677014007019200 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jim MacArthur Reviewed-by: Gustavo Romero --- 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 Mon Feb 9 10:10:26 2026 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=1764682872; cv=none; d=zohomail.com; s=zohoarc; b=keZxKv71t3fioLfkKJztC9Am9eZq+ozTh+fhNaCg3jGcGqg+IKDo19n2bRhDsta2ojLy4+v1sxf2DqFNzeFOZPsaY/MVRWASklOZsJZ3QaLFxAwW2RTtoG230k8Iy4VgMsRPD0eF5UUqP4LSlI3QZWQrgNiGk55bvdI1/6bEJNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764682872; 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=UjInhO+n4r0xBag/pZShgiqyLRb94VnP2a+V9taCdyU=; b=krUfofLlh4vPRNRFGMiX/9KiHtMhqtqYtKhMDaU2lSHq+S+6wtxLfDjFNz1iXIzTiKrQgHck7gSQtAbvOhEzBAj2jPmAx0KwXHEMHrR/jbAYURMNI9xrcHCGEYw3qHgf5b0oASCeMou75goAh6SNfGzAArhHh5jeBveq79G0QK8= 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 1764682872301780.8464463287726; Tue, 2 Dec 2025 05:41:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQP5x-0006cG-E9; Tue, 02 Dec 2025 07:03:01 -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 1vQP5v-0006b0-3Y for qemu-devel@nongnu.org; Tue, 02 Dec 2025 07:02:59 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vQP5s-0006U4-8L for qemu-devel@nongnu.org; Tue, 02 Dec 2025 07:02:58 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-477aa218f20so36775535e9.0 for ; Tue, 02 Dec 2025 04:02:54 -0800 (PST) Received: from jimm-x1.. ([2a10:d582:31e:0:d0df:e484:1145:883f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4790b0e21e8sm381169835e9.15.2025.12.02.04.02.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 04:02:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764676973; x=1765281773; 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=UjInhO+n4r0xBag/pZShgiqyLRb94VnP2a+V9taCdyU=; b=Y3omTqmBvUGk5ZJfylrRD9FXP1W0o4UsR1UkrWoieY/4KbJUQ97rqeEH8ed6nlScyR bgQgpWei4roSwfJxRgVhO772qvkj13m140Ggz1tXjN4tY8OnE5Pc5anUNsgQsMSBoc+2 pPtkhouY0GZ80FnTGVlT18k1U4d4a5l08WlMSt/YDQ9f49wpafdmAB3f+y8BUYM+IP1M DsAealmji5i16pBa/7vx4QZsAWEzF+nPdI8rKSqAEBJSCIVW928dHq+C47LnJ/Vm3Olx /RrBUih+WX3quxx5VveU8oZiEqslmTO3NteifnXOAozp2Uj9pS7gU73uOFteaPqKil/F XvQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764676973; x=1765281773; 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=UjInhO+n4r0xBag/pZShgiqyLRb94VnP2a+V9taCdyU=; b=ob8z9huNJARJoCar1ER6JsyZzsVp+Er/Hd0+G5zanGy5NQELaOXZa7mTRMJtQ8pdJ5 SXRo68QAHxnv9zycyueBptBhwpuTqzz/P/bGyNyqtOtXm2/9MLwKbtfPORFvTbbTrdKo Ms5bW0VxhouLkNX3bdBsORaq9ghrKhUquKqasrEiqjl/2f13bH4mLnoxkpFiaQtjOIam 3QMEtdPpKjqgCfcLnDP6sgSFAkQ7njf9/SwL4Zjs+F9hJ8YG7/bDIC6WjFunO1xGinCP C8i/z+VZCbcxgm33heUJ3CEZkJ4h96s+PGjaS8axaFqftiFgDA79fsYOatsIrDn4ml7+ Xjqg== X-Gm-Message-State: AOJu0YxuNFi8fQz9Wl8vvYKeoMrRA5wTt/JPbGoroMDjzIGsozYGkqXK EL8BPJ6ETpM9spNBEmgd6Dleq9oW67bPv60UApjWjR0E5l2ute2Yo+FoRmpvnHrmaLYCAPCu4cO eXR/w X-Gm-Gg: ASbGnctLjvOewQpnIfG1VsjWW8d33L1nkWjgtIujoakHOlnsY3EcRQioAH4p8bf4kZ7 NkqE728B1yPHFHMCupETqf3VR54DE9caxmIKqPq4Eobsfi2/oIJE/x8nvu5etHNy1dGEYGLiNMq +bnYHAYkYwZrJJgo34vTnpY0uJ5NXnLNvjznXUyrvjXLxFc9/NpaHdJ+YRMLeMISNIMtXYSQ24v 63o/EkI9suhraYih9ZjSP6pv7A06muQpVL2cLGvVNFaYwQgWzraxuUOwmHy8PyzttC/FrkEx+mb bk1lDAN3fx4/7gp+XkTBtX8Pe5rFSIGDI8JOL8bMN82QyhtAyROx/1WzJKTzVNcKt7L7Y5woKbL /X6dcwQX+Jgkrim9eq0pq4bj0Mxe0dUCPjsFJrQmpphjVXapzpzi8ceDa8/+gyD9/MtHWLYt6/3 aVmlDEyLobSdmc X-Google-Smtp-Source: AGHT+IHPtNQ1CqHOVmLoHANDy038i0xMHWEk9qZSjNvlTBV5unG77GN+odbxaHn+ZZiVhvcpzFD7rg== X-Received: by 2002:a05:600c:474b:b0:477:9dc1:b706 with SMTP id 5b1f17b1804b1-477c01b494fmr439079885e9.19.1764676973260; Tue, 02 Dec 2025 04:02:53 -0800 (PST) From: Jim MacArthur To: qemu-devel@nongnu.org Cc: Jim MacArthur Subject: [PATCH V4 2/4] target/arm: Allow writes to FNG1, FNG0, A2 Date: Tue, 2 Dec 2025 12:00:39 +0000 Message-ID: <20251202120250.763150-3-jim.macarthur@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251202120250.763150-1-jim.macarthur@linaro.org> References: <20251202120250.763150-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::334; envelope-from=jim.macarthur@linaro.org; helo=mail-wm1-x334.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: 1764682873016019201 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 --- target/arm/cpu-features.h | 7 +++++++ target/arm/helper.c | 6 ++++++ 2 files changed, 13 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..7812a82bab 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); } @@ -6121,6 +6124,9 @@ static void tcr2_el2_write(CPUARMState *env, const AR= MCPRegInfo *ri, if (cpu_isar_feature(aa64_mec, cpu)) { valid_mask |=3D TCR2_AMEC0 | TCR2_AMEC1; } + 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); } --=20 2.43.0 From nobody Mon Feb 9 10:10:26 2026 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=1764677004; cv=none; d=zohomail.com; s=zohoarc; b=gljkEfThiq0CKxIXbOIzbVwv1PRiznAFee+NcGgRKpU6sHAfEwmpgOOvI28vYKLp2MphckhDu3cfYnM55ptiELQAVBmtxjsNS52aNILd0LMnk43gXuXxiu7yMM25GQwClqGPlkqu80u8tKWTrZMHtozEzR1qIjlS9cEokTFjhOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764677004; 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=cb5R6GVtT3ngT31J+bLz+2AkcRkLlyFAa9g4z7kxhQ8=; b=A3xIW7bVft8Y97YWhejrWjKFmtipFha57QQzTzIpl1zKOU0q9CS0BrQkqCxcG/yymAHBGEu2A7Jn283ANPotcAvLuAyXuv3+QMSwz/iu/uosYR1JkEjoWI+sP2UlzCdO6N3Zg12qyc9Hpih7prKMbX3oend2Dz7RnQdLkKtyTtM= 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 1764677004962974.3020668313173; Tue, 2 Dec 2025 04:03:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQP5w-0006c7-U6; Tue, 02 Dec 2025 07:03:00 -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 1vQP5v-0006ay-2r for qemu-devel@nongnu.org; Tue, 02 Dec 2025 07:02:59 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vQP5t-0006UQ-5b for qemu-devel@nongnu.org; Tue, 02 Dec 2025 07:02:58 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4779adb38d3so39999935e9.2 for ; Tue, 02 Dec 2025 04:02:54 -0800 (PST) Received: from jimm-x1.. ([2a10:d582:31e:0:d0df:e484:1145:883f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4790b0e21e8sm381169835e9.15.2025.12.02.04.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 04:02:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764676974; x=1765281774; 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=cb5R6GVtT3ngT31J+bLz+2AkcRkLlyFAa9g4z7kxhQ8=; b=IHktu8e+lbSZLAb+x6Ai9JR6pbXZ0pPq+Lw9BLHwxc359WTBOP9nVOEvHK3yhvSOTi K911r6B/ChF31Lf3hbXSkTT7ECcIEch2AdABTCSyHXA6OnSR/9A2GNYDFgyD+zDESUBq ZYjr6NAgjIq/ZvRU7kADfyUI3i3uUdk29jnNr0rfS08r9Ev4r6FsMEyQjRfirrq9VZy1 fvwoFVlc90PhM6r98DLwj0ZetizGTbwdebG5ApYjTsz1H2h8Xf59T7Nn1cuymSZ73mxz OpYJ4dIgZJNTwyCfjXTLWYvWY4f4si4cKTZV+AEtCpzCifpCpc6DrkNxENWiw3/mPH0Y PIyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764676974; x=1765281774; 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=cb5R6GVtT3ngT31J+bLz+2AkcRkLlyFAa9g4z7kxhQ8=; b=RiH1Mli9UQSVkcnD3QcFkQOLi0TzVUt3XGfIhKpgOmGx3addIE/opcFCnxdWFdqFEP gUj2Haa5QPycWj6rGf3l/whtNsnZ2bIHyQjhYUD7VuRwrdf0+heocV061kFyjXKqU/HQ QXjSN5waIKnTJV3kV3c1zqlXaNFHMu5gJLg2+7hVu4o5ChlhxeUS56eA4KT+WfPwnm9p 19HfYG84ooR9ASgxlyo87AeVaJ3kydGzdOsQV7V8vcM521g0av9f7bbkYkuD/+OHqj7/ YUvPnOBDHe+1dHt264I68WR0j/gWSo0Y0L6Q2uto5ElZe4Bgf6WTjzzhFYLlRcY/6p5A Wyvg== X-Gm-Message-State: AOJu0YzwF5zvfWWwq23Q6pVSJdxn0FhV9kIpHQotuK5A2PdnmQQfvhcO Fq97bBPUJMjDZ4+XNW8eSKfMH3zzW13ISb/+PgFZ0e8tZ1VmzmnI/YjHdC1rExl+Vw8Wh5T+Bon VMy37 X-Gm-Gg: ASbGnctjo3Rqne3byySiFQ9ezDOhc6P54dFTZ5ZXsyJ3t13RxUVdyZwdjpOQUPYivTi 0T/qHjOZ+ymR7CtZg4sP6hk1HJsoZku6zt4N8tIrXvU3hMk14fOMMtzDsFabCl77DQaYSRxQXpb u4VpGmJw/GL+BIZiw5GJU7KKCSmt/mlX5m+Sg3pUbfypgf0uRflXKNBYS58oRxXjL8duzijwXev 6D2KFrR5bktCYCFtf/vImf3Hcbx2ntL5Bnrd/srgWxzNT40/HDhnN7bHryTgyLCufuQvFrP/wU7 U0zb9WaKnlgwLnRshsPtMlDa7S5GdmlTFmVVrkZpc+poac0Rq0e5QGWkmfuukig5Ew/srrutZH1 rozTfLhO4qi+HKwJcUHGSmS4oyBYrLXNcAXpy1nHH7y1i6S4LUJXzlKE+OO3hXnpPSyW+7vvpbc XsSW+E4xt3PD9y X-Google-Smtp-Source: AGHT+IGMG7vmd27FhrdSY7EruxuV1NgzIkA8GboB15uU7WP946fG1DCJ9SNJM/i9ZuqwsFdKdTMIgQ== X-Received: by 2002:a05:600c:1382:b0:475:de68:3c30 with SMTP id 5b1f17b1804b1-47904b103edmr328935225e9.16.1764676973778; Tue, 02 Dec 2025 04:02:53 -0800 (PST) From: Jim MacArthur To: qemu-devel@nongnu.org Cc: Jim MacArthur Subject: [PATCH V4 3/4] target/arm/tcg/cpu64.c: Enable ASID2 for cpu_max Date: Tue, 2 Dec 2025 12:00:40 +0000 Message-ID: <20251202120250.763150-4-jim.macarthur@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251202120250.763150-1-jim.macarthur@linaro.org> References: <20251202120250.763150-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::335; envelope-from=jim.macarthur@linaro.org; helo=mail-wm1-x335.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: 1764677006048019201 Content-Type: text/plain; charset="utf-8" docs/system/arm/emulation.rst: Add ASID2 Signed-off-by: Jim MacArthur Reviewed-by: Gustavo Romero --- docs/system/arm/emulation.rst | 1 + target/arm/tcg/cpu64.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst index 31a5878a8f..3f30ea5a30 100644 --- a/docs/system/arm/emulation.rst +++ b/docs/system/arm/emulation.rst @@ -24,6 +24,7 @@ the following architecture extensions: - FEAT_AIE (Memory Attribute Index Enhancement) - FEAT_Armv9_Crypto (Armv9 Cryptographic Extension) - FEAT_ASID16 (16 bit ASID) +- FEAT_ASID2 (Concurrent use of two ASIDs) - FEAT_ATS1A (Address Translation operations that ignore stage 1 permissio= ns) - FEAT_BBM at level 2 (Translation table break-before-make levels) - FEAT_BF16 (AArch64 BFloat16 instructions) 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 Mon Feb 9 10:10:26 2026 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=1764676995; cv=none; d=zohomail.com; s=zohoarc; b=VTMrD7X7sojZbi1njaZnYjlqA0yxYOyZCznkFEyXGj++kF5VX3clQY6kfLmTCUCw4qemUF7s+iyxNzmep5TLmQ9+m9O3EoWU76w/uL7TpnfBb3sgQu4CSQ1fZPDwna+5USX9e0NurYm6Aj1u/bbXwHSZvFiTZNV85cFAPmjV3rs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764676995; 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=buG2cVnADLsjsxTOOezo5Vnu9BdAgY9Lq3Omdhcd4Cs=; b=YpU6lYUulGk2Ww4dfM/Bu1oQJlIhKcAF9T54QCwc8rZyCdX8y31OY7bP5a1IA8InQz0sPopoRMuFVnp/0Yt7GnTTlME/OVKyGWXewvvTD0RFxSZZVTo4G3MgLD0/LF05x4zH6mAiUzP7WJHgQPzEod1y4tYonx/h1zBSb5GN28A= 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 1764676995244979.4241744652849; Tue, 2 Dec 2025 04:03:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQP5w-0006c4-Tw; Tue, 02 Dec 2025 07:03:00 -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 1vQP5v-0006az-31 for qemu-devel@nongnu.org; Tue, 02 Dec 2025 07:02:59 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vQP5s-0006V0-HW for qemu-devel@nongnu.org; Tue, 02 Dec 2025 07:02:58 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4779cb0a33fso56566715e9.0 for ; Tue, 02 Dec 2025 04:02:55 -0800 (PST) Received: from jimm-x1.. ([2a10:d582:31e:0:d0df:e484:1145:883f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4790b0e21e8sm381169835e9.15.2025.12.02.04.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 04:02:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764676974; x=1765281774; 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=buG2cVnADLsjsxTOOezo5Vnu9BdAgY9Lq3Omdhcd4Cs=; b=kIPNrze2zTwVZ0n17Zl/35rRuM/6IKXEUC5eCLfTC4t5/nWOfrZa1nynVfPDeJw9dw RupIQuxi68mO9WRwXl3YhbW0iUAffnJObh0v7TxryjtrCx5bm+8tV3A7fslzGdH05t5X uJ5BsXV4Fdhx10psxNjurdWRd6lP4bf11asmqnMvc7K/jVbqUj5Slf3ii/MdZbLIh4wn KnDCRfPgmKSE9dx2S5mNqZvb8T/ignMbTU02oY9C3zATeibK9mYCO168btJESv2ma1Um PpR0+/8VWCzY4V1OFJH4lNu1JNnB6D2JK0rh/qv/kJBTEAy8OIyxoHOVs+aGAPenHAiP JFSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764676974; x=1765281774; 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=buG2cVnADLsjsxTOOezo5Vnu9BdAgY9Lq3Omdhcd4Cs=; b=iqC2+2TJZYimb5Ki/HqLZ6G4KeCcY4o704t72b9GlDM93StTteuz8zAcK4+30vdViz XcOsNgvu+wuPawmt/XB8bHIctgOvRZU5fSTbEyqx3Ax6SsxPrcsErwJReOgtw9zqfJ0l 2cm+WaW8PgjXRdsTBMPGQz5JRA2Jht0oYlrSaVTq0w6gBzuPS5apS16ltEMbs/FSVbJY fNuoCmjERyCFur8961qoSCq458EBUWZALh42d8nJy6ktkwAD3quGWd+Gxk/yHMFO0KHV RXIfNQnc3qe9uZmDJOdqv4txyxb1LHn8POldKzKxUaQrXDcgG0fLfLkdzSuDq3DwK4s2 72CA== X-Gm-Message-State: AOJu0YzBw3isgDmBKZqm1DdgWZpzY1Q2wt3B3tkwjenqpv5xN+J0CVpL +0vCX5FjvIZUhKd6QbaWATu/D2Gtuxd1ax/N4lvG6iLlD3vkXKy0633gXFu3vd7qA3tMp75+xOr 6MJTT X-Gm-Gg: ASbGnctntqxtyUSzqS14dhwZ7rTOjJj/h+QNt58VxHKV4ginaK+VK/GAzknGzxkdmAH H6Iesk80Tux1aBOyTfse83T06XkWS57jr0fF+Ig/Ej2ax0j4C9LEyfw0rB6G6wujOCtmYyZm24h 97U/uarClFMk5K7Oo7hz35L2eClSrD0z71egCkJ0i+zJBYTHIbPzNa1P9BpUCZKA8TMSBNfAL8a tmNWVKJehaG4Qwa/R4oeOkT+PketU0FrT7P3K645pCdxiXA5vkmwccPQgxwr/l4o3n5SCearklK rbWHfxelZJMW8bXnfgIMQ1YJ/R1aoP89kswdwBTCq+LC3ibrN5Av7Rd+WKBiVS3rclnjh/YhFzR U1QRBeWkQzVLfeAVwQt5GEwpxc/8PA66D0NxLLw6RWRmHzUiBD6lY+wB2wkyXgFbG+sSORFNZAp UFqjurcaw860CNjbwNLa2PcwY= X-Google-Smtp-Source: AGHT+IE78jojHOBERuCaqAbVoEsBkqHU2BH/B9l21dNA0adhY+l4yhpe2h46RrXRqzEBfaAxsUyM/Q== X-Received: by 2002:a05:600c:4e88:b0:46e:7247:cbc0 with SMTP id 5b1f17b1804b1-477c01d4af2mr414114935e9.18.1764676974394; Tue, 02 Dec 2025 04:02:54 -0800 (PST) From: Jim MacArthur To: qemu-devel@nongnu.org Cc: Jim MacArthur Subject: [PATCH V4 4/4] tests: Add test for ASID2 and write/read of feature bits Date: Tue, 2 Dec 2025 12:00:41 +0000 Message-ID: <20251202120250.763150-5-jim.macarthur@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251202120250.763150-1-jim.macarthur@linaro.org> References: <20251202120250.763150-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::336; envelope-from=jim.macarthur@linaro.org; helo=mail-wm1-x336.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: 1764676996280019200 Content-Type: text/plain; charset="utf-8" Test for presence of ASID2; if it is, check FNG1, FNG0, and A2 are writable, and read value shows the update. If not present, check these read as RES0. Signed-off-by: Jim MacArthur --- tests/tcg/aarch64/system/asid2.c | 75 ++++++++++++++++++++++++++++++++ 1 file changed, 75 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..a4887e4ce2 --- /dev/null +++ b/tests/tcg/aarch64/system/asid2.c @@ -0,0 +1,75 @@ +/* + * 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_AA64MMFR3_EL1 "S3_0_C0_C7_3" +#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 idreg3; + uint64_t idreg4; + int tcr2_present; + int asid2_present; + + /* 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_AA64MMFR3_EL1 "\n\t" + : [x1] "=3Dr" (idreg3)); + + tcr2_present =3D ((idreg3 & 0xF) !=3D 0); + + if (!tcr2_present) { + ml_printf("TCR2 is not present, cannot perform test"); + return 0; + } + + asm("mrs %[x1], " ID_AA64MMFR4_EL1 "\n\t" + : [x1] "=3Dr" (idreg4)); + + asid2_present =3D ((idreg4 & 0xF00) !=3D 0); + + asm("msr " TCR2_EL1 ", %[x0]\n\t" + "mrs %[x1], " TCR2_EL1 "\n\t" + : [x1] "=3Dr" (out) + : [x0] "r" (in)); + + if (asid2_present) { + if ((out & feature_mask) =3D=3D in) { + ml_printf("OK\n"); + return 0; + } else { + ml_printf("FAIL: ASID2 present, but read value %lx !=3D " + "written value %lx\n", + out & feature_mask, in); + return 1; + } + } else { + if (out =3D=3D 0) { + ml_printf("TCR2_EL1 reads as RES0 as expected\n"); + return 0; + } else { + ml_printf("FAIL: ASID2, missing but read value %lx !=3D 0\n", + out & feature_mask, in); + return 1; + } + } +} --=20 2.43.0