Commit 8aa2a417 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/apic: Use u32 for cpu_present_to_apicid() 



APIC IDs are used with random data types u16, u32, int, unsigned int,
unsigned long.

Make it all consistently use u32 because that reflects the hardware
register width and fixup a few related usage sites for consistency sake.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarJuergen Gross <jgross@suse.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Reviewed-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230814085113.054064391@linutronix.de
parent 5d376b8f

arch/x86/include/asm/apic.h

+2 −2
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ struct apic { 
	bool	(*check_apicid_used)(physid_mask_t *map, u32 apicid);

	void	(*init_apic_ldr)(void);

	void	(*ioapic_phys_id_map)(physid_mask_t *phys_map, physid_mask_t *retmap);

	int	(*cpu_present_to_apicid)(int mps_cpu);

	u32	(*cpu_present_to_apicid)(int mps_cpu);

	int	(*phys_pkg_id)(int cpuid_apic, int index_msb);



	u32	(*get_apic_id)(unsigned long x);
@@ -539,7 +539,7 @@ extern u32 apic_default_calc_apicid(unsigned int cpu); 
extern u32 apic_flat_calc_apicid(unsigned int cpu);



extern void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap);

extern int default_cpu_present_to_apicid(int mps_cpu);

extern u32 default_cpu_present_to_apicid(int mps_cpu);



#else /* CONFIG_X86_LOCAL_APIC */

arch/x86/kernel/apic/apic_common.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap) 
	*retmap = *phys_map;

}



int default_cpu_present_to_apicid(int mps_cpu)

u32 default_cpu_present_to_apicid(int mps_cpu)

{

	if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu))

		return (int)per_cpu(x86_cpu_to_apicid, mps_cpu);

arch/x86/kernel/cpu/common.c

+2 −1
Original line number Diff line number Diff line
@@ -1787,7 +1787,8 @@ static void generic_identify(struct cpuinfo_x86 *c) 
static void validate_apic_and_package_id(struct cpuinfo_x86 *c)

{

#ifdef CONFIG_SMP

	unsigned int apicid, cpu = smp_processor_id();

	unsigned int cpu = smp_processor_id();

	u32 apicid;



	apicid = apic->cpu_present_to_apicid(cpu);

arch/x86/kernel/smpboot.c

+5 −5
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static void __init smp_quirk_init_udelay(void) 
/*

 * Wake up AP by INIT, INIT, STARTUP sequence.

 */

static void send_init_sequence(int phys_apicid)

static void send_init_sequence(u32 phys_apicid)

{

	int maxlvt = lapic_get_maxlvt();
@@ -829,7 +829,7 @@ static void send_init_sequence(int phys_apicid) 
/*

 * Wake up AP by INIT, INIT, STARTUP sequence.

 */

static int wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)

static int wakeup_secondary_cpu_via_init(u32 phys_apicid, unsigned long start_eip)

{

	unsigned long send_status = 0, accept_status = 0;

	int num_starts, j, maxlvt;
@@ -976,7 +976,7 @@ int common_cpu_up(unsigned int cpu, struct task_struct *idle) 
 * Returns zero if startup was successfully sent, else error code from

 * ->wakeup_secondary_cpu.

 */

static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)

static int do_boot_cpu(u32 apicid, int cpu, struct task_struct *idle)

{

	unsigned long start_ip = real_mode_header->trampoline_start;

	int ret;
@@ -1044,7 +1044,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle) 


int native_kick_ap(unsigned int cpu, struct task_struct *tidle)

{

	int apicid = apic->cpu_present_to_apicid(cpu);

	u32 apicid = apic->cpu_present_to_apicid(cpu);

	int err;



	lockdep_assert_irqs_enabled();
@@ -1237,7 +1237,7 @@ void arch_thaw_secondary_cpus_end(void) 
bool smp_park_other_cpus_in_init(void)

{

	unsigned int cpu, this_cpu = smp_processor_id();

	unsigned int apicid;

	u32 apicid;



	if (apic->wakeup_secondary_cpu_64 || apic->wakeup_secondary_cpu)

		return false;

arch/x86/xen/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int xen_phys_pkg_id(int initial_apic_id, int index_msb) 
	return initial_apic_id >> index_msb;

}



static int xen_cpu_present_to_apicid(int cpu)

static u32 xen_cpu_present_to_apicid(int cpu)

{

	if (cpu_present(cpu))

		return cpu_data(cpu).topo.apicid;