tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

x86/cpuid: Set <asm/cpuid/api.h> as the main CPUID header

The main CPUID header <asm/cpuid.h> was originally a storefront for the
headers:

<asm/cpuid/api.h>
<asm/cpuid/leaf_0x2_api.h>

Now that the latter CPUID(0x2) header has been merged into the former,
there is no practical difference between <asm/cpuid.h> and
<asm/cpuid/api.h>.

Migrate all users to the <asm/cpuid/api.h> header, in preparation of
the removal of <asm/cpuid.h>.

Don't remove <asm/cpuid.h> just yet, in case some new code in -next
started using it.

Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: John Ogness <john.ogness@linutronix.de>
Cc: x86-cpuid@lists.linux.dev
Link: https://lore.kernel.org/r/20250508150240.172915-3-darwi@linutronix.de

authored by

Ahmed S. Darwish and committed by
Ingo Molnar 968e3000 cdc8be31

+24 -24
+1 -1
arch/x86/boot/compressed/sev.c
··· 21 21 #include <asm/fpu/xcr.h> 22 22 #include <asm/ptrace.h> 23 23 #include <asm/svm.h> 24 - #include <asm/cpuid.h> 24 + #include <asm/cpuid/api.h> 25 25 26 26 #include "error.h" 27 27 #include "sev.h"
+1 -1
arch/x86/boot/startup/sev-startup.c
··· 38 38 #include <asm/smp.h> 39 39 #include <asm/cpu.h> 40 40 #include <asm/apic.h> 41 - #include <asm/cpuid.h> 41 + #include <asm/cpuid/api.h> 42 42 #include <asm/cmdline.h> 43 43 44 44 /* For early boot hypervisor communication in SEV-ES enabled guests */
+1 -1
arch/x86/coco/sev/core.c
··· 42 42 #include <asm/smp.h> 43 43 #include <asm/cpu.h> 44 44 #include <asm/apic.h> 45 - #include <asm/cpuid.h> 45 + #include <asm/cpuid/api.h> 46 46 #include <asm/cmdline.h> 47 47 #include <asm/msr.h> 48 48
+1 -1
arch/x86/coco/sev/vc-handle.c
··· 32 32 #include <asm/smp.h> 33 33 #include <asm/cpu.h> 34 34 #include <asm/apic.h> 35 - #include <asm/cpuid.h> 35 + #include <asm/cpuid/api.h> 36 36 37 37 static enum es_result vc_slow_virt_to_phys(struct ghcb *ghcb, struct es_em_ctxt *ctxt, 38 38 unsigned long vaddr, phys_addr_t *paddr)
+1 -1
arch/x86/events/intel/pt.c
··· 18 18 #include <linux/slab.h> 19 19 #include <linux/device.h> 20 20 21 - #include <asm/cpuid.h> 21 + #include <asm/cpuid/api.h> 22 22 #include <asm/perf_event.h> 23 23 #include <asm/insn.h> 24 24 #include <asm/io.h>
+1 -1
arch/x86/include/asm/processor.h
··· 16 16 #include <uapi/asm/sigcontext.h> 17 17 #include <asm/current.h> 18 18 #include <asm/cpufeatures.h> 19 - #include <asm/cpuid.h> 19 + #include <asm/cpuid/api.h> 20 20 #include <asm/page.h> 21 21 #include <asm/pgtable_types.h> 22 22 #include <asm/percpu.h>
+1 -1
arch/x86/kernel/acpi/cstate.c
··· 14 14 15 15 #include <acpi/processor.h> 16 16 #include <asm/cpu_device_id.h> 17 - #include <asm/cpuid.h> 17 + #include <asm/cpuid/api.h> 18 18 #include <asm/mwait.h> 19 19 #include <asm/special_insns.h> 20 20 #include <asm/smp.h>
+1 -1
arch/x86/kernel/amd_nb.c
··· 15 15 #include <linux/pci_ids.h> 16 16 17 17 #include <asm/amd/nb.h> 18 - #include <asm/cpuid.h> 18 + #include <asm/cpuid/api.h> 19 19 20 20 static u32 *flush_words; 21 21
+1 -1
arch/x86/kernel/cpu/cacheinfo.c
··· 16 16 #include <asm/amd/nb.h> 17 17 #include <asm/cacheinfo.h> 18 18 #include <asm/cpufeature.h> 19 - #include <asm/cpuid.h> 19 + #include <asm/cpuid/api.h> 20 20 #include <asm/mtrr.h> 21 21 #include <asm/smp.h> 22 22 #include <asm/tlbflush.h>
+1 -1
arch/x86/kernel/cpu/common.c
··· 29 29 30 30 #include <asm/alternative.h> 31 31 #include <asm/cmdline.h> 32 - #include <asm/cpuid.h> 32 + #include <asm/cpuid/api.h> 33 33 #include <asm/perf_event.h> 34 34 #include <asm/mmu_context.h> 35 35 #include <asm/doublefault.h>
+1 -1
arch/x86/kernel/cpu/intel.c
··· 16 16 #include <asm/cpu_device_id.h> 17 17 #include <asm/cpufeature.h> 18 18 #include <asm/cpu.h> 19 - #include <asm/cpuid.h> 19 + #include <asm/cpuid/api.h> 20 20 #include <asm/hwcap2.h> 21 21 #include <asm/intel-family.h> 22 22 #include <asm/microcode.h>
+1 -1
arch/x86/kernel/fpu/xstate.c
··· 21 21 #include <asm/fpu/signal.h> 22 22 #include <asm/fpu/xcr.h> 23 23 24 - #include <asm/cpuid.h> 24 + #include <asm/cpuid/api.h> 25 25 #include <asm/msr.h> 26 26 #include <asm/tlbflush.h> 27 27 #include <asm/prctl.h>
+1 -1
arch/x86/kernel/hpet.c
··· 7 7 #include <linux/cpu.h> 8 8 #include <linux/irq.h> 9 9 10 - #include <asm/cpuid.h> 10 + #include <asm/cpuid/api.h> 11 11 #include <asm/irq_remapping.h> 12 12 #include <asm/hpet.h> 13 13 #include <asm/time.h>
+1 -1
arch/x86/kernel/process.c
··· 30 30 #include <linux/hw_breakpoint.h> 31 31 #include <linux/entry-common.h> 32 32 #include <asm/cpu.h> 33 - #include <asm/cpuid.h> 33 + #include <asm/cpuid/api.h> 34 34 #include <asm/apic.h> 35 35 #include <linux/uaccess.h> 36 36 #include <asm/mwait.h>
+1 -1
arch/x86/kernel/smpboot.c
··· 64 64 65 65 #include <asm/acpi.h> 66 66 #include <asm/cacheinfo.h> 67 - #include <asm/cpuid.h> 67 + #include <asm/cpuid/api.h> 68 68 #include <asm/desc.h> 69 69 #include <asm/nmi.h> 70 70 #include <asm/irq.h>
+1 -1
arch/x86/kernel/tsc.c
··· 16 16 #include <linux/static_key.h> 17 17 #include <linux/static_call.h> 18 18 19 - #include <asm/cpuid.h> 19 + #include <asm/cpuid/api.h> 20 20 #include <asm/hpet.h> 21 21 #include <asm/timer.h> 22 22 #include <asm/vgtod.h>
+1 -1
arch/x86/kvm/cpuid.c
··· 21 21 #include <asm/user.h> 22 22 #include <asm/fpu/xstate.h> 23 23 #include <asm/sgx.h> 24 - #include <asm/cpuid.h> 24 + #include <asm/cpuid/api.h> 25 25 #include "cpuid.h" 26 26 #include "lapic.h" 27 27 #include "mmu.h"
+1 -1
arch/x86/virt/svm/sev.c
··· 27 27 #include <asm/smp.h> 28 28 #include <asm/cpu.h> 29 29 #include <asm/apic.h> 30 - #include <asm/cpuid.h> 30 + #include <asm/cpuid/api.h> 31 31 #include <asm/cmdline.h> 32 32 #include <asm/iommu.h> 33 33 #include <asm/msr.h>
+1 -1
arch/x86/xen/enlighten_pv.c
··· 49 49 #include <xen/hvc-console.h> 50 50 #include <xen/acpi.h> 51 51 52 - #include <asm/cpuid.h> 52 + #include <asm/cpuid/api.h> 53 53 #include <asm/paravirt.h> 54 54 #include <asm/apic.h> 55 55 #include <asm/page.h>
+1 -1
drivers/acpi/acpi_pad.c
··· 19 19 #include <linux/acpi.h> 20 20 #include <linux/perf_event.h> 21 21 #include <linux/platform_device.h> 22 - #include <asm/cpuid.h> 22 + #include <asm/cpuid/api.h> 23 23 #include <asm/mwait.h> 24 24 #include <xen/xen.h> 25 25
+1 -1
drivers/dma/ioat/dca.c
··· 10 10 #include <linux/interrupt.h> 11 11 #include <linux/dca.h> 12 12 13 - #include <asm/cpuid.h> 13 + #include <asm/cpuid/api.h> 14 14 15 15 /* either a kernel change is needed, or we need something like this in kernel */ 16 16 #ifndef CONFIG_SMP
+1 -1
drivers/idle/intel_idle.c
··· 51 51 #include <linux/notifier.h> 52 52 #include <linux/cpu.h> 53 53 #include <linux/moduleparam.h> 54 - #include <asm/cpuid.h> 54 + #include <asm/cpuid/api.h> 55 55 #include <asm/cpu_device_id.h> 56 56 #include <asm/intel-family.h> 57 57 #include <asm/mwait.h>
+1 -1
drivers/platform/x86/intel/pmc/core.c
··· 22 22 #include <linux/suspend.h> 23 23 #include <linux/units.h> 24 24 25 - #include <asm/cpuid.h> 25 + #include <asm/cpuid/api.h> 26 26 #include <asm/cpu_device_id.h> 27 27 #include <asm/intel-family.h> 28 28 #include <asm/msr.h>
+1 -1
sound/soc/intel/avs/tgl.c
··· 47 47 #ifdef CONFIG_X86 48 48 unsigned int ecx; 49 49 50 - #include <asm/cpuid.h> 50 + #include <asm/cpuid/api.h> 51 51 ecx = cpuid_ecx(CPUID_TSC_LEAF); 52 52 if (ecx) { 53 53 ret = avs_ipc_set_fw_config(adev, 1, AVS_FW_CFG_XTAL_FREQ_HZ, sizeof(ecx), &ecx);