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

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

x86: Move mpc_apic_id to x86_init_ops 



The mpc_apic_id setup is handled by a x86_quirk. Make it a
x86_init_ops function with a default implementation.

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

arch/x86/include/asm/mpspec.h

+2 −0
Original line number Diff line number Diff line
@@ -62,10 +62,12 @@ extern void get_smp_config(void); 
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);

#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

#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
@@ -12,7 +12,6 @@ 
/*

 * Any setup quirks to be performed?

 */

struct mpc_cpu;

struct mpc_bus;

struct mpc_oemtable;
@@ -25,7 +24,6 @@ struct x86_quirks { 
	int (*mach_get_smp_config)(unsigned int early);

	int (*mach_find_smp_config)(unsigned int reserve);



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

	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,

arch/x86/include/asm/x86_init.h

+4 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_PLATFORM_H

#define _ASM_X86_PLATFORM_H



struct mpc_cpu;



/**

 * 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

 */

struct x86_init_mpparse {

	void (*mpc_record)(unsigned int mode);

	void (*setup_ioapic_ids)(void);

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

};



/**

arch/x86/kernel/apic/numaq_32.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = { 
	.arch_trap_init			= NULL,

	.mach_get_smp_config		= NULL,

	.mach_find_smp_config		= NULL,

	.mpc_apic_id			= mpc_apic_id,

	.mpc_oem_bus_info		= mpc_oem_bus_info,

	.mpc_oem_pci_bus		= mpc_oem_pci_bus,

	.smp_read_mpc_oem		= smp_read_mpc_oem,
@@ -293,6 +292,7 @@ static __init void early_check_numaq(void) 
		x86_quirks = &numaq_x86_quirks;

		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;

	}

}

arch/x86/kernel/mpparse.c

+6 −4
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ static int __init mpf_checksum(unsigned char *mp, int len) 
	return sum & 0xFF;

}



int __init default_mpc_apic_id(struct mpc_cpu *m)

{

	return m->apicid;

}



static void __init MP_processor_info(struct mpc_cpu *m)

{

	int apicid;
@@ -55,10 +60,7 @@ static void __init MP_processor_info(struct mpc_cpu *m) 
		return;

	}



	if (x86_quirks->mpc_apic_id)

		apicid = x86_quirks->mpc_apic_id(m);

	else

		apicid = m->apicid;

	apicid = x86_init.mpparse.mpc_apic_id(m);



	if (m->cpuflag & CPU_BOOTPROCESSOR) {

		bootup_cpu = " (Bootup-CPU)";