[PATCH v6 62/90] perf/x86/lbr: Remove custom CPUID(0x1c) types

"Ahmed S. Darwish" <[email protected]> Fri, 27 Mar 2026 03:16:16 +0100
Newsgroups dev.linux.lists.x86-cpuid,org.kernel.vger.linux-kernel
Message-ID <[email protected]>
All CPUID(0x1c) call sites have been converted from direct CPUID queries to
the CPUID API and its x86-cpuid-db auto generated types.

Remove the custom CPUID(0x1c) types from <asm/perf_event.h>.

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

diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
index 23caaba1e104..c57e6c9231aa 100644
--- a/arch/x86/include/asm/perf_event.h
+++ b/arch/x86/include/asm/perf_event.h
@@ -197,49 +197,6 @@ union cpuid35_ebx {
 	unsigned int            full;
 };
 
-/*
- * Intel Architectural LBR CPUID detection/enumeration details:
- */
-union cpuid28_eax {
-	struct {
-		/* Supported LBR depth values */
-		unsigned int	lbr_depth_mask:8;
-		unsigned int	reserved:22;
-		/* Deep C-state Reset */
-		unsigned int	lbr_deep_c_reset:1;
-		/* IP values contain LIP */
-		unsigned int	lbr_lip:1;
-	} split;
-	unsigned int		full;
-};
-
-union cpuid28_ebx {
-	struct {
-		/* CPL Filtering Supported */
-		unsigned int    lbr_cpl:1;
-		/* Branch Filtering Supported */
-		unsigned int    lbr_filter:1;
-		/* Call-stack Mode Supported */
-		unsigned int    lbr_call_stack:1;
-	} split;
-	unsigned int            full;
-};
-
-union cpuid28_ecx {
-	struct {
-		/* Mispredict Bit Supported */
-		unsigned int    lbr_mispred:1;
-		/* Timed LBRs Supported */
-		unsigned int    lbr_timed_lbr:1;
-		/* Branch Type Field Supported */
-		unsigned int    lbr_br_type:1;
-		unsigned int	reserved:13;
-		/* Branch counters (Event Logging) Supported */
-		unsigned int	lbr_counters:4;
-	} split;
-	unsigned int            full;
-};
-
 /*
  * AMD "Extended Performance Monitoring and Debug" CPUID
  * detection/enumeration details:
-- 
2.53.0