From nobody Sat Dec 13 17:00:18 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=1765378313; cv=none; d=zohomail.com; s=zohoarc; b=jHwV6jXNbfKsCse1YJuMQgjifVtgtdMTYIlI5Nsyc5f1n3eydD3sOlGLNNp3V+1LEFYsRDSAo7tMWNZ2/urW34/Rx8zKVB3czKOuSmhBdYa+YMN7kKyW0ZLTFDDeO2aX2xLXXurZ4qY1C+fZYkyFeFampKjxHoi6WQnJXsHUvzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765378313; h=Content-Type: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=W+9eovatYCNWom5mEm0uh8DNbPobmT3aho5jVRa8xVI=; b=d/xXWRj6jLYgqr19b0yotbNRfV8uPjyYIbelOAGWxRDyHXGg6geBWDcI/ajydjt9auqIPDc/aHBo4YPbzX3gP5yjya/5PISdhoB7KUICLqxCNqAuQ3dt87Q5QJ+NTNX1XCIALnU6qBXmfUpgoiMf9zglt8OGcdSReNnzrSZ2Upk= 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 1765378313833860.7359742334476; Wed, 10 Dec 2025 06:51:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vTLWa-0007HU-Vz; Wed, 10 Dec 2025 09:50:41 -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 1vTLWF-0007DT-L5 for qemu-devel@nongnu.org; Wed, 10 Dec 2025 09:50:22 -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 1vTLWC-0003CY-Dl for qemu-devel@nongnu.org; Wed, 10 Dec 2025 09:50:18 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4779ce2a624so89225855e9.2 for ; Wed, 10 Dec 2025 06:50:14 -0800 (PST) Received: from [127.0.1.1] ([2a10:d582:31e:0:62e8:705f:f7a:c7b0]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47a82d7f778sm56595235e9.11.2025.12.10.06.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Dec 2025 06:50:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765378213; x=1765983013; 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=W+9eovatYCNWom5mEm0uh8DNbPobmT3aho5jVRa8xVI=; b=iB5HLCUJ4trVjeGJ3kKhH4BiT4Y8l/ExpFluaQ5zghb0uGrwtn3ug2FYVMvG6Y2XL4 IVhAWiL8JSujgsTIhiuInQK+rIe5laFSbhWyJ8PGSMT9ONxIuPzQKBHvZTYIU3I1mfmZ tcRqodk9chgKa96aBSq3/ACdKI2t+/u99Vt6VvtH1F2KeIfTwr4+DGglnq9xNAG2liwK 9uU3Xtah1mlZfFcauolGf65Z0Kx2fCG6jnljI4X/mFEdemSKie30i6OY8c/emmJgcxrS SLYieTb/R46wf0PXiLk0sg1+xYYFwB+4Hre39xP6VrjBkNEdi10qaVBUewPCToMSr8QM wamg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765378213; x=1765983013; 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=W+9eovatYCNWom5mEm0uh8DNbPobmT3aho5jVRa8xVI=; b=ULM8CdFjznYOGeGGxIlPLZj0+W30ZWdJlag8Zb3hVGwECcBwK3LLIe/vmZzoQwMKa9 gv5qzUjPUUgrTOk8Y/5A55S111BaHKh2Ps+iL2tDRkGqpNReAML226BsPU6FLnjePZAt VwOJeE3OBxa+vDFNH1tfdsW95WkPuDQdasIlh28wqUxpGh1kwmAD36rA6+2gceGYHqbZ /+CidmWfUhb8bbaCq/P3tMUaagYXw8MVRd1QBgKt/wj+qMr8dAWw138zpIGLw4j+q8SW VAPqynBPqjy7V+XtLCEtgKFlGg6ukQdulQybaaM/Y09jpOqOf/jKUqouEFDckWfmV7pU r0sg== X-Gm-Message-State: AOJu0YyUbF97oEFwP7acuymk9fzq5cQsZnAo6/CVrrUkoNOISY95L4gC 9gJzRoSmPX6svHlY7+f4jumrJ5etonWP5y71+ZXx6VURfzD/aaQy01QSFJI0p7pZVWA= X-Gm-Gg: ASbGnctfnvq7x0M0e5LXGD0/N2EJD7Pjj+mBXpCZ1JDxIRyFdi+yY1vzn/WkNSn2JMG fuvTut8mph0WgbqEAp+PMYxM5ZoslwVhcLef5HLKi3JcqFWJr0pziwVdWV4Wmn0NRFpyFgT1oMN T0g+O2FU93+9McgR8b5VkI0iQ0IdQMgZTYwxfsRE7/M0vjG9JE2EUAB/WRvJzJmfGjJ8UpEFhX1 IaeVHsmTBZMMWQmgNWA1BtbFl4rV2nXdliv1zseFkz2sGMD9SAmgaI6Svw1oi87U1pdDUEpddKG sIHHZqwfI0zBRd7tuPWTKOeXYJJcvRav5/nzWgkvtYA07GU3qJqYK+2UjxuuV3BGRTV6glNSEap g6BFKV8FKcVSp4IvvvyyHhBTCaKXXsUH6smHHtUkxSion3o7+lbIsqivz4emEpiM0fdHXCGS9yM x/zcJDhuMijPxdyQ== X-Google-Smtp-Source: AGHT+IFptSoZ8G99WN3dHjBeDAeIyz4SJOraVQnvtGsAqXt2l2bIs0sx9GJpO4J8UfgcAlpT7jU/VQ== X-Received: by 2002:a05:600c:4e15:b0:479:3a87:2090 with SMTP id 5b1f17b1804b1-47a837a0478mr22853945e9.37.1765378213129; Wed, 10 Dec 2025 06:50:13 -0800 (PST) From: Jim MacArthur Date: Wed, 10 Dec 2025 14:50:11 +0000 Subject: [PATCH v6 1/4] target/arm: Enable ID_AA64MMFR4_EL1 register MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251210-jmac-asid2-v6-1-d3b3acab98c7@linaro.org> References: <20251210-jmac-asid2-v6-0-d3b3acab98c7@linaro.org> In-Reply-To: <20251210-jmac-asid2-v6-0-d3b3acab98c7@linaro.org> To: qemu-devel@nongnu.org Cc: Jim MacArthur , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , Gustavo Romero X-Mailer: b4 0.13.0 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: 1765378315823158500 Reviewed-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Gustavo Romero Signed-off-by: Jim MacArthur --- 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 Sat Dec 13 17:00:18 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=1765378268; cv=none; d=zohomail.com; s=zohoarc; b=QDjlQMb4qvfmBzfqoCVnvuz6T5jUH8fnnJ7Nn9xTB8zqeX2KLGRzZZpu1WBWighckXlV4hoMrIQBDz5X7gPBAd+hccnydHRzJuGpgXRZJHbH/diXSwpyqodbHfZ7bg8Qb8Isey4pVOMfHuQGY0f0DLFx64Kpmb6x6KM+9YD+NDw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765378268; h=Content-Type: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=x5J6irympALxO9zFBVJN5fXnibixGLu4B+VHKb8EIcA=; b=EIIkMTrHBKjrXvf6Vdwo2T2Iw7Tf5Qx7Jz2a0GmN6hDqY5JCVoIcvaB62DV4M2XJEUknHi/tPSVrWojpPUT+dslq5AyJIS3JoqGHDjDA0YCDogh29q5YB9lPlaA1Zas7oK22gMNN9I4hlTAHki2icCE6F+5m6eeJibV6tobsZ/0= 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 1765378268353864.110043999874; Wed, 10 Dec 2025 06:51:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vTLWW-0007GP-2R; Wed, 10 Dec 2025 09:50:36 -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 1vTLWF-0007DU-Mu for qemu-devel@nongnu.org; Wed, 10 Dec 2025 09:50:22 -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 1vTLWD-0003Cc-23 for qemu-devel@nongnu.org; Wed, 10 Dec 2025 09:50:18 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-477ba2c1ca2so90711585e9.2 for ; Wed, 10 Dec 2025 06:50:14 -0800 (PST) Received: from [127.0.1.1] ([2a10:d582:31e:0:62e8:705f:f7a:c7b0]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47a82d7f778sm56595235e9.11.2025.12.10.06.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Dec 2025 06:50:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765378213; x=1765983013; 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=x5J6irympALxO9zFBVJN5fXnibixGLu4B+VHKb8EIcA=; b=BI071+g0bCApAFuwqvPL0KuDouYvXgDyXhcYvIk2gyqCbSbELxvAWaar+58NdpBbYz PruVbbEh0cqF62CE3kVbzbvygC1GYyv4R9bVvN8uVcPD6+ss2/XqdRJ1fA2yDxt6Dj4j 8UHD0NemQtRs10gD0TRJS+MEguWWW3CePncKPYSOwW99ojmhLkXkL6mAz/Ta8mOeMfB/ hZBNkLvICo5/SmdizCLV2a2el7mSZQGzW8K++oZmRAox6MtjVE8sD7YxU+v0DKjjYQdT XR7l6e2xb1WoQVLLg8R/6g8xCeJenCapUOBHFhDdTReCjasfeWJ32q9DmsaJNogfn3R7 2ezA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765378213; x=1765983013; 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=x5J6irympALxO9zFBVJN5fXnibixGLu4B+VHKb8EIcA=; b=ISIe0WTYlabkOjNVxidcMy55oQdXqjh6ym2yc8F839SI/EnuswwaqGcseO7DyeMT/3 wDz+mtabMXK30GNU3KDzjpTRxm4hldFc0ysWqf+O15u3JX2JcnurGAhr0y6Ri8eVCQRf ZWu9AvoEJ/6ImQ9ejZwjTXH8jCQq7+nAWn8RHoq6q0nzpbxVmp99111MJNM5SaStTtn0 hdpRXGF6prX+MncPcP5flv/810t7i4FmF7wLiB7KvpA89Qzo39F9/o/fIyIWjwQMly9p 8CGIZeJdlEOlEvyua7jDpaOfTg5QyOG+MUadFEGRC4vG27vMKgWFk1BEGdXE6ZTRjuba GKQQ== X-Gm-Message-State: AOJu0YyL+PRS3bzFVd6Ou5N+t30EqZcoy6557GVhPetXxXK0fR6Sg235 cxvhQWcSnxgwlz/jPnf+P0+7PGpOLeKtB8qAxtQMgKwzeKB54YzUXeiUzXCseoJT0NPnKSvh5yq xAgNEDRk= X-Gm-Gg: ASbGncuQucZAsiD84yokpUut04DnBcVGgrrR1mdygPdHIBtzHPB889SjUiA4/Tt1U4R iLkoz001EN74qz9KNW3ATy0q974YZf49C6EnDqebIH5itlnW7VOY7kNI3DKLiddPJ9VLpPYK885 ETMInubN4dzLx+qrGvGSNtFvFU8+G5viDPtaz8kh3Vdv4cyxReKIfEqK6uU3adFbeUdlBmqCOph nguMZh56U6xdha8+PqOjMMDm5CDUt7P2RukoSbji79s6i2pTK6i7c5kp3To+BTOIlWoFa45qpwI cu7jiEW8xy8LKxiUeLpLRUQhYChG8F8qvmouM0rtZr1zKWRkY648zR+EB6A8E5jbIrh2P06hjFu j4/R3XjTS9VAo2zv4Yi1e7dsD++CTD6Sm8ZiOXnSo5iTtsi0wm/mXuF4McO0ZrVJd1xWeo34E0Z QGqYFmkc24KaU0Ug== X-Google-Smtp-Source: AGHT+IGeqoDcVYpC0KYM3jG6Gvmo5Fg8nlss0aJIIklrSfoGyHVDBYQ5mE2c2CZmulLzF089MiRJnA== X-Received: by 2002:a05:600c:3484:b0:477:9eb8:97d2 with SMTP id 5b1f17b1804b1-47a837fd285mr30295755e9.8.1765378213509; Wed, 10 Dec 2025 06:50:13 -0800 (PST) From: Jim MacArthur Date: Wed, 10 Dec 2025 14:50:12 +0000 Subject: [PATCH v6 2/4] target/arm: Allow writes to FNG1, FNG0, A2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251210-jmac-asid2-v6-2-d3b3acab98c7@linaro.org> References: <20251210-jmac-asid2-v6-0-d3b3acab98c7@linaro.org> In-Reply-To: <20251210-jmac-asid2-v6-0-d3b3acab98c7@linaro.org> To: qemu-devel@nongnu.org Cc: Jim MacArthur X-Mailer: b4 0.13.0 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: 1765378270577158500 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 | 28 ++++++++++++++++++++++------ target/arm/internals.h | 5 +++++ 3 files changed, 34 insertions(+), 6 deletions(-) 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..534c783be9 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -428,6 +428,15 @@ int alle1_tlbmask(CPUARMState *env) ARMMMUIdxBit_Stage2_S); } =20 +int alle2_tlbmask(void) +{ + return (ARMMMUIdxBit_E20_2 | + ARMMMUIdxBit_E20_2_PAN | + ARMMMUIdxBit_E20_2_GCS | + ARMMMUIdxBit_E20_0 | + ARMMMUIdxBit_E20_0_GCS); +} + static const ARMCPRegInfo cp_reginfo[] =3D { /* * Define the secure and non-secure FCSE identifier CP registers @@ -2802,12 +2811,7 @@ static void vmsa_tcr_ttbr_el2_write(CPUARMState *env= , const ARMCPRegInfo *ri, */ if (extract64(raw_read(env, ri) ^ value, 48, 16) && (arm_hcr_el2_eff(env) & HCR_E2H)) { - uint16_t mask =3D ARMMMUIdxBit_E20_2 | - ARMMMUIdxBit_E20_2_PAN | - ARMMMUIdxBit_E20_2_GCS | - ARMMMUIdxBit_E20_0 | - ARMMMUIdxBit_E20_0_GCS; - tlb_flush_by_mmuidx(env_cpu(env), mask); + tlb_flush_by_mmuidx(env_cpu(env), alle2_tlbmask()); } raw_write(env, ri, value); } @@ -6102,6 +6106,12 @@ static void tcr2_el1_write(CPUARMState *env, const A= RMCPRegInfo *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; + if (((raw_read(env, ri) ^ value) & TCR2_A2) !=3D 0) { + tlb_flush_by_mmuidx(CPU(cpu), alle1_tlbmask(env)); + } + } value &=3D valid_mask; raw_write(env, ri, value); } @@ -6121,6 +6131,12 @@ static void tcr2_el2_write(CPUARMState *env, const A= RMCPRegInfo *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; + if (((raw_read(env, ri) ^ value) & TCR2_A2) !=3D 0) { + tlb_flush_by_mmuidx(CPU(cpu), alle2_tlbmask()); + } + } value &=3D valid_mask; raw_write(env, ri, value); } diff --git a/target/arm/internals.h b/target/arm/internals.h index 75677945af..db9cc1fd73 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1891,6 +1891,11 @@ uint64_t gt_direct_access_timer_offset(CPUARMState *= env, int timeridx); * all EL1" scope; this covers stage 1 and stage 2. */ int alle1_tlbmask(CPUARMState *env); +/* + * Return mask of ARMMMUIdxBit values corresponding to an "invalidate + * all EL2&0" scope. + */ +int alle2_tlbmask(void); =20 /* Set the float_status behaviour to match the Arm defaults */ void arm_set_default_fp_behaviours(float_status *s); --=20 2.43.0 From nobody Sat Dec 13 17:00:18 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=1765378315; cv=none; d=zohomail.com; s=zohoarc; b=W3vX3Wg2GcEgbc74k4aTY1PXNUwGKGCGvrJ3YSyIsZsYT7FA5+ILXE3oi1VHc2EvC7DJqj9tYuABZ/SrE1MGAnqk65lo1MN8iFvVhqzJAqxcidRU8vB3VDa/a4EfWRYGWX7CLGFsiOhZxMyyJah8XPyyl/34VfGWY14Ktf1l/PE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765378315; h=Content-Type: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=39pxJpy6ZHXUTQRTHCJ6qo/oQbW8XDTa4280QEI5Oos=; b=KtNgZ7AUIrJJcuMTHqcocwms4jrjwewsLyW9ll2SxO5lZwnv/qa71GZZLTGwjoR8CnTTjrbwgF9OaDYPmH4dMuVTx9ViOi8TSKVLyCVDgyQ+axOQ0KoKVL4Zwd4HUxVjtqFr0eY8sOjVxFk/8xCbPVbX84a77KdgieUxZ79DaCo= 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 1765378315134489.08900019259124; Wed, 10 Dec 2025 06:51:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vTLWa-0007Gn-Bl; Wed, 10 Dec 2025 09:50:40 -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 1vTLWG-0007DV-8R for qemu-devel@nongnu.org; Wed, 10 Dec 2025 09:50:22 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vTLWD-0003Cg-9k for qemu-devel@nongnu.org; Wed, 10 Dec 2025 09:50:19 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4779d47be12so62324665e9.2 for ; Wed, 10 Dec 2025 06:50:15 -0800 (PST) Received: from [127.0.1.1] ([2a10:d582:31e:0:62e8:705f:f7a:c7b0]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47a82d7f778sm56595235e9.11.2025.12.10.06.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Dec 2025 06:50:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765378214; x=1765983014; 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=39pxJpy6ZHXUTQRTHCJ6qo/oQbW8XDTa4280QEI5Oos=; b=bH0sRNpi4/dFgwoeBb/09+S0r6lRdCAZXtOOAiLGZy2qtitDwk5aCb2MQAEU+z+8by Rr8WgaJbbZ5Jfg89f8p8uXHTt0VkKhR4aZMohJvEdfjhJVEVbKger/XFbPafbf+IqEog j6Z0wqS2D74YeLEeC+FKRDYfQATa3F0gVvcg2j9Q3/gMRVXxG+psMz37wMYTS3fxONJN xs01+g2PWtAUcQdgXs6wOpgR0r811l3GvuyikLaFJNRmJEAbNYM0iiJ2lS7mSa39VOUM oRxv0SYdbxktU0QQpsxQqqy6mHtAi3wcHYCV3/E5u6tQ2MmNgH8d9DESwJMYsFpymcW8 Ipyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765378214; x=1765983014; 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=39pxJpy6ZHXUTQRTHCJ6qo/oQbW8XDTa4280QEI5Oos=; b=c2g7XofS98EcjLkpI700fbtECqfBDOMKj2vybxr/gpStfyR11WK86N3ovY8+pAxKXe fQNZzeo/vnXLhxkmQPh0o5xqkiZRK6FD9Fth6OmMCJoGz0eZuHUFaXNAvIak2UO6oQaJ HJq2yVHTv0D3GJ6mrqttCC/QCVKQ397OLmgMacT5IwCUPqOALQKMQPL51lxhDGe9KLot OBmgC8+Eb3RgpCRnbHri+hhd250/Jb7s+qqmiLvmaoQD55dTdEsFmKmyG0J6tk6iabGP vlka/4FfgrB4zlR8MBtiL5tc7WpsENP5KfH9j/nm2FV9th1CmoDcr7S6wsC/zfozBNCV Nqtw== X-Gm-Message-State: AOJu0Yxy7+PZoAcHGMBP6vUZOOgIpaTpllSgL2rlvgg8dKY9INg0cM1h 8RHZxnO/WNVdWDvK8R35t6c+nagYOHslHTnFFX4TnC5+KmOx0NXodRvcARkfJvuXHLIX4DPZ7n5 8JyKK+ZU= X-Gm-Gg: ASbGncuBbi/YJOHN2KfDItPmbBRX9dk45Q3PucUOX3YyTUmR83zwwG9dH8uVNDvPu8C o72pghy8YNKbRvL/DIOTkjuThfzmh9B6WBQ9b0hmLZmgD/uBRK3UOnjctCCKpUBdhxVFXf/8xfZ XD9Sc+e9TU5VAbX1N7yKlXzjr1FHuR/LXfZASeyrT2FQgioY0xAHB7WuD+T5IMTMWCWf5Tk34S4 Rr/YwiIPrqtnQWN2kNKtdLle9A0N+JNnv83u8U1oK5wboG1LUP0Aw2W2+CW6cEY/XTUsChAQntc CvM+1tRVl0A/flmywX/xVYv+eZNt2umQiyDL8CmBwnUq6tzZsVPA5AWVd+kOdrqvcohKCCjJR2k 85+5XXkYii13SeglFEVW20iGnGYx3Y38Tuj0HScZ7C885tu2JuBOplh7Zzo283sDfYLiwPFKlG4 38WOYsKg0VXCDUMQ== X-Google-Smtp-Source: AGHT+IH1enndv9zaNa8DYGZLVMXo+kLktjfddPsd9ZzDJZv+o5870wJYadATzR1+RgYf84uKt6jzPQ== X-Received: by 2002:a05:600c:a49:b0:477:7bca:8b2b with SMTP id 5b1f17b1804b1-47a83814836mr28753665e9.15.1765378213933; Wed, 10 Dec 2025 06:50:13 -0800 (PST) From: Jim MacArthur Date: Wed, 10 Dec 2025 14:50:13 +0000 Subject: [PATCH v6 3/4] target/arm/tcg/cpu64.c: Enable ASID2 for cpu_max MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251210-jmac-asid2-v6-3-d3b3acab98c7@linaro.org> References: <20251210-jmac-asid2-v6-0-d3b3acab98c7@linaro.org> In-Reply-To: <20251210-jmac-asid2-v6-0-d3b3acab98c7@linaro.org> To: qemu-devel@nongnu.org Cc: Jim MacArthur , Gustavo Romero X-Mailer: b4 0.13.0 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::332; envelope-from=jim.macarthur@linaro.org; helo=mail-wm1-x332.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: 1765378315804158500 docs/system/arm/emulation.rst: Add ASID2 Reviewed-by: Gustavo Romero Signed-off-by: Jim MacArthur Reviewed-by: Richard Henderson --- 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 Sat Dec 13 17:00:18 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=1765378308; cv=none; d=zohomail.com; s=zohoarc; b=Mu1GV2NNG3jDPIU+6s/dv1zecY/IIFbZClMgdqJKjuPOeUOWfQpPYXszfTIk46PRMRj9mPmcbzZACxNVa006Flk9gsYN+Mngfqvo0/vJI/vOfRdBCMP8GPNgWZeZKN+59vwOhFBnAcC5TyUQtssLOA91WSBiMKNnxkO+7A2tg84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765378308; h=Content-Type: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=7aOWTRiqUHiXIPgTQ0LjDGl3N7exU0erok9Ml327P8A=; b=Jet6uk1nEQoQ64xtMIzv9ZTg8XOCyGIr6a3du7B8/pzyt5gv/nWcJUg0PbCA3Ph7C49W7S3urPKxvego1Ac0AWi/nTgUdXdcEqpmZVpnLIwxk78kvQ9La9+/+QSMp2XHeIOrgdhaCPcP51K++1uzkQTC9MU2G8qJsQuFsWXIu6M= 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 1765378308156853.8105579756865; Wed, 10 Dec 2025 06:51:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vTLWa-0007HN-Iz; Wed, 10 Dec 2025 09:50:40 -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 1vTLWG-0007DX-8z for qemu-devel@nongnu.org; Wed, 10 Dec 2025 09:50:22 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vTLWD-0003Cr-3D for qemu-devel@nongnu.org; Wed, 10 Dec 2025 09:50:20 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-477b198f4bcso59973075e9.3 for ; Wed, 10 Dec 2025 06:50:15 -0800 (PST) Received: from [127.0.1.1] ([2a10:d582:31e:0:62e8:705f:f7a:c7b0]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47a82d7f778sm56595235e9.11.2025.12.10.06.50.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Dec 2025 06:50:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765378214; x=1765983014; 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=7aOWTRiqUHiXIPgTQ0LjDGl3N7exU0erok9Ml327P8A=; b=w+CXp/dhrF7LaEb8Kq8Y+5xAbmEdwkv+ZXgRLb66DCCLV+hxtOw4dJ3g783L020lWA 6cNBhlncDBcqADrcY9PEiDZGveocRYkswpXxPHZFOj09R/SQlFK1iIiUbDTfGSJD4n3T 9ckc+fggZgTyj/cvPkjlFBagOSqAptH4WjK1IJ1TRlLQ4LF5hEeXu2LI+/dIm2ENvn1T ZaVwGWEKX4wse1EeMzWA8pfbcYavp/+QDUDdVDI4aQlqhindKVAjcZbWmpup+EIZlMYu sFonEdPmYNrCLDz/n2z2Kfm04djYfu1/CPAGA9+6SiLFSFxn68KKPInC/S47pNRM7yab dfRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765378214; x=1765983014; 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=7aOWTRiqUHiXIPgTQ0LjDGl3N7exU0erok9Ml327P8A=; b=OCbQO/W6bque+P2dWxL/n4TIs/bKoaDsv7CAHNjQMJ+yOcvhuBvXlOajyQ2wnKGM6N Tpo21CtqI1/3Y6tj/+6okrQk7IlWIXy9+nYGTbLDYdHDSkJwktthpnEeZ+PJHMAW+ldh WtX6Wa6lZjE5fjptoO1ZewwZ7sjXfVsB4/OqTAC9gjUv7Z38X2SwJmzsfZzGPcT9taMa B1aof0hbYbmmyXq8TRCvLZw+Ay1+n0Dy9jImqcjjH3gR2zV3q9f2YbDyApGwFs8wxQTl a9YDsEoDwmsyqRvrxsODlOLOFuXJnnqdhgQUaWTEvBKv53KLcXmTrWMaxA21HOqXMfXR vKMg== X-Gm-Message-State: AOJu0Yzt6cujtiudt6yoj0AZ+K8WFWWA7dHbA/hM3hheY30eBv2jY8Ws 7tYmvjcKXcpc+HF7DFYxVsKnyNgGWDxAGBsDtgZL6nWWwqgu/KCovTDU5hyuWplLMc4= X-Gm-Gg: ASbGncvun705lpgC/bXXZhofP75xXeyho7o7zNgsIBNkBv2qDLptcdDyLx6bs7DxdxQ 17XfVFagN4GWDbVbeJte8VNgp7FAe6LEd1zpndd7vv//VXZwJ99WN4q7zxd1nI56YipjInM5TJh GhNKFQI7Oglos0ayYig2ym2PhamEsMbR9i6leXZmR/objw8CyPijTsSy70w4rlPa3yLe1ZttdpZ 9AWf2+c8RJPl1hBeG82lfGMVgb57K2GLnG64AtHFVV32ciQWzKB0Nafq7FLs6c9rIGxJW6JkAr9 8rtMWjmfqCb6czrqdfJHzt1MYwWUhcMBjhufQw54r72LgK0/4LiVyVekYcsKSIVRqF0pFzvpnof 8uhg53vFML1N0CSMLImgUwMmjBkwJ3OyocuaMIsui5Xwu+PtaU1XHvUkVK6TBNgXo9H51i2hHMm 8wOKQZ3SneKk9RSQ== X-Google-Smtp-Source: AGHT+IGdOYsE+ov9xNHgL/iU5//0vXomMkv2q6fga5S2Nx5xdVUZgFoskCaEj3lrkGjh1V++ha3glA== X-Received: by 2002:a05:600c:444f:b0:477:7a78:3016 with SMTP id 5b1f17b1804b1-47a8374ce6bmr27835065e9.8.1765378214313; Wed, 10 Dec 2025 06:50:14 -0800 (PST) From: Jim MacArthur Date: Wed, 10 Dec 2025 14:50:14 +0000 Subject: [PATCH v6 4/4] tests: Add test for ASID2 and write/read of feature bits MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251210-jmac-asid2-v6-4-d3b3acab98c7@linaro.org> References: <20251210-jmac-asid2-v6-0-d3b3acab98c7@linaro.org> In-Reply-To: <20251210-jmac-asid2-v6-0-d3b3acab98c7@linaro.org> To: qemu-devel@nongnu.org Cc: Jim MacArthur , =?utf-8?q?Alex_Benn=C3=A9e?= X-Mailer: b4 0.13.0 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::32a; envelope-from=jim.macarthur@linaro.org; helo=mail-wm1-x32a.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: 1765378309847158500 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. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Jim MacArthur --- tests/tcg/aarch64/system/asid2.c | 76 ++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 76 insertions(+) diff --git a/tests/tcg/aarch64/system/asid2.c b/tests/tcg/aarch64/system/as= id2.c new file mode 100644 index 0000000000..7d5466af34 --- /dev/null +++ b/tests/tcg/aarch64/system/asid2.c @@ -0,0 +1,76 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * + * ASID2 Feature presence and enabled TCR2_EL1 bits test + * + * Copyright (c) 2025 Linaro Ltd + * + */ + +#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 %[idreg3], " ID_AA64MMFR3_EL1 "\n\t" + : [idreg3] "=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 %[idreg4], " ID_AA64MMFR4_EL1 "\n\t" + : [idreg4] "=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