Re: [PATCH v6 65/90] perf/x86/intel: Remove custom CPUID(0x23) types

[Maciej Wieczor-Retman]

On 2026-03-27 at 03:16:19 +0100, Ahmed S. Darwish wrote:
>All CPUID(0x23) call sites have been converted to the CPUID API and its
>auto generated x86-cpuid-db data types.
>
>Remove the custom CPUID(0x23) types from perf.
>
>Signed-off-by: Ahmed S. Darwish <darwi@xxxxxxxxxxxxx>
>---
> arch/x86/include/asm/perf_event.h | 38 +------------------------------
> 1 file changed, 1 insertion(+), 37 deletions(-)
>
>diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
>index c57e6c9231aa..5aa07710af12 100644
>--- a/arch/x86/include/asm/perf_event.h
>+++ b/arch/x86/include/asm/perf_event.h
>@@ -157,46 +157,10 @@
> /* Steal the highest bit of pebs_data_cfg for SW usage */
> #define PEBS_UPDATE_DS_SW	BIT_ULL(63)
> 
>-/*
>- * Intel "Architectural Performance Monitoring extension" CPUID
>- * detection/enumeration details:
>- */
>-#define ARCH_PERFMON_EXT_LEAF			0x00000023
>-#define ARCH_PERFMON_NUM_COUNTER_LEAF		0x1
>-#define ARCH_PERFMON_ACR_LEAF			0x2
>+// _CPUID_TODO_: Remove subleaf 4 and 5 after defining them
> #define ARCH_PERFMON_PEBS_CAP_LEAF		0x4
> #define ARCH_PERFMON_PEBS_COUNTER_LEAF		0x5

I think these two and the TODO comment can be removed? I don't see the constants
used anywhere anymore.

-- 
Kind regards
Maciej Wieczór-Retman