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

Commit 90e1c696 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Move oem_bus_info to x86_init_ops 



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

arch/x86/include/asm/mpspec.h

+6 −0
Original line number Diff line number Diff line
@@ -64,12 +64,18 @@ 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);

# ifdef CONFIG_X86_IO_APIC

extern void default_mpc_oem_bus_info(struct mpc_bus *m, char *str);

# else

#  define default_mpc_oem_bus_info NULL

# endif

#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

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

 * Any setup quirks to be performed?

 */

struct mpc_bus;



struct x86_quirks {

	int (*arch_pre_time_init)(void);
@@ -22,8 +21,6 @@ struct x86_quirks { 
	int (*arch_trap_init)(void);

	int (*mach_get_smp_config)(unsigned int early);

	int (*mach_find_smp_config)(unsigned int reserve);



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

};



extern void x86_quirk_intr_init(void);

arch/x86/include/asm/x86_init.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ struct mpc_table; 
 * @mpc_apic_id:		platform specific mpc apic id assignment

 * @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

 */

struct x86_init_mpparse {

	void (*mpc_record)(unsigned int mode);
@@ -19,6 +20,7 @@ struct x86_init_mpparse { 
	int (*mpc_apic_id)(struct mpc_cpu *m);

	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);

};



/**

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_oem_bus_info		= mpc_oem_bus_info,

};



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

		x86_init.mpparse.smp_read_mpc_oem = smp_read_mpc_oem;

		x86_init.mpparse.mpc_oem_pci_bus = mpc_oem_pci_bus;

		x86_init.mpparse.mpc_oem_bus_info = mpc_oem_bus_info;

	}

}

arch/x86/kernel/mpparse.c

+8 −6
Original line number Diff line number Diff line
@@ -72,16 +72,18 @@ static void __init MP_processor_info(struct mpc_cpu *m) 
}



#ifdef CONFIG_X86_IO_APIC

static void __init MP_bus_info(struct mpc_bus *m)

void __init default_mpc_oem_bus_info(struct mpc_bus *m, char *str)

{

	char str[7];

	memcpy(str, m->bustype, 6);

	str[6] = 0;



	if (x86_quirks->mpc_oem_bus_info)

		x86_quirks->mpc_oem_bus_info(m, str);

	else

	apic_printk(APIC_VERBOSE, "Bus #%d is %s\n", m->busid, str);

}



static void __init MP_bus_info(struct mpc_bus *m)

{

	char str[7];



	x86_init.mpparse.mpc_oem_bus_info(m, str);



#if MAX_MP_BUSSES < 256

	if (m->busid >= MAX_MP_BUSSES) {