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

x86/apic/32: Remove pointless default_acpi_madt_oem_check() 



On 32bit there is no APIC implementing the acpi_madt_oem_check() except XEN
PV, but that does not matter at all.

generic_apic_probe() runs before ACPI tables are parsed. This selects the
XEN APIC if there is no command line override because the XEN APIC driver
is the first to be probed.

If there is a command line override then the XEN PV driver won't be
selected in the MADT OEM check either.

As there is no other MADT check implemented for 32bit APICs, this whole
excercise is a NOOP and can be removed.

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 e3243ed0

arch/x86/include/asm/apic.h

+3 −1
Original line number Diff line number Diff line
@@ -459,10 +459,12 @@ static inline unsigned int read_apic_id(void) 
#ifdef CONFIG_X86_64

typedef int (*wakeup_cpu_handler)(int apicid, unsigned long start_eip);

extern void acpi_wake_cpu_handler_update(wakeup_cpu_handler handler);

extern int default_acpi_madt_oem_check(char *, char *);

#else

static inline int default_acpi_madt_oem_check(char *a, char *b) { return 0; }

#endif



extern int default_apic_id_valid(u32 apicid);

extern int default_acpi_madt_oem_check(char *, char *);

extern void default_setup_apic_routing(void);



extern u32 apic_default_calc_apicid(unsigned int cpu);

arch/x86/kernel/apic/bigsmp_32.c

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ static struct apic apic_bigsmp __ro_after_init = { 


	.name				= "bigsmp",

	.probe				= probe_bigsmp,

	.acpi_madt_oem_check		= NULL,

	.apic_id_valid			= default_apic_id_valid,

	.apic_id_registered		= bigsmp_apic_id_registered,

arch/x86/kernel/apic/probe_32.c

+0 −22
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static struct apic apic_default __ro_after_init = { 


	.name				= "default",

	.probe				= probe_default,

	.acpi_madt_oem_check		= NULL,

	.apic_id_valid			= default_apic_id_valid,

	.apic_id_registered		= default_apic_id_registered,
@@ -176,24 +175,3 @@ void __init generic_apic_probe(void) 
	}

	printk(KERN_INFO "Using APIC driver %s\n", apic->name);

}
 


/* This function can switch the APIC even after the initial ->probe() */

int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)

{

	struct apic **drv;



	for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) {

		if (!(*drv)->acpi_madt_oem_check)

			continue;

		if (!(*drv)->acpi_madt_oem_check(oem_id, oem_table_id))

			continue;



		if (!cmdline_apic) {

			apic = *drv;

			printk(KERN_INFO "Switched to APIC driver `%s'.\n",

			       apic->name);

		}

		return 1;

	}

	return 0;

}