From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from TYDPR03CU002.outbound.protection.outlook.com (mail-japaneastazolkn19013087.outbound.protection.outlook.com [52.103.43.87]) (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 533B336EAB1 for ; Mon, 23 Mar 2026 08:07:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.43.87 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774253264; cv=fail; b=Uj2LGA/I6yj3hJdBPgUHi7hHqPeO6Ac7MB6ByylRU13cc0dlqRdAoPSdkNlsNF4mw8OioVtePGaHhKK5kRXvFmoHlhHc9ozAehcrfWC+HDJdvg5rc9zkT+3jxamayIc6iquykLcqvQ3GEWVEkIfUkBCZAah+CjhROiTCpXPm4B4= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774253264; c=relaxed/simple; bh=/x1L5xQpNEwj+lhVtIIUr7p0vl8dI74Omw0bGDmkheA=; h=From:To:Cc:Subject:Date:Message-ID:Content-Type:MIME-Version; b=rPdwxZcVR04SfhOPOpwnKs+wXCc9HjGIPnIxJTiUyUTXp3tPbe/mPq7nOhevo7+8dl10rO66M0fdCkv6Y7I+6CeIihBbmN8piy6spYg7m5JukXwNZnB7f9DrXJwE7vkxNAgk1Mbb9dxLeoOEhfjVp9snaP8z5OiRd8iX6orbsL0= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com; spf=pass smtp.mailfrom=hotmail.com; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b=YUnC8wyb; arc=fail smtp.client-ip=52.103.43.87 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=hotmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hotmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hotmail.com header.i=@hotmail.com header.b="YUnC8wyb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=y6NGxzyPsXlZ8jiOLVN3ot1N1ghA1ww6V4BlhkjvaN70sOi10nld+IsGXGlU+C9IA36OcmFsDs6NBKoWj0BpMhb9sgbHrgWQcP1CSJnNYmQZDfuVoyTowu5C89IJ2mVNQQcSfLZWbATU/nIhVQCZaZSWj3kLqXbKvdipDe0R6IaU8rqab4IJ1OGJ11FDjvxTYnaKidCIn0yTPHcEJCnp9rFXXL5NSLJxKIFbI8NGR/lktLgcNxwMBR/zv4b4Nn7Pn+dd397IsygcAyqyrUdePprqH47zbi5Va9j1NLaUqgzxYA88kn84C8qDrHzp2YqVNC2aNw7nLnChnh02qdFgNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=h7GhZIU6YBa5w80kTJByAmgsmHw1isQBs6Qj6aqS9/k=; b=uCdSU8wkEyhvqpEiRzxYdX4copShwyFjZETLJv7gR1VT+Wn0eR0WnWbuU/T81zRYSQ9Rv8WktEQslS120bkINeaEKl6y2s4fzFsxJ/S5TyJHK8zZTx5Oj8/XZ6DC7UFpj9ffW9nAcacF8s3sTGoZuyX0N7Kt9qNwc8WS1MPQ6PxhWuExUeniM0vtniIWiWNx3kexiUxQAhVVjTBUd0Z/kjqjxxWV357hTWvcnI8uqoahmSdXG/C0nt9rvgGGAaV1PGxid+BsneuuXgg35CHiUk3hckavGP+HBXiaQv31y2a9DUlV2txu+e0LpDsGBk0doYQfpEv88rjBjmSw/3GtWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h7GhZIU6YBa5w80kTJByAmgsmHw1isQBs6Qj6aqS9/k=; b=YUnC8wybgz0rFnnhU6O8QvZgYP0pket9J5DO3esSzrVFfGQmrcsF5xFex4/pdXUdV/JMOL9P0UUJZcmN1surs/yqJ9MMqBv0IctnaDOihFakzfyVs+jW9aDWDdzzNbZvTebq3EbkXReCjI44AImqIoo3U1J3q+simDDkOxdQ3NRUuxNK16dRECmo00K3aNgXFj1297fYydEC740pUXlaNfEeJ+o3Fej+2IQdFQqzPmHoMZ6rXCADZiAk3Vk4B7nMoGOKHhzhlJrTfD3Mfb92gRdo7wLQkJtuXoEiFEOSWchrq2L1GiBF1R3mKdOVR3e6knhunPIZFkpfaI15SreyMQ== Received: from SI2PR01MB4393.apcprd01.prod.exchangelabs.com (2603:1096:4:1b0::7) by SEZPR01MB5246.apcprd01.prod.exchangelabs.com (2603:1096:101:f1::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9723.31; Mon, 23 Mar 2026 08:07:15 +0000 Received: from SI2PR01MB4393.apcprd01.prod.exchangelabs.com ([fe80::c735:fab8:6e3d:6d1c]) by SI2PR01MB4393.apcprd01.prod.exchangelabs.com ([fe80::c735:fab8:6e3d:6d1c%4]) with mapi id 15.20.9723.022; Mon, 23 Mar 2026 08:07:35 +0000 From: Wei Wang To: bp@alien8.de, tglx@kernel.org, mingo@redhat.com, ludloff@gmail.com, xuyongwei@open-hieco.net, dave.hansen@linux.intel.com, pawan.kumar.gupta@linux.intel.com Cc: x86@kernel.org, linux-kernel@vger.kernel.org, wei.w.wang@hotmail.com Subject: [RESEND PATCH v1] x86/cpu/topology: Consolidate AMD and Hygon cases in parse_topology() Date: Mon, 23 Mar 2026 16:07:19 +0800 Message-ID: X-Mailer: git-send-email 2.51.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SL2P216CA0128.KORP216.PROD.OUTLOOK.COM (2603:1096:101:1::7) To SI2PR01MB4393.apcprd01.prod.exchangelabs.com (2603:1096:4:1b0::7) X-Microsoft-Original-Message-ID: <20260323080719.1049194-1-wei.w.wang@hotmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR01MB4393:EE_|SEZPR01MB5246:EE_ X-MS-Office365-Filtering-Correlation-Id: f6b261ad-6f12-4343-c10e-08de88b33ccd X-Microsoft-Antispam: BCL:0;ARA:14566002|23021999003|5062599005|5072599009|51005399006|19110799012|8060799015|461199028|15080799012|37102599003|37011999003|40105399003|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?acMtve8IZ4NCxG2vfkOzyW1T5+lT+tHXYfPTwStmBCHnos5j2Onthg4HL0E3?= =?us-ascii?Q?Z+kXvhnRtxjUZg4ZFi/QUoT1L64eq+iZ+dmarFBwwRHvJJrZ78Cyc/UfSHqm?= =?us-ascii?Q?w7oIpDyQzJRWmEZESPGt8ZSrKwJy7uDDFO9iGeelrNQrsbAmSYf+K+K2DxK2?= =?us-ascii?Q?0OLdJTotf8Vu9RrciZlEYcHkQQVkLBZ1GZ6KwYgQQpJ9Hne3GZhwQ6twJgSk?= =?us-ascii?Q?vszRx+txhuVns1hAtS5t/5IwWqn8YqZ0IN9RRI/f2kjFIfPYiKR+R+0FqX4v?= =?us-ascii?Q?qkvJuzII5Hr0xI9ZZD2sLLECGhEsEei48j54RwQNkyWeJ222hNbm7yTNMgGU?= =?us-ascii?Q?vSTuMW5fvSX7abqwNH9tLHydauXCGdl9tTuhzIPkjsMF6CYYsmQMX+oNC/Vz?= =?us-ascii?Q?BU2hb0lMbRfjTCVgTNpolAapbHRKMPK6g7wKbs/15LuzxrGr5sLN2gVvkPm2?= =?us-ascii?Q?dNywNvWQbXywkuHSsd2ZEVBs0c26ZR8JngdJ+4UenczNPS8GPiZF1nz4e58f?= =?us-ascii?Q?NXm1OpjdAAjTpktAesMMRj9UkkqnRLWOSX9b9Yec2daeCCYLmP0tW6xEhXH/?= =?us-ascii?Q?9Y3a54A1GYlbCZnxAL1lKfgLGVUkRWgYIoYeXVub61AY+9P2Fu6TQq1ikJSw?= =?us-ascii?Q?jupb6hooRKviO7g7c3v0joB95pPibdmQZ4cZ8+idgs2L7j4Y6m9+MO81GsFT?= =?us-ascii?Q?C2TBjC/4zYywFna5lLbaAvFwTlWSIyZ8H0uL6wNQPNfnY0jRouI6Yro25lNr?= =?us-ascii?Q?pNCah/ZPAH6oU2LZ+auW8yBUGWzc3xSwCiFGAloYPzhvqHL9rZ9VNh5mlSHi?= =?us-ascii?Q?eL54zzZxVMdtq+9hSCM2KezpRUDTTWJkzYXbiizkaPLegCliZe7h5jdbaCbH?= =?us-ascii?Q?xbARFSVm5AjgzJm28yvoDQbPGr6z3AOaWMt3lguCkFMCsDKmShBLAMS69m8Q?= =?us-ascii?Q?BiU72f2yy7i6pghUPVk8txpZZAhSvijKe+tI7M7TCfh8H8XyBZ1GkUR7IcRI?= =?us-ascii?Q?sTFf4vQdsssAXBO3wy6QXpVyNw=3D=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xOnlwLKnnoGxAVXDSSA/SEZF54wC8prUB5iI5XOrJvJ3No+mqqGqsgavj3rc?= =?us-ascii?Q?ZzAC29szVjYJ7w42XgYY4lYLC3AvesXHbLeEQRNcCeFNepopFAboBK6XXekF?= =?us-ascii?Q?l2wMZcvutCKTvK26tHfv4OC4wLMI2+5JMYIru5OMgK88k2VTd/9STggCqTG8?= =?us-ascii?Q?8LMOoScuQgd8Nh30hMl16iRo28y2Ibi8o5CXTtCeIR1aRWrvnNFEaYOx21FX?= =?us-ascii?Q?6Zmnrfy3Cjign1AJH9rsQoerZrJp6GnkujCcZmEnIlhsa2nP1rfSzs/qgkHq?= =?us-ascii?Q?4cmMKU0FL+JxkGGqZHujSa0rODbhwXXDeRsiD6mB2TW0Auyl04UUrLutRe84?= =?us-ascii?Q?em7FEumQsmB4zpmnbW53v6VgLG74HL5/g8Xog6bBH2IJ254ClBa/z3W2eXub?= =?us-ascii?Q?4ITI76Y94rRSXUvqEC3XYCn2kiQfS03kNQerIhgz3i9pEA3L7yz7VKV30zQs?= =?us-ascii?Q?0bgbg4KgddlAu+pQ/BKDygmESkPRh3cf0LMUenMvFHC5ewwu1UMf/PTKNQRq?= =?us-ascii?Q?H1/AVlc0SD6tjX93AK7k9+icH3+AahV2V8t/HFCFpNNZM43RQxjFxwAFla5t?= =?us-ascii?Q?KpusIBivpqb616GWTMz/NIPUIUPj0ivjqLKpJCDoShSXp6CRBDCGTijaKsu2?= =?us-ascii?Q?v9M6ys3yGIqvvX8mfLAH+GZ3Fyv29ndJRsCfiKTtmZ1xab7ClRBdcrTUgReH?= =?us-ascii?Q?68fq2ubDZiFFesgK8wHIavnoSPCeG6av1i7GXR4RZu8FvrC9TKn1uIBGc6hG?= =?us-ascii?Q?eJiOJMFVsZuRX1WlQO05qGKgF5THyTIemq8Gwdmk9mu2UHj/hkvd+/ulA80e?= =?us-ascii?Q?FOHMwyKEwSbn13pk9VQpO4/E4bbLLIIiKxO5HZkqIdAeOmzigwA0gSw1o4Tv?= =?us-ascii?Q?SgibZ/QmxhntmLhiSYdCq5shApGj+Fxe/AhgO7Fovc1fl998rT0XpiT0wbaP?= =?us-ascii?Q?qdJuEy+TGD0eA41aHawau2QjquZ2t4jvTToDlzY1f5jl/SmHQNC7H86yo6K7?= =?us-ascii?Q?R/pswYEj2Lzi7D26DNcEAL5nQp7LXcciE9+rCCJypgjQgpAuzgouh77TOc0v?= =?us-ascii?Q?rCqbJiVKlrt5ewAesv6b8AkG5DLOIW79kSqn/vQQAIxczk25YBaPn0SrOgv0?= =?us-ascii?Q?VCICGWiXVWP8/oCJjvj2vBbTFhrKO1ASr9wT/N5VruTzRo6W7bzMmVeLyvyW?= =?us-ascii?Q?3IOcoN6nZO5vhS99N7dxomfS36NUUY+tOK1IejI4QRSL8esUUvwPTyL2sJRG?= =?us-ascii?Q?AlyP07nnh313d//sXxy793aijfaG+29Pq16x7vAHc8Mzzrup/wODY7OSsys3?= =?us-ascii?Q?pBFyvVvgavxbO43f3MxzTmzKpkRKhiCyFvIbCtyy7UscGuoY5X7ObN7AtaFq?= =?us-ascii?Q?zfBDKEMiSxOIlwxIj/6ocigKkWbZ?= X-OriginatorOrg: sct-15-20-9412-4-msonline-outlook-3e488.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: f6b261ad-6f12-4343-c10e-08de88b33ccd X-MS-Exchange-CrossTenant-AuthSource: SI2PR01MB4393.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2026 08:07:34.9275 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR01MB5246 Merge the two separate switch cases for AMD and Hygon as they share the common cpu_parse_topology_amd(). Also drop the IS_ENABLED(CONFIG_CPU_SUP_AMD/HYGON) guards, because 1) they are dead code: when a vendor's CONFIG_CPU_SUP_* is disabled, its vendor detection code (in amd.c / hygon.c) is not compiled, so x86_vendor will never be set to X86_VENDOR_AMD / X86_VENDOR_HYGON, instead it will default to X86_VENDOR_UNKNOWN and those switch cases are unreachable. 2) topology_amd.o is always built (obj-y), so cpu_parse_topology_amd() is always available regardless of CPU_SUP_* configuration. Signed-off-by: Wei Wang Tested-by: Yongwei Xu --- RESEND changes - Add Tested-by from Yongwei - Rebase to 7.0.0-rc4 arch/x86/kernel/cpu/topology_common.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/topology_common.c b/arch/x86/kernel/cpu/topology_common.c index 71625795d711..d0d79d5b8eb9 100644 --- a/arch/x86/kernel/cpu/topology_common.c +++ b/arch/x86/kernel/cpu/topology_common.c @@ -157,8 +157,8 @@ static void parse_topology(struct topo_scan *tscan, bool early) switch (c->x86_vendor) { case X86_VENDOR_AMD: - if (IS_ENABLED(CONFIG_CPU_SUP_AMD)) - cpu_parse_topology_amd(tscan); + case X86_VENDOR_HYGON: + cpu_parse_topology_amd(tscan); break; case X86_VENDOR_CENTAUR: case X86_VENDOR_ZHAOXIN: @@ -170,10 +170,6 @@ static void parse_topology(struct topo_scan *tscan, bool early) if (c->cpuid_level >= 0x1a) c->topo.cpu_type = cpuid_eax(0x1a); break; - case X86_VENDOR_HYGON: - if (IS_ENABLED(CONFIG_CPU_SUP_HYGON)) - cpu_parse_topology_amd(tscan); - break; } } base-commit: 785f0eb2f85decbe7c1ef9ae922931f0194ffc2e -- 2.51.0