Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

x86: Move smp_read_mpc_oem to x86_init_ops. 



Move smp_read_mpc_oem from quirks to x86_init.

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

arch/x86/include/asm/mpspec.h

+2 −0
Original line number Diff line number Diff line
@@ -63,11 +63,13 @@ 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);

extern void default_smp_read_mpc_oem(struct mpc_table *mpc);

#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

#endif



void __cpuinit generic_processor_info(int apicid, int version);

arch/x86/include/asm/setup.h

+0 −3
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 * Any setup quirks to be performed?

 */

struct mpc_bus;

struct mpc_oemtable;



struct x86_quirks {

	int (*arch_pre_time_init)(void);
@@ -26,8 +25,6 @@ struct x86_quirks { 


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

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

	void (*smp_read_mpc_oem)(struct mpc_oemtable *oemtable,

				unsigned short oemsize);

};



extern void x86_quirk_intr_init(void);

arch/x86/include/asm/x86_init.h

+3 −0
Original line number Diff line number Diff line
@@ -2,17 +2,20 @@ 
#define _ASM_X86_PLATFORM_H



struct mpc_cpu;

struct mpc_table;



/**

 * struct x86_init_mpparse - platform specific mpparse ops

 * @mpc_record:			platform specific mpc record accounting

 * @setup_ioapic_ids:		platform specific ioapic id override

 * @mpc_apic_id:		platform specific mpc apic id assignment

 * @smp_read_mpc_oem:		platform specific oem mpc table setup

 */

struct x86_init_mpparse {

	void (*mpc_record)(unsigned int mode);

	void (*setup_ioapic_ids)(void);

	int (*mpc_apic_id)(struct mpc_cpu *m);

	void (*smp_read_mpc_oem)(struct mpc_table *mpc);

};



/**

arch/x86/kernel/apic/numaq_32.c

+3 −3
Original line number Diff line number Diff line
@@ -218,9 +218,9 @@ static int __init mpf_checksum(unsigned char *mp, int len) 
/*

 * Read/parse the MPC oem tables

 */

static void __init

 smp_read_mpc_oem(struct mpc_oemtable *oemtable, unsigned short oemsize)

static void __init smp_read_mpc_oem(struct mpc_table *mpc)

{

	struct mpc_oemtable *oemtable = (void *)(long)mpc->oemptr;

	int count = sizeof(*oemtable);	/* the header size */

	unsigned char *oemptr = ((unsigned char *)oemtable) + count;
@@ -272,7 +272,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = { 
	.mach_find_smp_config		= NULL,

	.mpc_oem_bus_info		= mpc_oem_bus_info,

	.mpc_oem_pci_bus		= mpc_oem_pci_bus,

	.smp_read_mpc_oem		= smp_read_mpc_oem,

};



static __init void early_check_numaq(void)
@@ -293,6 +292,7 @@ static __init void early_check_numaq(void) 
		x86_init.mpparse.mpc_record = numaq_mpc_record;

		x86_init.mpparse.setup_ioapic_ids = x86_init_noop;

		x86_init.mpparse.mpc_apic_id = mpc_apic_id;

		x86_init.mpparse.smp_read_mpc_oem = smp_read_mpc_oem;

	}

}

arch/x86/kernel/mpparse.c

+4 −4
Original line number Diff line number Diff line
@@ -293,6 +293,8 @@ static void __init smp_dump_mptable(struct mpc_table *mpc, unsigned char *mpt) 
			1, mpc, mpc->length, 1);

}



void __init default_smp_read_mpc_oem(struct mpc_table *mpc) { }



static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)

{

	char str[16];
@@ -314,10 +316,8 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) 
	if (early)

		return 1;



	if (mpc->oemptr && x86_quirks->smp_read_mpc_oem) {

		struct mpc_oemtable *oem_table = (void *)(long)mpc->oemptr;

		x86_quirks->smp_read_mpc_oem(oem_table, mpc->oemsize);

	}

	if (mpc->oemptr)

		x86_init.mpparse.smp_read_mpc_oem(mpc);



	/*

	 *      Now process the configuration blocks.