From nobody Tue Jun 16 03:47:15 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12533382296 for ; Wed, 15 Apr 2026 20:00:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776283247; cv=none; b=HaykC43ajrS84NpkUtKxPk/m0TDoGNLD9TLP7bEoPJHtgziSosGcfZN3dF9Ea5cjwGFD6OLUYZQ5EcEez5yJWI3qXc5SJ6iB9FAV9mG2vFexrbOLKf9J/+iTIcIKKzxgoFp+kRWOnlBsf/b7zV+JcEJxNjvbkDu04Rc9hLntn88= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776283247; c=relaxed/simple; bh=FUKtXSFw/Qq0ekO8ehPznjSIL0j9grfHcs+FuCfLvw0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=vFD/9AdM46KLS89ecoy7GYGJelRbr5RX7m5sW8Sfu5ESTEzigULDbnztGaZalHc7IG/xnISciLzgC3oWxU29vTbGVeI1AfzVLNjlmfelWNHmbn/ZKk4KWMV6n6XcPN1xJ+QXpiMTe6pdsviC3qKh4Dc5CS94lp+v+VCHln9beQw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Cs5uBIMp; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=jjeGloDU; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Cs5uBIMp"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="jjeGloDU" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63FEZf652972348 for ; Wed, 15 Apr 2026 20:00:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=QN+m/SC6FSjWpX9y+8goQIhqVtjzyGE3j5D K0NVFuSU=; b=Cs5uBIMppMbLGAeNqVngfVIF/NUPVNA3ZPQt3NM8fOixplzVRYM spbj52zJ/nbB+zAuDAhdRH2aEHyxwYTPfwU8l1Plv/q4CSiLCyRHWjG7Hrs5U7In K7WyToOHTAGlHOYdjtnT+4X6mWYjMNlGxfGqRaijShl+Tq8oY5JOrMPZGQ8Tn8te 4GI6XBCSljnBu1xmniNC/ZLgVzRVQxEEWvP4tEs5/si3WVOyZiYBfG9f3g/PwuCg qA3D19PLUavnASCaXbVZ2thRRtzrUGyNGScQMJpI5vUtmbLW7XZQpjeYGnviwFch kjLOU27DHpCGHv+hyrizctPgbGs2oq07o2w== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dj74gaew9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 15 Apr 2026 20:00:44 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2b2e6ee9444so47178915ad.1 for ; Wed, 15 Apr 2026 13:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1776283243; x=1776888043; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=QN+m/SC6FSjWpX9y+8goQIhqVtjzyGE3j5DK0NVFuSU=; b=jjeGloDU622PdMcdpTp1r24DLFnAkSgabrvPPK6KYGV0KR2EzdL+rGf78GfZO3S8FS iQy5cRLf/3matjTl0GrAp03o9Yh4ekIn9TjHlfT1aEW5i9mI+Viat8vKZT1CSr+/wYhl 2y8TqrNegumTmSVD68JSdjpdK/QBqlh766M3YiQu2ghLqogUC5BriAL+bdYuU0LUtwi+ geDYYLUH6KzSw6VpOe61btI1o6JkXBiAKJ147cl2BhbP/6eoU95Lc0n1Q6VSvM+ysdGG DV6PuI8wNOC8GZnmb+mwp6w6p7k7kOf7Y7cH2yxmiW1hh8KW6Hm1sSoWkBe/4EfUNAb1 qp6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776283243; x=1776888043; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=QN+m/SC6FSjWpX9y+8goQIhqVtjzyGE3j5DK0NVFuSU=; b=aOeOHNoqFQh/9W0zJP1CUgsosiMBwcD8Ak0GK/ZKb/hYqPuc/Fn5XYkGK8wbg1StPp 02gJHXhl+mQYN6F1pyN+eG9ROqKBXFd4HyTtM85PhXWm9x35y0QhK26JGQR1slPpmM5Q Y5ID/4LwDq7KGx0X7P+QW3NyqjdLHBMBcv6F15FlG0sR5koFPNfcGRlATWx99BDL2IPe ee/lnobv6VY2xZiNuwAamxUacFX690pjHaxrKGRaOvwxhj6ALJsSEgZJS6U+dE1/6UM1 HZMnVKYwjxUlF4KKKKSyxZTScdALJPxyC7QNr51H8TVZJE4lDbQkt05CzKyb3uyOsM+g 8ExA== X-Forwarded-Encrypted: i=1; AFNElJ9TAwXkAuZCxZYEYIi3u4RltBmqZZ9NGsf6hA7zN8jXxGKsgfC4XizV5MudX1TJpAojjt2MK17RcSK+8cA=@vger.kernel.org X-Gm-Message-State: AOJu0YxiDC0VaL+nZT3ZKCAYsNr2x1Vmsu7JpbjcpSHXrwhZOOIECKfP xVvJpsZI0dHtPDkTPzQ8wbYdPx60cNwnS6pyJruJTt1xIl4JNTn/w0DF53luH1kMFunEDbfRAif d2Vpa0TIPRxNgneTnLH2yWd4RiSUibCzCuQsdas5MYYs39ObvtWFbLmkLmfR7DUmwu2k3ATuHOp U= X-Gm-Gg: AeBDietr95NYnRaO7LzKjt7QpttKCgQSFjTIIAWThDFkCRbJ2dZZ+znXncFXh/pXRH8 zAHOdxTYic3lnK88r408EiamR0gcQfeccV4Izy7OVmbj4EMUGUflQnsVdsj4qYL11VS+ShLmW94 ht5NRfjSauQ1XCP+7OyCC6M8Sj9q3wnYHcv8hWVI5UDaiKyCmnfDbkcdE1sTGA8rN7BnH0qH/YZ jyfPihMRXSCG5DwOR+ffAXuPKUylgDThWhPb7Px3U8vRNRPIhAVlKL6Su9k8pUSfD9ykE67hg4w qLfTGpORG03Fj1sc6EeBMhYQmHA4tOPYTWqKZa1o0LVTGhziope2L6wlZhwOxFFmgAAMQFJ2wAR 20jK5xeH3CwEZnhLIupNWYhq8LYbEUAYal5E8b0o8ZwvZwphV X-Received: by 2002:a17:902:be02:b0:2b2:5070:8b with SMTP id d9443c01a7336-2b5eaa1ef15mr5414635ad.1.1776283243231; Wed, 15 Apr 2026 13:00:43 -0700 (PDT) X-Received: by 2002:a17:902:be02:b0:2b2:5070:8b with SMTP id d9443c01a7336-2b5eaa1ef15mr5414295ad.1.1776283242544; Wed, 15 Apr 2026 13:00:42 -0700 (PDT) Received: from hu-mojha-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b47826e232sm27423905ad.48.2026.04.15.13.00.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 13:00:42 -0700 (PDT) From: Mukesh Ojha To: Catalin Marinas , Will Deacon , Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mukesh Ojha Subject: [PATCH] arm64: cpufeature: Fix GCIE field ordering in ftr_id_aa64pfr2 Date: Thu, 16 Apr 2026 01:30:31 +0530 Message-ID: <20260415200031.1885440-1-mukesh.ojha@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDE1MDE4NyBTYWx0ZWRfXxEZ3rCvbxoS+ /6USjEipPFGArunKM8V0PgDLBOdkYPGCvw03LetYNQHUgQIaWO46NnlsGvKdQbSlZWw8JT/lksO JowyfUvt5KQKWBKlswUoY42zoJb2WZanMRACFEsQB9bOwcaIzNrCTbDRy20EifgMsJC0Z9G0Md2 HENs1z1sbOIN8e/vQZ7yQPmyVQBtKq2WbqQHQ9ekJVpVaPsVcr45v+we+RkQ+etZcKt2xlGocTN OTpJBal4/IXJ6psgfgGjQUt97ixizlq7dSf0j8g4Dgvvior2Rxw0EGMBSYIUbvyVzziLmBgFRxc jgTU161dpgSnoa3Mqx7Tz56MaAqw4ak7gNKdX151I8ljjv/lwZt/C3jKO4XoJUbokxVS8ec/uiJ 3GiqNVa8Nf10gST8WcFXjMHIJlXC0OJEwwaDGm+90sTy3ZIZJuxcD8HCtKI9Ag82JJb19dokg8Y fZYDUK57RqUboNovQmA== X-Proofpoint-ORIG-GUID: iVHBk8ePr0iyXK7bZnHcfBhpbhbap1pM X-Authority-Analysis: v=2.4 cv=ZIfnX37b c=1 sm=1 tr=0 ts=69dfee6c cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=J9pcbZUIVKvfiMDc_lMA:9 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-GUID: iVHBk8ePr0iyXK7bZnHcfBhpbhbap1pM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-15_01,2026-04-13_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 spamscore=0 bulkscore=0 phishscore=0 clxscore=1015 malwarescore=0 adultscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604070000 definitions=main-2604150187 Content-Type: text/plain; charset="utf-8" The ftr_id_aa64pfr2[] array must be sorted in descending order of shift value so that the overlap validation in init_cpu_features() works correctly. The GCIE field (bits 15:12, shift=3D12) was placed last in the array, after MTEFAR (bits 11:8, shift=3D8) and MTESTOREONLY (bits 7:4, shift=3D4), causing a spurious warning at boot: [ 0.000000] SYS_ID_AA64PFR2_EL1 has feature overlap at shift 12 [ 0.000000] WARNING: arch/arm64/kernel/cpufeature.c:989 at init_cpu_feat= ures+0x144/0x3d0, CPU#0: swapper/0 .. [ 0.000000] pc : init_cpu_features+0x144/0x3d0 [ 0.000000] lr : init_cpu_features+0x144/0x3d0 [ 0.000000] sp : ffffc08678f03dc0 ... 0.000000] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffc08678f1= 4000 [ 0.000000] Call trace: [ 0.000000] init_cpu_features+0x144/0x3d0 (P) [ 0.000000] cpuinfo_store_boot_cpu+0x4c/0x5c [ 0.000000] smp_prepare_boot_cpu+0x28/0x38 [ 0.000000] start_kernel+0x1d4/0x848 [ 0.000000] __primary_switched+0x88/0x90 This is because the overlap check computes (shift + width) > prev_shift, i.e. (12 + 4) > 8, which triggers since GCIE occupies bits above MTEFAR but was listed after it. Fix the ordering to match the register layout: FPMR(35:32), GCIE(15:12), MTEFAR(11:8), MTESTOREONLY(7:4). Fixes: 899ff451fcee ("KVM: arm64: Advertise ID_AA64PFR2_EL1.GCIE") Signed-off-by: Mukesh Ojha --- arch/arm64/kernel/cpufeature.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 48f2d894101d..6d53bb15cf7b 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -328,9 +328,9 @@ static const struct arm64_ftr_bits ftr_id_aa64pfr1[] = =3D { =20 static const struct arm64_ftr_bits ftr_id_aa64pfr2[] =3D { ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR2_EL1_F= PMR_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR2_EL1_GC= IE_SHIFT, 4, ID_AA64PFR2_EL1_GCIE_NI), ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR2_EL= 1_MTEFAR_SHIFT, 4, ID_AA64PFR2_EL1_MTEFAR_NI), ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR2_EL= 1_MTESTOREONLY_SHIFT, 4, ID_AA64PFR2_EL1_MTESTOREONLY_NI), - ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR2_EL1_GC= IE_SHIFT, 4, ID_AA64PFR2_EL1_GCIE_NI), ARM64_FTR_END, }; =20 --=20 2.53.0