Commit 1a5d0f62 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/apic: Use a proper define for invalid ACPI CPU ID 



The ACPI ID for CPUs is preset with U32_MAX which is completely non
obvious. Use a proper define for it.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarMichael Kelley <mhklinux@outlook.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Link: https://lore.kernel.org/r/20240212154640.177504138@linutronix.de
parent 4a5f72a4

arch/x86/include/asm/apic.h

+3 −0
Original line number Diff line number Diff line
@@ -48,7 +48,10 @@ static inline void x86_32_probe_apic(void) { } 


extern u32 cpuid_to_apicid[];



#define CPU_ACPIID_INVALID	U32_MAX



#ifdef CONFIG_X86_LOCAL_APIC



extern int apic_verbosity;

extern int local_apic_timer_c2_ok;

arch/x86/kernel/apic/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static inline bool apic_accessible(void) 
 * Map cpu index to physical APIC ID

 */

DEFINE_EARLY_PER_CPU_READ_MOSTLY(u32, x86_cpu_to_apicid, BAD_APICID);

DEFINE_EARLY_PER_CPU_READ_MOSTLY(u32, x86_cpu_to_acpiid, U32_MAX);

DEFINE_EARLY_PER_CPU_READ_MOSTLY(u32, x86_cpu_to_acpiid, CPU_ACPIID_INVALID);

EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_apicid);

EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_acpiid);

arch/x86/xen/enlighten_hvm.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int xen_cpu_up_prepare_hvm(unsigned int cpu) 
	 */

	xen_uninit_lock_cpu(cpu);



	if (cpu_acpi_id(cpu) != U32_MAX)

	if (cpu_acpi_id(cpu) != CPU_ACPIID_INVALID)

		per_cpu(xen_vcpu_id, cpu) = cpu_acpi_id(cpu);

	else

		per_cpu(xen_vcpu_id, cpu) = cpu;