[PATCH v7 100/120] perf/x86: Remove custom CPUID(0x80000022) types

"Ahmed S. Darwish" <[email protected]> Thu, 28 May 2026 17:39:02 +0200
Newsgroups dev.linux.lists.x86-cpuid,org.kernel.vger.linux-kernel
Message-ID <[email protected]>
All CPUID(0x80000022) call sites have been converted to the CPUID API and
its auto generated x86-cpuid-db data types.

Remove the custom CPUID(0x80000022) types from perf.

Signed-off-by: Ahmed S. Darwish <[email protected]>
---
 arch/x86/include/asm/perf_event.h | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
index ff844cec22ab..61da03dfb642 100644
--- a/arch/x86/include/asm/perf_event.h
+++ b/arch/x86/include/asm/perf_event.h
@@ -161,24 +161,6 @@
 #define ARCH_PERFMON_PEBS_CAP_LEAF		0x4
 #define ARCH_PERFMON_PEBS_COUNTER_LEAF		0x5
 
-/*
- * AMD "Extended Performance Monitoring and Debug" CPUID
- * detection/enumeration details:
- */
-union cpuid_0x80000022_ebx {
-	struct {
-		/* Number of Core Performance Counters */
-		unsigned int	num_core_pmc:4;
-		/* Number of available LBR Stack Entries */
-		unsigned int	lbr_v2_stack_sz:6;
-		/* Number of Data Fabric Counters */
-		unsigned int	num_df_pmc:6;
-		/* Number of Unified Memory Controller Counters */
-		unsigned int	num_umc_pmc:6;
-	} split;
-	unsigned int		full;
-};
-
 struct x86_pmu_capability {
 	int		version;
 	int		num_counters_gp;
@@ -498,11 +480,6 @@ struct arch_pebs_cntr_header {
 	u32 reserved;
 };
 
-/*
- * AMD Extended Performance Monitoring and Debug cpuid feature detection
- */
-#define EXT_PERFMON_DEBUG_FEATURES		0x80000022
-
 /*
  * IBS cpuid feature detection
  */
-- 
2.54.0