Commit 9132d720 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Dave Hansen
Browse files

x86/apic: Wrap APIC ID validation into an inline 



Prepare for removing the callback and making this as simple comparison to
an upper limit, which is the obvious solution to do for limit checks...

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)
parent d65eb319

arch/x86/include/asm/apic.h

+5 −0
Original line number Diff line number Diff line
@@ -372,6 +372,11 @@ static inline u32 safe_apic_wait_icr_idle(void) 
	return apic->safe_wait_icr_idle ? apic->safe_wait_icr_idle() : 0;

}



static inline bool apic_id_valid(u32 apic_id)

{

	return apic->apic_id_valid(apic_id);

}



extern void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v));



#else /* CONFIG_X86_LOCAL_APIC */

arch/x86/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ acpi_parse_x2apic(union acpi_subtable_headers *header, const unsigned long end) 
	 * to not preallocating memory for all NR_CPUS

	 * when we use CPU hotplug.

	 */

	if (!apic->apic_id_valid(apic_id)) {

	if (!apic_id_valid(apic_id)) {

		if (enabled)

			pr_warn("x2apic entry ignored\n");

		return 0;

arch/x86/kernel/apic/vector.c

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ static int x86_vector_select(struct irq_domain *d, struct irq_fwspec *fwspec, 
	 * if IRQ remapping is enabled. APIC IDs above 15 bits are

	 * only permitted if IRQ remapping is enabled, so check that.

	 */

	if (apic->apic_id_valid(32768))

	if (apic_id_valid(32768))

		return 0;



	return x86_fwspec_is_ioapic(fwspec) || x86_fwspec_is_hpet(fwspec);

arch/x86/kernel/smpboot.c

+2 −3
Original line number Diff line number Diff line
@@ -1064,9 +1064,8 @@ int native_kick_ap(unsigned int cpu, struct task_struct *tidle) 


	pr_debug("++++++++++++++++++++=_---CPU UP  %u\n", cpu);



	if (apicid == BAD_APICID ||

	    !physid_isset(apicid, phys_cpu_present_map) ||

	    !apic->apic_id_valid(apicid)) {

	if (apicid == BAD_APICID || !physid_isset(apicid, phys_cpu_present_map) ||

	    !apic_id_valid(apicid)) {

		pr_err("%s: bad cpu %d\n", __func__, cpu);

		return -EINVAL;

	}

arch/x86/mm/srat.c

+2 −3
Original line number Diff line number Diff line
@@ -40,9 +40,8 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) 
		return;

	pxm = pa->proximity_domain;

	apic_id = pa->apic_id;

	if (!apic->apic_id_valid(apic_id)) {

		printk(KERN_INFO "SRAT: PXM %u -> X2APIC 0x%04x ignored\n",

			 pxm, apic_id);

	if (!apic_id_valid(apic_id)) {

		pr_info("SRAT: PXM %u -> X2APIC 0x%04x ignored\n", pxm, apic_id);

		return;

	}

	node = acpi_map_pxm_to_node(pxm);