Commit b3f1b617 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Move get/find_smp_config to x86_init_ops 



Replace the quirk machinery by a x86_init_ops function which defaults
to the standard implementation.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 90e1c696

arch/x86/include/asm/mpspec.h

+30 −7
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/init.h>



#include <asm/mpspec_def.h>

#include <asm/x86_init.h>



extern int apic_version[MAX_APICS];

extern int pic_mode;
@@ -41,9 +42,6 @@ extern int quad_local_to_mp_bus_id [NR_CPUS/4][4]; 


#endif /* CONFIG_X86_64 */



extern void early_find_smp_config(void);

extern void early_get_smp_config(void);



#if defined(CONFIG_MCA) || defined(CONFIG_EISA)

extern int mp_bus_id_to_type[MAX_MP_BUSSES];

#endif
@@ -52,14 +50,36 @@ extern DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); 


extern unsigned int boot_cpu_physical_apicid;

extern unsigned int max_physical_apicid;

extern int smp_found_config;

extern int mpc_default_type;

extern unsigned long mp_lapic_addr;



extern void get_smp_config(void);

#ifdef CONFIG_X86_LOCAL_APIC

extern int smp_found_config;

#else

# define smp_found_config 0

#endif



static inline void get_smp_config(void)

{

	x86_init.mpparse.get_smp_config(0);

}



static inline void early_get_smp_config(void)

{

	x86_init.mpparse.get_smp_config(1);

}



static inline void find_smp_config(void)

{

	x86_init.mpparse.find_smp_config(1);

}



static inline void early_find_smp_config(void)

{

	x86_init.mpparse.find_smp_config(0);

}



#ifdef CONFIG_X86_MPPARSE

extern void find_smp_config(void);

extern void early_reserve_e820_mpc_new(void);

extern int enable_update_mptable;

extern int default_mpc_apic_id(struct mpc_cpu *m);
@@ -69,13 +89,16 @@ extern void default_mpc_oem_bus_info(struct mpc_bus *m, char *str); 
# else

#  define default_mpc_oem_bus_info NULL

# endif

extern void default_find_smp_config(unsigned int reserve);

extern void default_get_smp_config(unsigned int early);

#else

static inline void find_smp_config(void) { }

static inline void early_reserve_e820_mpc_new(void) { }

#define enable_update_mptable 0

#define default_mpc_apic_id NULL

#define default_smp_read_mpc_oem NULL

#define default_mpc_oem_bus_info NULL

#define default_find_smp_config x86_init_uint_noop

#define default_get_smp_config x86_init_uint_noop

#endif



void __cpuinit generic_processor_info(int apicid, int version);

arch/x86/include/asm/setup.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ struct x86_quirks { 
	int (*arch_pre_intr_init)(void);

	int (*arch_intr_init)(void);

	int (*arch_trap_init)(void);

	int (*mach_get_smp_config)(unsigned int early);

	int (*mach_find_smp_config)(unsigned int reserve);

};



extern void x86_quirk_intr_init(void);

arch/x86/include/asm/x86_init.h

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ struct mpc_table; 
 * @smp_read_mpc_oem:		platform specific oem mpc table setup

 * @mpc_oem_pci_bus:		platform specific pci bus setup (default NULL)

 * @mpc_oem_bus_info:		platform specific mpc bus info

 * @find_smp_config:		find the smp configuration

 * @get_smp_config:		get the smp configuration

 */

struct x86_init_mpparse {

	void (*mpc_record)(unsigned int mode);
@@ -21,6 +23,8 @@ struct x86_init_mpparse { 
	void (*smp_read_mpc_oem)(struct mpc_table *mpc);

	void (*mpc_oem_pci_bus)(struct mpc_bus *m);

	void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);

	void (*find_smp_config)(unsigned int reserve);

	void (*get_smp_config)(unsigned int early);

};



/**

arch/x86/kernel/apic/numaq_32.c

+0 −2
Original line number Diff line number Diff line
@@ -268,8 +268,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = { 
	.arch_pre_intr_init		= NULL,

	.arch_intr_init			= NULL,

	.arch_trap_init			= NULL,

	.mach_get_smp_config		= NULL,

	.mach_find_smp_config		= NULL,

};



static __init void early_check_numaq(void)

arch/x86/kernel/mpparse.c

+2 −31
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int __init check_physptr(struct mpf_intel *mpf, unsigned int early) 
/*

 * Scan the memory blocks for an SMP configuration block.

 */

static void __init __get_smp_config(unsigned int early)

void __init default_get_smp_config(unsigned int early)

{

	struct mpf_intel *mpf = mpf_found;
@@ -627,11 +627,6 @@ static void __init __get_smp_config(unsigned int early) 
	if (acpi_lapic && acpi_ioapic)

		return;



	if (x86_quirks->mach_get_smp_config) {

		if (x86_quirks->mach_get_smp_config(early))

			return;

	}



	printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",

	       mpf->specification);

#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
@@ -672,16 +667,6 @@ static void __init __get_smp_config(unsigned int early) 
	 */

}



void __init early_get_smp_config(void)

{

	__get_smp_config(1);

}



void __init get_smp_config(void)

{

	__get_smp_config(0);

}



static void __init smp_reserve_bootmem(struct mpf_intel *mpf)

{

	unsigned long size = get_mpc_size(mpf->physptr);
@@ -747,14 +732,10 @@ static int __init smp_scan_config(unsigned long base, unsigned long length, 
	return 0;

}



static void __init __find_smp_config(unsigned int reserve)

void __init default_find_smp_config(unsigned int reserve)

{

	unsigned int address;



	if (x86_quirks->mach_find_smp_config) {

		if (x86_quirks->mach_find_smp_config(reserve))

			return;

	}

	/*

	 * FIXME: Linux assumes you have 640K of base ram..

	 * this continues the error...
@@ -789,16 +770,6 @@ static void __init __find_smp_config(unsigned int reserve) 
		smp_scan_config(address, 0x400, reserve);

}



void __init early_find_smp_config(void)

{

	__find_smp_config(0);

}



void __init find_smp_config(void)

{

	__find_smp_config(1);

}



#ifdef CONFIG_X86_IO_APIC

static u8 __initdata irq_used[MAX_IRQ_SOURCES];