* [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming
@ 2024-12-13 20:50 Dave Hansen
2024-12-13 20:50 ` [PATCH 01/10] x86/cpu: Move MWAIT leaf definition to common header Dave Hansen
` (9 more replies)
0 siblings, 10 replies; 13+ messages in thread
From: Dave Hansen @ 2024-12-13 20:50 UTC (permalink / raw)
To: linux-kernel
Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh,
david.e.box, Dave Hansen
Changes from v1:
* Drop bogus "Check MWAIT feature instead of CPUID level" patch
* Add review tags
--
I noticed that the MWAIT code was rather haphazard in how it deals
with CPUID leaf levels. As a result, there were a ton of unnecessary
checks for ->cpuid_level. It is truly the worst offender because
arch/x86, intel_idle and ACPI that want to poke at it.
Move several of the leaf definitions to one place (cpuid.h). Use
the definitions to get rid of magic numbers. Simplify the code
when the CPUID feature level dependencies can be used. Lastly,
change all the leaf names to be consistent.
This does not get *ALL* the leaves. The topology and cache ones
are left along for now, but they can also be converted over.
arch/x86/events/intel/pt.c | 5 ++--
arch/x86/events/intel/pt.h | 3 --
arch/x86/include/asm/cpuid.h | 7 ++++++
arch/x86/include/asm/fpu/xstate.h | 4 ---
arch/x86/include/asm/mwait.h | 1
arch/x86/kernel/acpi/cstate.c | 5 ++--
arch/x86/kernel/cpu/common.c | 7 +++---
arch/x86/kernel/fpu/xstate.c | 26 ++++++++++--------------
arch/x86/kernel/hpet.c | 6 +----
arch/x86/kernel/process.c | 3 +-
arch/x86/kernel/smpboot.c | 5 +---
arch/x86/kernel/tsc.c | 23 ++++++++++-----------
arch/x86/xen/enlighten_pv.c | 5 ++--
drivers/acpi/acpi_pad.c | 5 +---
drivers/dma/ioat/dca.c | 8 ++++---
drivers/idle/intel_idle.c | 6 +----
drivers/platform/x86/intel/pmc/core.c | 7 +++---
17 files changed, 61 insertions(+), 65 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 01/10] x86/cpu: Move MWAIT leaf definition to common header 2024-12-13 20:50 [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming Dave Hansen @ 2024-12-13 20:50 ` Dave Hansen 2024-12-13 20:50 ` [PATCH 02/10] x86/cpu: Use MWAIT leaf definition Dave Hansen ` (8 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Dave Hansen @ 2024-12-13 20:50 UTC (permalink / raw) To: linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box, Dave Hansen, zhao1.liu From: Dave Hansen <dave.hansen@linux.intel.com> Begin constructing a common place to keep all CPUID leaf definitions. Move CPUID_MWAIT_LEAF to the CPUID header and include it where needed. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> --- b/arch/x86/include/asm/cpuid.h | 2 ++ b/arch/x86/include/asm/mwait.h | 1 - b/arch/x86/kernel/acpi/cstate.c | 1 + b/arch/x86/kernel/hpet.c | 1 + b/arch/x86/kernel/process.c | 1 + b/arch/x86/kernel/smpboot.c | 1 + b/arch/x86/xen/enlighten_pv.c | 1 + b/drivers/acpi/acpi_pad.c | 1 + b/drivers/idle/intel_idle.c | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff -puN arch/x86/include/asm/cpuid.h~mwait-leaf-checks-0 arch/x86/include/asm/cpuid.h --- a/arch/x86/include/asm/cpuid.h~mwait-leaf-checks-0 2024-12-13 12:45:32.547041911 -0800 +++ b/arch/x86/include/asm/cpuid.h 2024-12-13 12:45:32.563042590 -0800 @@ -21,6 +21,8 @@ enum cpuid_regs_idx { CPUID_EDX, }; +#define CPUID_MWAIT_LEAF 5 + #ifdef CONFIG_X86_32 bool have_cpuid_p(void); #else diff -puN arch/x86/include/asm/mwait.h~mwait-leaf-checks-0 arch/x86/include/asm/mwait.h --- a/arch/x86/include/asm/mwait.h~mwait-leaf-checks-0 2024-12-13 12:45:32.547041911 -0800 +++ b/arch/x86/include/asm/mwait.h 2024-12-13 12:45:32.563042590 -0800 @@ -15,7 +15,6 @@ #define MWAIT_HINT2SUBSTATE(hint) ((hint) & MWAIT_CSTATE_MASK) #define MWAIT_C1_SUBSTATE_MASK 0xf0 -#define CPUID_MWAIT_LEAF 5 #define CPUID5_ECX_EXTENSIONS_SUPPORTED 0x1 #define CPUID5_ECX_INTERRUPT_BREAK 0x2 diff -puN arch/x86/kernel/acpi/cstate.c~mwait-leaf-checks-0 arch/x86/kernel/acpi/cstate.c --- a/arch/x86/kernel/acpi/cstate.c~mwait-leaf-checks-0 2024-12-13 12:45:32.551042081 -0800 +++ b/arch/x86/kernel/acpi/cstate.c 2024-12-13 12:45:32.563042590 -0800 @@ -13,6 +13,7 @@ #include <linux/sched.h> #include <acpi/processor.h> +#include <asm/cpuid.h> #include <asm/mwait.h> #include <asm/special_insns.h> diff -puN arch/x86/kernel/hpet.c~mwait-leaf-checks-0 arch/x86/kernel/hpet.c --- a/arch/x86/kernel/hpet.c~mwait-leaf-checks-0 2024-12-13 12:45:32.551042081 -0800 +++ b/arch/x86/kernel/hpet.c 2024-12-13 12:45:32.563042590 -0800 @@ -7,6 +7,7 @@ #include <linux/cpu.h> #include <linux/irq.h> +#include <asm/cpuid.h> #include <asm/irq_remapping.h> #include <asm/hpet.h> #include <asm/time.h> diff -puN arch/x86/kernel/process.c~mwait-leaf-checks-0 arch/x86/kernel/process.c --- a/arch/x86/kernel/process.c~mwait-leaf-checks-0 2024-12-13 12:45:32.551042081 -0800 +++ b/arch/x86/kernel/process.c 2024-12-13 12:45:32.563042590 -0800 @@ -30,6 +30,7 @@ #include <linux/hw_breakpoint.h> #include <linux/entry-common.h> #include <asm/cpu.h> +#include <asm/cpuid.h> #include <asm/apic.h> #include <linux/uaccess.h> #include <asm/mwait.h> diff -puN arch/x86/kernel/smpboot.c~mwait-leaf-checks-0 arch/x86/kernel/smpboot.c --- a/arch/x86/kernel/smpboot.c~mwait-leaf-checks-0 2024-12-13 12:45:32.555042251 -0800 +++ b/arch/x86/kernel/smpboot.c 2024-12-13 12:45:32.563042590 -0800 @@ -64,6 +64,7 @@ #include <asm/acpi.h> #include <asm/cacheinfo.h> +#include <asm/cpuid.h> #include <asm/desc.h> #include <asm/nmi.h> #include <asm/irq.h> diff -puN arch/x86/xen/enlighten_pv.c~mwait-leaf-checks-0 arch/x86/xen/enlighten_pv.c --- a/arch/x86/xen/enlighten_pv.c~mwait-leaf-checks-0 2024-12-13 12:45:32.555042251 -0800 +++ b/arch/x86/xen/enlighten_pv.c 2024-12-13 12:45:32.563042590 -0800 @@ -49,6 +49,7 @@ #include <xen/hvc-console.h> #include <xen/acpi.h> +#include <asm/cpuid.h> #include <asm/paravirt.h> #include <asm/apic.h> #include <asm/page.h> diff -puN drivers/acpi/acpi_pad.c~mwait-leaf-checks-0 drivers/acpi/acpi_pad.c --- a/drivers/acpi/acpi_pad.c~mwait-leaf-checks-0 2024-12-13 12:45:32.555042251 -0800 +++ b/drivers/acpi/acpi_pad.c 2024-12-13 12:45:32.563042590 -0800 @@ -19,6 +19,7 @@ #include <linux/acpi.h> #include <linux/perf_event.h> #include <linux/platform_device.h> +#include <asm/cpuid.h> #include <asm/mwait.h> #include <xen/xen.h> diff -puN drivers/idle/intel_idle.c~mwait-leaf-checks-0 drivers/idle/intel_idle.c --- a/drivers/idle/intel_idle.c~mwait-leaf-checks-0 2024-12-13 12:45:32.559042421 -0800 +++ b/drivers/idle/intel_idle.c 2024-12-13 12:45:32.563042590 -0800 @@ -51,6 +51,7 @@ #include <linux/notifier.h> #include <linux/cpu.h> #include <linux/moduleparam.h> +#include <asm/cpuid.h> #include <asm/cpu_device_id.h> #include <asm/intel-family.h> #include <asm/mwait.h> _ ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 02/10] x86/cpu: Use MWAIT leaf definition 2024-12-13 20:50 [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming Dave Hansen 2024-12-13 20:50 ` [PATCH 01/10] x86/cpu: Move MWAIT leaf definition to common header Dave Hansen @ 2024-12-13 20:50 ` Dave Hansen 2024-12-13 20:50 ` [PATCH 03/10] x86/cpu: Remove unnecessary MwAIT leaf checks Dave Hansen ` (7 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Dave Hansen @ 2024-12-13 20:50 UTC (permalink / raw) To: linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box, Dave Hansen, zhao1.liu From: Dave Hansen <dave.hansen@linux.intel.com> The leaf-to-feature dependency array uses hard-coded leaf numbers. Use the new common header definition for the MWAIT leaf. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> --- b/arch/x86/kernel/cpu/common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN arch/x86/kernel/cpu/common.c~mwait-leaf-checks-1 arch/x86/kernel/cpu/common.c --- a/arch/x86/kernel/cpu/common.c~mwait-leaf-checks-1 2024-12-13 12:45:33.207069895 -0800 +++ b/arch/x86/kernel/cpu/common.c 2024-12-13 12:45:33.211070065 -0800 @@ -29,6 +29,7 @@ #include <asm/alternative.h> #include <asm/cmdline.h> +#include <asm/cpuid.h> #include <asm/perf_event.h> #include <asm/mmu_context.h> #include <asm/doublefault.h> @@ -636,7 +637,7 @@ struct cpuid_dependent_feature { static const struct cpuid_dependent_feature cpuid_dependent_features[] = { - { X86_FEATURE_MWAIT, 0x00000005 }, + { X86_FEATURE_MWAIT, CPUID_MWAIT_LEAF }, { X86_FEATURE_DCA, 0x00000009 }, { X86_FEATURE_XSAVE, 0x0000000d }, { 0, 0 } _ ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 03/10] x86/cpu: Remove unnecessary MwAIT leaf checks 2024-12-13 20:50 [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming Dave Hansen 2024-12-13 20:50 ` [PATCH 01/10] x86/cpu: Move MWAIT leaf definition to common header Dave Hansen 2024-12-13 20:50 ` [PATCH 02/10] x86/cpu: Use MWAIT leaf definition Dave Hansen @ 2024-12-13 20:50 ` Dave Hansen 2024-12-13 20:50 ` [PATCH 04/10] x86/cpu: Refresh DCA leaf reading code Dave Hansen ` (6 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Dave Hansen @ 2024-12-13 20:50 UTC (permalink / raw) To: linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box, Dave Hansen From: Dave Hansen <dave.hansen@linux.intel.com> The CPUID leaf dependency checker will remove X86_FEATURE_MWAIT if the CPUID level is below the required level (CPUID_MWAIT_LEAF). Thus, if you check X86_FEATURE_MWAIT you do not need to also check the CPUID level. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> --- b/arch/x86/kernel/hpet.c | 3 --- b/arch/x86/kernel/smpboot.c | 2 -- b/drivers/acpi/acpi_pad.c | 2 -- b/drivers/idle/intel_idle.c | 3 --- 4 files changed, 10 deletions(-) diff -puN arch/x86/kernel/hpet.c~mwait-leaf-checks-2 arch/x86/kernel/hpet.c --- a/arch/x86/kernel/hpet.c~mwait-leaf-checks-2 2024-12-13 12:45:33.699090754 -0800 +++ b/arch/x86/kernel/hpet.c 2024-12-13 12:45:33.707091093 -0800 @@ -928,9 +928,6 @@ static bool __init mwait_pc10_supported( if (!cpu_feature_enabled(X86_FEATURE_MWAIT)) return false; - if (boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) - return false; - cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates); return (ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) && diff -puN arch/x86/kernel/smpboot.c~mwait-leaf-checks-2 arch/x86/kernel/smpboot.c --- a/arch/x86/kernel/smpboot.c~mwait-leaf-checks-2 2024-12-13 12:45:33.703090924 -0800 +++ b/arch/x86/kernel/smpboot.c 2024-12-13 12:45:33.707091093 -0800 @@ -1292,8 +1292,6 @@ static inline void mwait_play_dead(void) return; if (!this_cpu_has(X86_FEATURE_CLFLUSH)) return; - if (__this_cpu_read(cpu_info.cpuid_level) < CPUID_MWAIT_LEAF) - return; eax = CPUID_MWAIT_LEAF; ecx = 0; diff -puN drivers/acpi/acpi_pad.c~mwait-leaf-checks-2 drivers/acpi/acpi_pad.c --- a/drivers/acpi/acpi_pad.c~mwait-leaf-checks-2 2024-12-13 12:45:33.703090924 -0800 +++ b/drivers/acpi/acpi_pad.c 2024-12-13 12:45:33.707091093 -0800 @@ -47,8 +47,6 @@ static void power_saving_mwait_init(void if (!boot_cpu_has(X86_FEATURE_MWAIT)) return; - if (boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) - return; cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx); diff -puN drivers/idle/intel_idle.c~mwait-leaf-checks-2 drivers/idle/intel_idle.c --- a/drivers/idle/intel_idle.c~mwait-leaf-checks-2 2024-12-13 12:45:33.703090924 -0800 +++ b/drivers/idle/intel_idle.c 2024-12-13 12:45:33.707091093 -0800 @@ -2317,9 +2317,6 @@ static int __init intel_idle_init(void) return -ENODEV; } - if (boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) - return -ENODEV; - cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates); if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) || _ ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 04/10] x86/cpu: Refresh DCA leaf reading code 2024-12-13 20:50 [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming Dave Hansen ` (2 preceding siblings ...) 2024-12-13 20:50 ` [PATCH 03/10] x86/cpu: Remove unnecessary MwAIT leaf checks Dave Hansen @ 2024-12-13 20:50 ` Dave Hansen 2024-12-13 20:50 ` [PATCH 05/10] x86/cpu: Move TSC CPUID leaf definition Dave Hansen ` (5 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Dave Hansen @ 2024-12-13 20:50 UTC (permalink / raw) To: linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box, Dave Hansen, zhao1.liu From: Dave Hansen <dave.hansen@linux.intel.com> The DCA leaf number is also hard-coded in the CPUID level dependency table. Move its definition to common code and use it. While at it, fix up the naming and types in the probe code. All CPUID data is provided in 32-bit registers, not 'unsigned long'. Also stop referring to "level_9". Move away from test_bit() because the type is no longer an 'unsigned long'. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> --- b/arch/x86/include/asm/cpuid.h | 3 ++- b/arch/x86/kernel/cpu/common.c | 2 +- b/drivers/dma/ioat/dca.c | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff -puN arch/x86/include/asm/cpuid.h~dca-leaf-checks-1 arch/x86/include/asm/cpuid.h --- a/arch/x86/include/asm/cpuid.h~dca-leaf-checks-1 2024-12-13 12:45:34.247113987 -0800 +++ b/arch/x86/include/asm/cpuid.h 2024-12-13 12:45:34.255114326 -0800 @@ -21,7 +21,8 @@ enum cpuid_regs_idx { CPUID_EDX, }; -#define CPUID_MWAIT_LEAF 5 +#define CPUID_MWAIT_LEAF 0x5 +#define CPUID_DCA_LEAF 0x9 #ifdef CONFIG_X86_32 bool have_cpuid_p(void); diff -puN arch/x86/kernel/cpu/common.c~dca-leaf-checks-1 arch/x86/kernel/cpu/common.c --- a/arch/x86/kernel/cpu/common.c~dca-leaf-checks-1 2024-12-13 12:45:34.251114156 -0800 +++ b/arch/x86/kernel/cpu/common.c 2024-12-13 12:45:34.255114326 -0800 @@ -638,7 +638,7 @@ struct cpuid_dependent_feature { static const struct cpuid_dependent_feature cpuid_dependent_features[] = { { X86_FEATURE_MWAIT, CPUID_MWAIT_LEAF }, - { X86_FEATURE_DCA, 0x00000009 }, + { X86_FEATURE_DCA, CPUID_DCA_LEAF }, { X86_FEATURE_XSAVE, 0x0000000d }, { 0, 0 } }; diff -puN drivers/dma/ioat/dca.c~dca-leaf-checks-1 drivers/dma/ioat/dca.c --- a/drivers/dma/ioat/dca.c~dca-leaf-checks-1 2024-12-13 12:45:34.251114156 -0800 +++ b/drivers/dma/ioat/dca.c 2024-12-13 12:45:34.255114326 -0800 @@ -10,6 +10,8 @@ #include <linux/interrupt.h> #include <linux/dca.h> +#include <asm/cpuid.h> + /* either a kernel change is needed, or we need something like this in kernel */ #ifndef CONFIG_SMP #include <asm/smp.h> @@ -58,11 +60,11 @@ static int dca_enabled_in_bios(struct pc { /* CPUID level 9 returns DCA configuration */ /* Bit 0 indicates DCA enabled by the BIOS */ - unsigned long cpuid_level_9; + u32 eax; int res; - cpuid_level_9 = cpuid_eax(9); - res = test_bit(0, &cpuid_level_9); + eax = cpuid_eax(CPUID_DCA_LEAF); + res = eax & BIT(0); if (!res) dev_dbg(&pdev->dev, "DCA is disabled in BIOS\n"); _ ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 05/10] x86/cpu: Move TSC CPUID leaf definition 2024-12-13 20:50 [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming Dave Hansen ` (3 preceding siblings ...) 2024-12-13 20:50 ` [PATCH 04/10] x86/cpu: Refresh DCA leaf reading code Dave Hansen @ 2024-12-13 20:50 ` Dave Hansen 2024-12-13 20:50 ` [PATCH 06/10] x86/tsc: Move away from TSC leaf magic numbers Dave Hansen ` (4 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Dave Hansen @ 2024-12-13 20:50 UTC (permalink / raw) To: linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box, Dave Hansen, zhao1.liu From: Dave Hansen <dave.hansen@linux.intel.com> Prepare to use the TSC CPUID leaf definition more widely by moving it to the common header. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> --- b/arch/x86/events/intel/pt.c | 1 + b/arch/x86/events/intel/pt.h | 3 --- b/arch/x86/include/asm/cpuid.h | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff -puN arch/x86/events/intel/pt.c~tsc-leaf-checks-1 arch/x86/events/intel/pt.c --- a/arch/x86/events/intel/pt.c~tsc-leaf-checks-1 2024-12-13 12:45:34.779136538 -0800 +++ b/arch/x86/events/intel/pt.c 2024-12-13 12:45:34.787136878 -0800 @@ -18,6 +18,7 @@ #include <linux/slab.h> #include <linux/device.h> +#include <asm/cpuid.h> #include <asm/perf_event.h> #include <asm/insn.h> #include <asm/io.h> diff -puN arch/x86/events/intel/pt.h~tsc-leaf-checks-1 arch/x86/events/intel/pt.h --- a/arch/x86/events/intel/pt.h~tsc-leaf-checks-1 2024-12-13 12:45:34.779136538 -0800 +++ b/arch/x86/events/intel/pt.h 2024-12-13 12:45:34.787136878 -0800 @@ -37,9 +37,6 @@ struct topa_entry { u64 rsvd4 : 12; }; -/* TSC to Core Crystal Clock Ratio */ -#define CPUID_TSC_LEAF 0x15 - struct pt_pmu { struct pmu pmu; u32 caps[PT_CPUID_REGS_NUM * PT_CPUID_LEAVES]; diff -puN arch/x86/include/asm/cpuid.h~tsc-leaf-checks-1 arch/x86/include/asm/cpuid.h --- a/arch/x86/include/asm/cpuid.h~tsc-leaf-checks-1 2024-12-13 12:45:34.783136707 -0800 +++ b/arch/x86/include/asm/cpuid.h 2024-12-13 12:45:34.787136878 -0800 @@ -23,6 +23,7 @@ enum cpuid_regs_idx { #define CPUID_MWAIT_LEAF 0x5 #define CPUID_DCA_LEAF 0x9 +#define CPUID_TSC_LEAF 0x15 #ifdef CONFIG_X86_32 bool have_cpuid_p(void); _ ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 06/10] x86/tsc: Move away from TSC leaf magic numbers 2024-12-13 20:50 [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming Dave Hansen ` (4 preceding siblings ...) 2024-12-13 20:50 ` [PATCH 05/10] x86/cpu: Move TSC CPUID leaf definition Dave Hansen @ 2024-12-13 20:50 ` Dave Hansen 2024-12-13 20:50 ` [PATCH 07/10] x86/tsc: Remove CPUID "frequency" " Dave Hansen ` (3 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Dave Hansen @ 2024-12-13 20:50 UTC (permalink / raw) To: linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box, Dave Hansen From: Dave Hansen <dave.hansen@linux.intel.com> The TSC code has a bunch of hard-coded references to leaf 0x15. Change them over to the symbolic name. Also zap the 'ART_CPUID_LEAF' definition. It was a duplicate of 'CPUID_TSC_LEAF'. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> --- b/arch/x86/kernel/tsc.c | 11 +++++------ b/drivers/platform/x86/intel/pmc/core.c | 7 ++++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff -puN arch/x86/kernel/tsc.c~tsc-leaf-checks-2 arch/x86/kernel/tsc.c --- a/arch/x86/kernel/tsc.c~tsc-leaf-checks-2 2024-12-13 12:45:35.323159598 -0800 +++ b/arch/x86/kernel/tsc.c 2024-12-13 12:45:35.331159936 -0800 @@ -16,6 +16,7 @@ #include <linux/static_key.h> #include <linux/static_call.h> +#include <asm/cpuid.h> #include <asm/hpet.h> #include <asm/timer.h> #include <asm/vgtod.h> @@ -665,13 +666,13 @@ unsigned long native_calibrate_tsc(void) if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) return 0; - if (boot_cpu_data.cpuid_level < 0x15) + if (boot_cpu_data.cpuid_level < CPUID_TSC_LEAF) return 0; eax_denominator = ebx_numerator = ecx_hz = edx = 0; /* CPUID 15H TSC/Crystal ratio, plus optionally Crystal Hz */ - cpuid(0x15, &eax_denominator, &ebx_numerator, &ecx_hz, &edx); + cpuid(CPUID_TSC_LEAF, &eax_denominator, &ebx_numerator, &ecx_hz, &edx); if (ebx_numerator == 0 || eax_denominator == 0) return 0; @@ -1067,10 +1068,8 @@ core_initcall(cpufreq_register_tsc_scali #endif /* CONFIG_CPU_FREQ */ -#define ART_CPUID_LEAF (0x15) #define ART_MIN_DENOMINATOR (1) - /* * If ART is present detect the numerator:denominator to convert to TSC */ @@ -1078,7 +1077,7 @@ static void __init detect_art(void) { unsigned int unused; - if (boot_cpu_data.cpuid_level < ART_CPUID_LEAF) + if (boot_cpu_data.cpuid_level < CPUID_TSC_LEAF) return; /* @@ -1091,7 +1090,7 @@ static void __init detect_art(void) tsc_async_resets) return; - cpuid(ART_CPUID_LEAF, &art_base_clk.denominator, + cpuid(CPUID_TSC_LEAF, &art_base_clk.denominator, &art_base_clk.numerator, &art_base_clk.freq_khz, &unused); art_base_clk.freq_khz /= KHZ; diff -puN drivers/platform/x86/intel/pmc/core.c~tsc-leaf-checks-2 drivers/platform/x86/intel/pmc/core.c --- a/drivers/platform/x86/intel/pmc/core.c~tsc-leaf-checks-2 2024-12-13 12:45:35.327159767 -0800 +++ b/drivers/platform/x86/intel/pmc/core.c 2024-12-13 12:45:35.331159936 -0800 @@ -22,6 +22,7 @@ #include <linux/suspend.h> #include <linux/units.h> +#include <asm/cpuid.h> #include <asm/cpu_device_id.h> #include <asm/intel-family.h> #include <asm/msr.h> @@ -935,13 +936,13 @@ static unsigned int pmc_core_get_crystal { unsigned int eax_denominator, ebx_numerator, ecx_hz, edx; - if (boot_cpu_data.cpuid_level < 0x15) + if (boot_cpu_data.cpuid_level < CPUID_TSC_LEAF) return 0; eax_denominator = ebx_numerator = ecx_hz = edx = 0; - /* CPUID 15H TSC/Crystal ratio, plus optionally Crystal Hz */ - cpuid(0x15, &eax_denominator, &ebx_numerator, &ecx_hz, &edx); + /* TSC/Crystal ratio, plus optionally Crystal Hz */ + cpuid(CPUID_TSC_LEAF, &eax_denominator, &ebx_numerator, &ecx_hz, &edx); if (ebx_numerator == 0 || eax_denominator == 0) return 0; _ ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 07/10] x86/tsc: Remove CPUID "frequency" leaf magic numbers. 2024-12-13 20:50 [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming Dave Hansen ` (5 preceding siblings ...) 2024-12-13 20:50 ` [PATCH 06/10] x86/tsc: Move away from TSC leaf magic numbers Dave Hansen @ 2024-12-13 20:50 ` Dave Hansen 2024-12-13 20:50 ` [PATCH 08/10] x86/fpu: Move CPUID leaf definitions to common code Dave Hansen ` (2 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Dave Hansen @ 2024-12-13 20:50 UTC (permalink / raw) To: linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box, Dave Hansen, zhao1.liu From: Dave Hansen <dave.hansen@linux.intel.com> All the code that reads the CPUID frequency information leaf hard-codes a magic number. Give it a symbolic name and use it. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> --- b/arch/x86/include/asm/cpuid.h | 1 + b/arch/x86/kernel/tsc.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff -puN arch/x86/include/asm/cpuid.h~tsc-leaf-checks-3 arch/x86/include/asm/cpuid.h --- a/arch/x86/include/asm/cpuid.h~tsc-leaf-checks-3 2024-12-13 12:45:35.839181468 -0800 +++ b/arch/x86/include/asm/cpuid.h 2024-12-13 12:45:35.843181638 -0800 @@ -24,6 +24,7 @@ enum cpuid_regs_idx { #define CPUID_MWAIT_LEAF 0x5 #define CPUID_DCA_LEAF 0x9 #define CPUID_TSC_LEAF 0x15 +#define CPUID_FREQ_LEAF 0x16 #ifdef CONFIG_X86_32 bool have_cpuid_p(void); diff -puN arch/x86/kernel/tsc.c~tsc-leaf-checks-3 arch/x86/kernel/tsc.c --- a/arch/x86/kernel/tsc.c~tsc-leaf-checks-3 2024-12-13 12:45:35.839181468 -0800 +++ b/arch/x86/kernel/tsc.c 2024-12-13 12:45:35.843181638 -0800 @@ -681,8 +681,8 @@ unsigned long native_calibrate_tsc(void) /* * Denverton SoCs don't report crystal clock, and also don't support - * CPUID.0x16 for the calculation below, so hardcode the 25MHz crystal - * clock. + * CPUID_FREQ_LEAF for the calculation below, so hardcode the 25MHz + * crystal clock. */ if (crystal_khz == 0 && boot_cpu_data.x86_vfm == INTEL_ATOM_GOLDMONT_D) @@ -701,10 +701,10 @@ unsigned long native_calibrate_tsc(void) * clock, but we can easily calculate it to a high degree of accuracy * by considering the crystal ratio and the CPU speed. */ - if (crystal_khz == 0 && boot_cpu_data.cpuid_level >= 0x16) { + if (crystal_khz == 0 && boot_cpu_data.cpuid_level >= CPUID_FREQ_LEAF) { unsigned int eax_base_mhz, ebx, ecx, edx; - cpuid(0x16, &eax_base_mhz, &ebx, &ecx, &edx); + cpuid(CPUID_FREQ_LEAF, &eax_base_mhz, &ebx, &ecx, &edx); crystal_khz = eax_base_mhz * 1000 * eax_denominator / ebx_numerator; } @@ -739,12 +739,12 @@ static unsigned long cpu_khz_from_cpuid( if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) return 0; - if (boot_cpu_data.cpuid_level < 0x16) + if (boot_cpu_data.cpuid_level < CPUID_FREQ_LEAF) return 0; eax_base_mhz = ebx_max_mhz = ecx_bus_mhz = edx = 0; - cpuid(0x16, &eax_base_mhz, &ebx_max_mhz, &ecx_bus_mhz, &edx); + cpuid(CPUID_FREQ_LEAF, &eax_base_mhz, &ebx_max_mhz, &ecx_bus_mhz, &edx); return eax_base_mhz * 1000; } _ ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 08/10] x86/fpu: Move CPUID leaf definitions to common code 2024-12-13 20:50 [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming Dave Hansen ` (6 preceding siblings ...) 2024-12-13 20:50 ` [PATCH 07/10] x86/tsc: Remove CPUID "frequency" " Dave Hansen @ 2024-12-13 20:50 ` Dave Hansen 2024-12-13 20:50 ` [PATCH 09/10] x86/fpu: Remove unnecessary CPUID level check Dave Hansen 2024-12-13 20:50 ` [PATCH 10/10] x86/cpu: Make all all CPUID leaf names consistent Dave Hansen 9 siblings, 0 replies; 13+ messages in thread From: Dave Hansen @ 2024-12-13 20:50 UTC (permalink / raw) To: linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box, Dave Hansen, zhao1.liu From: Dave Hansen <dave.hansen@linux.intel.com> Move the XSAVE-related CPUID leaf definitions to common code. Then, use the new definition to remove the last magic number from the CPUID level dependency table. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> --- b/arch/x86/include/asm/cpuid.h | 2 ++ b/arch/x86/include/asm/fpu/xstate.h | 4 ---- b/arch/x86/kernel/cpu/common.c | 2 +- b/arch/x86/kernel/fpu/xstate.c | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) diff -puN arch/x86/include/asm/cpuid.h~xsave-leaf-checks-1 arch/x86/include/asm/cpuid.h --- a/arch/x86/include/asm/cpuid.h~xsave-leaf-checks-1 2024-12-13 12:45:36.351203168 -0800 +++ b/arch/x86/include/asm/cpuid.h 2024-12-13 12:45:36.359203508 -0800 @@ -23,8 +23,10 @@ enum cpuid_regs_idx { #define CPUID_MWAIT_LEAF 0x5 #define CPUID_DCA_LEAF 0x9 +#define XSTATE_CPUID 0x0d #define CPUID_TSC_LEAF 0x15 #define CPUID_FREQ_LEAF 0x16 +#define TILE_CPUID 0x1d #ifdef CONFIG_X86_32 bool have_cpuid_p(void); diff -puN arch/x86/include/asm/fpu/xstate.h~xsave-leaf-checks-1 arch/x86/include/asm/fpu/xstate.h --- a/arch/x86/include/asm/fpu/xstate.h~xsave-leaf-checks-1 2024-12-13 12:45:36.355203337 -0800 +++ b/arch/x86/include/asm/fpu/xstate.h 2024-12-13 12:45:36.359203508 -0800 @@ -12,10 +12,6 @@ /* Bit 63 of XCR0 is reserved for future expansion */ #define XFEATURE_MASK_EXTEND (~(XFEATURE_MASK_FPSSE | (1ULL << 63))) -#define XSTATE_CPUID 0x0000000d - -#define TILE_CPUID 0x0000001d - #define FXSAVE_SIZE 512 #define XSAVE_HDR_SIZE 64 diff -puN arch/x86/kernel/cpu/common.c~xsave-leaf-checks-1 arch/x86/kernel/cpu/common.c --- a/arch/x86/kernel/cpu/common.c~xsave-leaf-checks-1 2024-12-13 12:45:36.355203337 -0800 +++ b/arch/x86/kernel/cpu/common.c 2024-12-13 12:45:36.359203508 -0800 @@ -639,7 +639,7 @@ static const struct cpuid_dependent_feat cpuid_dependent_features[] = { { X86_FEATURE_MWAIT, CPUID_MWAIT_LEAF }, { X86_FEATURE_DCA, CPUID_DCA_LEAF }, - { X86_FEATURE_XSAVE, 0x0000000d }, + { X86_FEATURE_XSAVE, XSTATE_CPUID }, { 0, 0 } }; diff -puN arch/x86/kernel/fpu/xstate.c~xsave-leaf-checks-1 arch/x86/kernel/fpu/xstate.c --- a/arch/x86/kernel/fpu/xstate.c~xsave-leaf-checks-1 2024-12-13 12:45:36.359203508 -0800 +++ b/arch/x86/kernel/fpu/xstate.c 2024-12-13 12:45:36.359203508 -0800 @@ -20,6 +20,7 @@ #include <asm/fpu/signal.h> #include <asm/fpu/xcr.h> +#include <asm/cpuid.h> #include <asm/tlbflush.h> #include <asm/prctl.h> #include <asm/elf.h> _ ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 09/10] x86/fpu: Remove unnecessary CPUID level check 2024-12-13 20:50 [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming Dave Hansen ` (7 preceding siblings ...) 2024-12-13 20:50 ` [PATCH 08/10] x86/fpu: Move CPUID leaf definitions to common code Dave Hansen @ 2024-12-13 20:50 ` Dave Hansen 2024-12-16 19:05 ` Chang S. Bae 2024-12-13 20:50 ` [PATCH 10/10] x86/cpu: Make all all CPUID leaf names consistent Dave Hansen 9 siblings, 1 reply; 13+ messages in thread From: Dave Hansen @ 2024-12-13 20:50 UTC (permalink / raw) To: linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box, Dave Hansen From: Dave Hansen <dave.hansen@linux.intel.com> The CPUID level dependency table will entirely zap X86_FEATURE_XSAVE if the CPUID level is too low. This code is unreachable. Kill it. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> --- b/arch/x86/kernel/fpu/xstate.c | 5 ----- 1 file changed, 5 deletions(-) diff -puN arch/x86/kernel/fpu/xstate.c~xsave-leaf-checks-2 arch/x86/kernel/fpu/xstate.c --- a/arch/x86/kernel/fpu/xstate.c~xsave-leaf-checks-2 2024-12-13 12:45:36.903226562 -0800 +++ b/arch/x86/kernel/fpu/xstate.c 2024-12-13 12:45:36.907226732 -0800 @@ -764,11 +764,6 @@ void __init fpu__init_system_xstate(unsi return; } - if (boot_cpu_data.cpuid_level < XSTATE_CPUID) { - WARN_ON_FPU(1); - return; - } - /* * Find user xstates supported by the processor. */ _ ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 09/10] x86/fpu: Remove unnecessary CPUID level check 2024-12-13 20:50 ` [PATCH 09/10] x86/fpu: Remove unnecessary CPUID level check Dave Hansen @ 2024-12-16 19:05 ` Chang S. Bae 2024-12-16 21:23 ` Dave Hansen 0 siblings, 1 reply; 13+ messages in thread From: Chang S. Bae @ 2024-12-16 19:05 UTC (permalink / raw) To: Dave Hansen, linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box On 12/13/2024 12:50 PM, Dave Hansen wrote: > > diff -puN arch/x86/kernel/fpu/xstate.c~xsave-leaf-checks-2 arch/x86/kernel/fpu/xstate.c > --- a/arch/x86/kernel/fpu/xstate.c~xsave-leaf-checks-2 2024-12-13 12:45:36.903226562 -0800 > +++ b/arch/x86/kernel/fpu/xstate.c 2024-12-13 12:45:36.907226732 -0800 > @@ -764,11 +764,6 @@ void __init fpu__init_system_xstate(unsi > return; > } > > - if (boot_cpu_data.cpuid_level < XSTATE_CPUID) { > - WARN_ON_FPU(1); > - return; > - } > - I think this change effectively reverts commit ee813d53a8e9 ("x86, xsave: Check cpuid level for XSTATE_CPUID (0x0d)"). At the time of its introduction, commit b38b06659055 ("x86: filter CPU features dependent on unavailable CPUID levels") was already there. The cpu_has_xsave flag (now boot_cpu_has(X86_FEATURE_XSAVE)) should be false for CPUs with a lower CPUID level in this: void __cpuinit xsave_init(void) { if (!cpu_has_xsave) return; ... xstate_enable_boot_cpu(); } Then, the sanity check introduced in this code path appears redundant: xsave_init() -> xstate_enable_boot_cpu() -> setup_xstate_init() -> setup_xstate_features() Reviewed-by: Chang S. Bae <chang.seok.bae@intel.com> Thanks, Chang ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 09/10] x86/fpu: Remove unnecessary CPUID level check 2024-12-16 19:05 ` Chang S. Bae @ 2024-12-16 21:23 ` Dave Hansen 0 siblings, 0 replies; 13+ messages in thread From: Dave Hansen @ 2024-12-16 21:23 UTC (permalink / raw) To: Chang S. Bae, Dave Hansen, linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box On 12/16/24 11:05, Chang S. Bae wrote: ...> Then, the sanity check introduced in this code path appears redundant: > > xsave_init() > -> xstate_enable_boot_cpu() > -> setup_xstate_init() > -> setup_xstate_features() > > Reviewed-by: Chang S. Bae <chang.seok.bae@intel.com> Yeah, good point. Thanks for the review! BTW, I do still want to make this into a _generic_ warning so that all cpuid*() users get warned if they go reading leafs that are too high. But I'll do that in another series. ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 10/10] x86/cpu: Make all all CPUID leaf names consistent 2024-12-13 20:50 [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming Dave Hansen ` (8 preceding siblings ...) 2024-12-13 20:50 ` [PATCH 09/10] x86/fpu: Remove unnecessary CPUID level check Dave Hansen @ 2024-12-13 20:50 ` Dave Hansen 9 siblings, 0 replies; 13+ messages in thread From: Dave Hansen @ 2024-12-13 20:50 UTC (permalink / raw) To: linux-kernel Cc: x86, tglx, bp, rafael, lenb, dave.jiang, irenic.rajneesh, david.e.box, Dave Hansen From: Dave Hansen <dave.hansen@linux.intel.com> The leaf names are not consistent. Give them all a CPUID_LEAF_ prefix for consistency and vertical alignment. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Acked-by: Dave Jiang <dave.jiang@intel.com> # for ioatdma bits --- b/arch/x86/events/intel/pt.c | 4 ++-- b/arch/x86/include/asm/cpuid.h | 12 ++++++------ b/arch/x86/kernel/acpi/cstate.c | 4 ++-- b/arch/x86/kernel/cpu/common.c | 6 +++--- b/arch/x86/kernel/fpu/xstate.c | 20 ++++++++++---------- b/arch/x86/kernel/hpet.c | 2 +- b/arch/x86/kernel/process.c | 2 +- b/arch/x86/kernel/smpboot.c | 2 +- b/arch/x86/kernel/tsc.c | 18 +++++++++--------- b/arch/x86/xen/enlighten_pv.c | 4 ++-- b/drivers/acpi/acpi_pad.c | 2 +- b/drivers/dma/ioat/dca.c | 2 +- b/drivers/idle/intel_idle.c | 2 +- b/drivers/platform/x86/intel/pmc/core.c | 4 ++-- 14 files changed, 42 insertions(+), 42 deletions(-) diff -puN arch/x86/events/intel/pt.c~xsave-leaf-checks-3 arch/x86/events/intel/pt.c --- a/arch/x86/events/intel/pt.c~xsave-leaf-checks-3 2024-12-13 12:45:37.391247243 -0800 +++ b/arch/x86/events/intel/pt.c 2024-12-13 12:45:37.415248260 -0800 @@ -202,10 +202,10 @@ static int __init pt_pmu_hw_init(void) * otherwise, zero for numerator stands for "not enumerated" * as per SDM */ - if (boot_cpu_data.cpuid_level >= CPUID_TSC_LEAF) { + if (boot_cpu_data.cpuid_level >= CPUID_LEAF_TSC) { u32 eax, ebx, ecx, edx; - cpuid(CPUID_TSC_LEAF, &eax, &ebx, &ecx, &edx); + cpuid(CPUID_LEAF_TSC, &eax, &ebx, &ecx, &edx); pt_pmu.tsc_art_num = ebx; pt_pmu.tsc_art_den = eax; diff -puN arch/x86/include/asm/cpuid.h~xsave-leaf-checks-3 arch/x86/include/asm/cpuid.h --- a/arch/x86/include/asm/cpuid.h~xsave-leaf-checks-3 2024-12-13 12:45:37.395247412 -0800 +++ b/arch/x86/include/asm/cpuid.h 2024-12-13 12:45:37.415248260 -0800 @@ -21,12 +21,12 @@ enum cpuid_regs_idx { CPUID_EDX, }; -#define CPUID_MWAIT_LEAF 0x5 -#define CPUID_DCA_LEAF 0x9 -#define XSTATE_CPUID 0x0d -#define CPUID_TSC_LEAF 0x15 -#define CPUID_FREQ_LEAF 0x16 -#define TILE_CPUID 0x1d +#define CPUID_LEAF_MWAIT 0x5 +#define CPUID_LEAF_DCA 0x9 +#define CPUID_LEAF_XSTATE 0x0d +#define CPUID_LEAF_TSC 0x15 +#define CPUID_LEAF_FREQ 0x16 +#define CPUID_LEAF_TILE 0x1d #ifdef CONFIG_X86_32 bool have_cpuid_p(void); diff -puN arch/x86/kernel/acpi/cstate.c~xsave-leaf-checks-3 arch/x86/kernel/acpi/cstate.c --- a/arch/x86/kernel/acpi/cstate.c~xsave-leaf-checks-3 2024-12-13 12:45:37.395247412 -0800 +++ b/arch/x86/kernel/acpi/cstate.c 2024-12-13 12:45:37.415248260 -0800 @@ -129,7 +129,7 @@ static long acpi_processor_ffh_cstate_pr unsigned int cstate_type; /* C-state type and not ACPI C-state type */ unsigned int num_cstate_subtype; - cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx); + cpuid(CPUID_LEAF_MWAIT, &eax, &ebx, &ecx, &edx); /* Check whether this particular cx_type (in CST) is supported or not */ cstate_type = (((cx->address >> MWAIT_SUBSTATE_SIZE) & @@ -173,7 +173,7 @@ int acpi_processor_ffh_cstate_probe(unsi struct cpuinfo_x86 *c = &cpu_data(cpu); long retval; - if (!cpu_cstate_entry || c->cpuid_level < CPUID_MWAIT_LEAF) + if (!cpu_cstate_entry || c->cpuid_level < CPUID_LEAF_MWAIT) return -1; if (reg->bit_offset != NATIVE_CSTATE_BEYOND_HALT) diff -puN arch/x86/kernel/cpu/common.c~xsave-leaf-checks-3 arch/x86/kernel/cpu/common.c --- a/arch/x86/kernel/cpu/common.c~xsave-leaf-checks-3 2024-12-13 12:45:37.395247412 -0800 +++ b/arch/x86/kernel/cpu/common.c 2024-12-13 12:45:37.415248260 -0800 @@ -637,9 +637,9 @@ struct cpuid_dependent_feature { static const struct cpuid_dependent_feature cpuid_dependent_features[] = { - { X86_FEATURE_MWAIT, CPUID_MWAIT_LEAF }, - { X86_FEATURE_DCA, CPUID_DCA_LEAF }, - { X86_FEATURE_XSAVE, XSTATE_CPUID }, + { X86_FEATURE_MWAIT, CPUID_LEAF_MWAIT }, + { X86_FEATURE_DCA, CPUID_LEAF_DCA }, + { X86_FEATURE_XSAVE, CPUID_LEAF_XSTATE }, { 0, 0 } }; diff -puN arch/x86/kernel/fpu/xstate.c~xsave-leaf-checks-3 arch/x86/kernel/fpu/xstate.c --- a/arch/x86/kernel/fpu/xstate.c~xsave-leaf-checks-3 2024-12-13 12:45:37.399247581 -0800 +++ b/arch/x86/kernel/fpu/xstate.c 2024-12-13 12:45:37.415248260 -0800 @@ -233,7 +233,7 @@ static void __init setup_xstate_cache(vo xmm_space); for_each_extended_xfeature(i, fpu_kernel_cfg.max_features) { - cpuid_count(XSTATE_CPUID, i, &eax, &ebx, &ecx, &edx); + cpuid_count(CPUID_LEAF_XSTATE, i, &eax, &ebx, &ecx, &edx); xstate_sizes[i] = eax; xstate_flags[i] = ecx; @@ -399,7 +399,7 @@ int xfeature_size(int xfeature_nr) u32 eax, ebx, ecx, edx; CHECK_XFEATURE(xfeature_nr); - cpuid_count(XSTATE_CPUID, xfeature_nr, &eax, &ebx, &ecx, &edx); + cpuid_count(CPUID_LEAF_XSTATE, xfeature_nr, &eax, &ebx, &ecx, &edx); return eax; } @@ -442,9 +442,9 @@ static void __init __xstate_dump_leaves( * just in case there are some goodies up there */ for (i = 0; i < XFEATURE_MAX + 10; i++) { - cpuid_count(XSTATE_CPUID, i, &eax, &ebx, &ecx, &edx); + cpuid_count(CPUID_LEAF_XSTATE, i, &eax, &ebx, &ecx, &edx); pr_warn("CPUID[%02x, %02x]: eax=%08x ebx=%08x ecx=%08x edx=%08x\n", - XSTATE_CPUID, i, eax, ebx, ecx, edx); + CPUID_LEAF_XSTATE, i, eax, ebx, ecx, edx); } } @@ -485,7 +485,7 @@ static int __init check_xtile_data_again * Check the maximum palette id: * eax: the highest numbered palette subleaf. */ - cpuid_count(TILE_CPUID, 0, &max_palid, &ebx, &ecx, &edx); + cpuid_count(CPUID_LEAF_TILE, 0, &max_palid, &ebx, &ecx, &edx); /* * Cross-check each tile size and find the maximum number of @@ -499,7 +499,7 @@ static int __init check_xtile_data_again * eax[31:16]: bytes per title * ebx[31:16]: the max names (or max number of tiles) */ - cpuid_count(TILE_CPUID, palid, &eax, &ebx, &edx, &edx); + cpuid_count(CPUID_LEAF_TILE, palid, &eax, &ebx, &edx, &edx); tile_size = eax >> 16; max = ebx >> 16; @@ -634,7 +634,7 @@ static unsigned int __init get_compacted * are no supervisor states, but XSAVEC still uses compacted * format. */ - cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); + cpuid_count(CPUID_LEAF_XSTATE, 1, &eax, &ebx, &ecx, &edx); return ebx; } @@ -675,7 +675,7 @@ static unsigned int __init get_xsave_siz * containing all the *user* state components * corresponding to bits currently set in XCR0. */ - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); + cpuid_count(CPUID_LEAF_XSTATE, 0, &eax, &ebx, &ecx, &edx); return ebx; } @@ -767,13 +767,13 @@ void __init fpu__init_system_xstate(unsi /* * Find user xstates supported by the processor. */ - cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); + cpuid_count(CPUID_LEAF_XSTATE, 0, &eax, &ebx, &ecx, &edx); fpu_kernel_cfg.max_features = eax + ((u64)edx << 32); /* * Find supervisor xstates supported by the processor. */ - cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); + cpuid_count(CPUID_LEAF_XSTATE, 1, &eax, &ebx, &ecx, &edx); fpu_kernel_cfg.max_features |= ecx + ((u64)edx << 32); if ((fpu_kernel_cfg.max_features & XFEATURE_MASK_FPSSE) != XFEATURE_MASK_FPSSE) { diff -puN arch/x86/kernel/hpet.c~xsave-leaf-checks-3 arch/x86/kernel/hpet.c --- a/arch/x86/kernel/hpet.c~xsave-leaf-checks-3 2024-12-13 12:45:37.399247581 -0800 +++ b/arch/x86/kernel/hpet.c 2024-12-13 12:45:37.415248260 -0800 @@ -928,7 +928,7 @@ static bool __init mwait_pc10_supported( if (!cpu_feature_enabled(X86_FEATURE_MWAIT)) return false; - cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates); + cpuid(CPUID_LEAF_MWAIT, &eax, &ebx, &ecx, &mwait_substates); return (ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) && (ecx & CPUID5_ECX_INTERRUPT_BREAK) && diff -puN arch/x86/kernel/process.c~xsave-leaf-checks-3 arch/x86/kernel/process.c --- a/arch/x86/kernel/process.c~xsave-leaf-checks-3 2024-12-13 12:45:37.403247751 -0800 +++ b/arch/x86/kernel/process.c 2024-12-13 12:45:37.415248260 -0800 @@ -878,7 +878,7 @@ static __init bool prefer_mwait_c1_over_ if (boot_cpu_has_bug(X86_BUG_MONITOR) || boot_cpu_has_bug(X86_BUG_AMD_APIC_C1E)) return false; - cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx); + cpuid(CPUID_LEAF_MWAIT, &eax, &ebx, &ecx, &edx); /* * If MWAIT extensions are not available, it is safe to use MWAIT diff -puN arch/x86/kernel/smpboot.c~xsave-leaf-checks-3 arch/x86/kernel/smpboot.c --- a/arch/x86/kernel/smpboot.c~xsave-leaf-checks-3 2024-12-13 12:45:37.403247751 -0800 +++ b/arch/x86/kernel/smpboot.c 2024-12-13 12:45:37.415248260 -0800 @@ -1293,7 +1293,7 @@ static inline void mwait_play_dead(void) if (!this_cpu_has(X86_FEATURE_CLFLUSH)) return; - eax = CPUID_MWAIT_LEAF; + eax = CPUID_LEAF_MWAIT; ecx = 0; native_cpuid(&eax, &ebx, &ecx, &edx); diff -puN arch/x86/kernel/tsc.c~xsave-leaf-checks-3 arch/x86/kernel/tsc.c --- a/arch/x86/kernel/tsc.c~xsave-leaf-checks-3 2024-12-13 12:45:37.403247751 -0800 +++ b/arch/x86/kernel/tsc.c 2024-12-13 12:45:37.415248260 -0800 @@ -666,13 +666,13 @@ unsigned long native_calibrate_tsc(void) if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) return 0; - if (boot_cpu_data.cpuid_level < CPUID_TSC_LEAF) + if (boot_cpu_data.cpuid_level < CPUID_LEAF_TSC) return 0; eax_denominator = ebx_numerator = ecx_hz = edx = 0; /* CPUID 15H TSC/Crystal ratio, plus optionally Crystal Hz */ - cpuid(CPUID_TSC_LEAF, &eax_denominator, &ebx_numerator, &ecx_hz, &edx); + cpuid(CPUID_LEAF_TSC, &eax_denominator, &ebx_numerator, &ecx_hz, &edx); if (ebx_numerator == 0 || eax_denominator == 0) return 0; @@ -681,7 +681,7 @@ unsigned long native_calibrate_tsc(void) /* * Denverton SoCs don't report crystal clock, and also don't support - * CPUID_FREQ_LEAF for the calculation below, so hardcode the 25MHz + * CPUID_LEAF_FREQ for the calculation below, so hardcode the 25MHz * crystal clock. */ if (crystal_khz == 0 && @@ -701,10 +701,10 @@ unsigned long native_calibrate_tsc(void) * clock, but we can easily calculate it to a high degree of accuracy * by considering the crystal ratio and the CPU speed. */ - if (crystal_khz == 0 && boot_cpu_data.cpuid_level >= CPUID_FREQ_LEAF) { + if (crystal_khz == 0 && boot_cpu_data.cpuid_level >= CPUID_LEAF_FREQ) { unsigned int eax_base_mhz, ebx, ecx, edx; - cpuid(CPUID_FREQ_LEAF, &eax_base_mhz, &ebx, &ecx, &edx); + cpuid(CPUID_LEAF_FREQ, &eax_base_mhz, &ebx, &ecx, &edx); crystal_khz = eax_base_mhz * 1000 * eax_denominator / ebx_numerator; } @@ -739,12 +739,12 @@ static unsigned long cpu_khz_from_cpuid( if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) return 0; - if (boot_cpu_data.cpuid_level < CPUID_FREQ_LEAF) + if (boot_cpu_data.cpuid_level < CPUID_LEAF_FREQ) return 0; eax_base_mhz = ebx_max_mhz = ecx_bus_mhz = edx = 0; - cpuid(CPUID_FREQ_LEAF, &eax_base_mhz, &ebx_max_mhz, &ecx_bus_mhz, &edx); + cpuid(CPUID_LEAF_FREQ, &eax_base_mhz, &ebx_max_mhz, &ecx_bus_mhz, &edx); return eax_base_mhz * 1000; } @@ -1077,7 +1077,7 @@ static void __init detect_art(void) { unsigned int unused; - if (boot_cpu_data.cpuid_level < CPUID_TSC_LEAF) + if (boot_cpu_data.cpuid_level < CPUID_LEAF_TSC) return; /* @@ -1090,7 +1090,7 @@ static void __init detect_art(void) tsc_async_resets) return; - cpuid(CPUID_TSC_LEAF, &art_base_clk.denominator, + cpuid(CPUID_LEAF_TSC, &art_base_clk.denominator, &art_base_clk.numerator, &art_base_clk.freq_khz, &unused); art_base_clk.freq_khz /= KHZ; diff -puN arch/x86/xen/enlighten_pv.c~xsave-leaf-checks-3 arch/x86/xen/enlighten_pv.c --- a/arch/x86/xen/enlighten_pv.c~xsave-leaf-checks-3 2024-12-13 12:45:37.407247920 -0800 +++ b/arch/x86/xen/enlighten_pv.c 2024-12-13 12:45:37.419248429 -0800 @@ -231,7 +231,7 @@ static void xen_cpuid(unsigned int *ax, or_ebx = smp_processor_id() << 24; break; - case CPUID_MWAIT_LEAF: + case CPUID_LEAF_MWAIT: /* Synthesize the values.. */ *ax = 0; *bx = 0; @@ -301,7 +301,7 @@ static bool __init xen_check_mwait(void) * ecx and edx. The hypercall provides only partial information. */ - ax = CPUID_MWAIT_LEAF; + ax = CPUID_LEAF_MWAIT; bx = 0; cx = 0; dx = 0; diff -puN drivers/acpi/acpi_pad.c~xsave-leaf-checks-3 drivers/acpi/acpi_pad.c --- a/drivers/acpi/acpi_pad.c~xsave-leaf-checks-3 2024-12-13 12:45:37.407247920 -0800 +++ b/drivers/acpi/acpi_pad.c 2024-12-13 12:45:37.419248429 -0800 @@ -48,7 +48,7 @@ static void power_saving_mwait_init(void if (!boot_cpu_has(X86_FEATURE_MWAIT)) return; - cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx); + cpuid(CPUID_LEAF_MWAIT, &eax, &ebx, &ecx, &edx); if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) || !(ecx & CPUID5_ECX_INTERRUPT_BREAK)) diff -puN drivers/dma/ioat/dca.c~xsave-leaf-checks-3 drivers/dma/ioat/dca.c --- a/drivers/dma/ioat/dca.c~xsave-leaf-checks-3 2024-12-13 12:45:37.411248089 -0800 +++ b/drivers/dma/ioat/dca.c 2024-12-13 12:45:37.419248429 -0800 @@ -63,7 +63,7 @@ static int dca_enabled_in_bios(struct pc u32 eax; int res; - eax = cpuid_eax(CPUID_DCA_LEAF); + eax = cpuid_eax(CPUID_LEAF_DCA); res = eax & BIT(0); if (!res) dev_dbg(&pdev->dev, "DCA is disabled in BIOS\n"); diff -puN drivers/idle/intel_idle.c~xsave-leaf-checks-3 drivers/idle/intel_idle.c --- a/drivers/idle/intel_idle.c~xsave-leaf-checks-3 2024-12-13 12:45:37.411248089 -0800 +++ b/drivers/idle/intel_idle.c 2024-12-13 12:45:37.419248429 -0800 @@ -2317,7 +2317,7 @@ static int __init intel_idle_init(void) return -ENODEV; } - cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates); + cpuid(CPUID_LEAF_MWAIT, &eax, &ebx, &ecx, &mwait_substates); if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) || !(ecx & CPUID5_ECX_INTERRUPT_BREAK) || diff -puN drivers/platform/x86/intel/pmc/core.c~xsave-leaf-checks-3 drivers/platform/x86/intel/pmc/core.c --- a/drivers/platform/x86/intel/pmc/core.c~xsave-leaf-checks-3 2024-12-13 12:45:37.411248089 -0800 +++ b/drivers/platform/x86/intel/pmc/core.c 2024-12-13 12:45:37.419248429 -0800 @@ -936,13 +936,13 @@ static unsigned int pmc_core_get_crystal { unsigned int eax_denominator, ebx_numerator, ecx_hz, edx; - if (boot_cpu_data.cpuid_level < CPUID_TSC_LEAF) + if (boot_cpu_data.cpuid_level < CPUID_LEAF_TSC) return 0; eax_denominator = ebx_numerator = ecx_hz = edx = 0; /* TSC/Crystal ratio, plus optionally Crystal Hz */ - cpuid(CPUID_TSC_LEAF, &eax_denominator, &ebx_numerator, &ecx_hz, &edx); + cpuid(CPUID_LEAF_TSC, &eax_denominator, &ebx_numerator, &ecx_hz, &edx); if (ebx_numerator == 0 || eax_denominator == 0) return 0; _ ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-12-16 21:23 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2024-12-13 20:50 [PATCH 00/10] [v2] x86/cpu: Centralize and standardize CPUID leaf naming Dave Hansen 2024-12-13 20:50 ` [PATCH 01/10] x86/cpu: Move MWAIT leaf definition to common header Dave Hansen 2024-12-13 20:50 ` [PATCH 02/10] x86/cpu: Use MWAIT leaf definition Dave Hansen 2024-12-13 20:50 ` [PATCH 03/10] x86/cpu: Remove unnecessary MwAIT leaf checks Dave Hansen 2024-12-13 20:50 ` [PATCH 04/10] x86/cpu: Refresh DCA leaf reading code Dave Hansen 2024-12-13 20:50 ` [PATCH 05/10] x86/cpu: Move TSC CPUID leaf definition Dave Hansen 2024-12-13 20:50 ` [PATCH 06/10] x86/tsc: Move away from TSC leaf magic numbers Dave Hansen 2024-12-13 20:50 ` [PATCH 07/10] x86/tsc: Remove CPUID "frequency" " Dave Hansen 2024-12-13 20:50 ` [PATCH 08/10] x86/fpu: Move CPUID leaf definitions to common code Dave Hansen 2024-12-13 20:50 ` [PATCH 09/10] x86/fpu: Remove unnecessary CPUID level check Dave Hansen 2024-12-16 19:05 ` Chang S. Bae 2024-12-16 21:23 ` Dave Hansen 2024-12-13 20:50 ` [PATCH 10/10] x86/cpu: Make all all CPUID leaf names consistent Dave Hansen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®