lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: Move smp_read_mpc_oem to x86_init_ops.

Browse Source 
Move smp_read_mpc_oem from quirks to x86_init.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2009-08-20 12:18:32 +02:00
parent fd6c666149
commit 72302142e1
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/mpspec.h
View File

@@ -63,11 +63,13 @@ extern void find_smp_config(void);
extern void early_reserve_e820_mpc_new(void); extern void early_reserve_e820_mpc_new(void);
extern int enable_update_mptable; extern int enable_update_mptable;
extern int default_mpc_apic_id(struct mpc_cpu *m); extern int default_mpc_apic_id(struct mpc_cpu *m);
extern void default_smp_read_mpc_oem(struct mpc_table *mpc);
#else #else
static inline void find_smp_config(void) { } static inline void find_smp_config(void) { }
static inline void early_reserve_e820_mpc_new(void) { } static inline void early_reserve_e820_mpc_new(void) { }
#define enable_update_mptable 0 #define enable_update_mptable 0
#define default_mpc_apic_id NULL #define default_mpc_apic_id NULL
#define default_smp_read_mpc_oem NULL
#endif #endif
void __cpuinit generic_processor_info(int apicid, int version); void __cpuinit generic_processor_info(int apicid, int version);

3
arch/x86/include/asm/setup.h
View File

@@ -13,7 +13,6 @@
* Any setup quirks to be performed? * Any setup quirks to be performed?
*/ */
struct mpc_bus; struct mpc_bus;
struct mpc_oemtable;
struct x86_quirks { struct x86_quirks {
int (*arch_pre_time_init)(void); 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_bus_info)(struct mpc_bus *m, char *name);
void (*mpc_oem_pci_bus)(struct mpc_bus *m); 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); extern void x86_quirk_intr_init(void);

3
arch/x86/include/asm/x86_init.h
View File

@@ -2,17 +2,20 @@
#define _ASM_X86_PLATFORM_H #define _ASM_X86_PLATFORM_H
struct mpc_cpu; struct mpc_cpu;
struct mpc_table;
/** /**
* struct x86_init_mpparse - platform specific mpparse ops * struct x86_init_mpparse - platform specific mpparse ops
* @mpc_record: platform specific mpc record accounting * @mpc_record: platform specific mpc record accounting
* @setup_ioapic_ids: platform specific ioapic id override * @setup_ioapic_ids: platform specific ioapic id override
* @mpc_apic_id: platform specific mpc apic id assignment * @mpc_apic_id: platform specific mpc apic id assignment
* @smp_read_mpc_oem: platform specific oem mpc table setup
*/ */
struct x86_init_mpparse { struct x86_init_mpparse {
void (*mpc_record)(unsigned int mode); void (*mpc_record)(unsigned int mode);
void (*setup_ioapic_ids)(void); void (*setup_ioapic_ids)(void);
int (*mpc_apic_id)(struct mpc_cpu *m); int (*mpc_apic_id)(struct mpc_cpu *m);
void (*smp_read_mpc_oem)(struct mpc_table *mpc);
}; };
/** /**

6
arch/x86/kernel/apic/numaq_32.c
View File

@@ -218,9 +218,9 @@ static int __init mpf_checksum(unsigned char *mp, int len)
/* /*
* Read/parse the MPC oem tables * Read/parse the MPC oem tables
*/ */
static void __init static void __init smp_read_mpc_oem(struct mpc_table *mpc)
smp_read_mpc_oem(struct mpc_oemtable *oemtable, unsigned short oemsize)
{ {
struct mpc_oemtable *oemtable = (void *)(long)mpc->oemptr;
int count = sizeof(*oemtable); /* the header size */ int count = sizeof(*oemtable); /* the header size */
unsigned char *oemptr = ((unsigned char *)oemtable) + count; unsigned char *oemptr = ((unsigned char *)oemtable) + count;
@@ -272,7 +272,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
.mach_find_smp_config = NULL, .mach_find_smp_config = NULL,
.mpc_oem_bus_info = mpc_oem_bus_info, .mpc_oem_bus_info = mpc_oem_bus_info,
.mpc_oem_pci_bus = mpc_oem_pci_bus, .mpc_oem_pci_bus = mpc_oem_pci_bus,
.smp_read_mpc_oem = smp_read_mpc_oem,
}; };
static __init void early_check_numaq(void) 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.mpc_record = numaq_mpc_record;
x86_init.mpparse.setup_ioapic_ids = x86_init_noop; x86_init.mpparse.setup_ioapic_ids = x86_init_noop;
x86_init.mpparse.mpc_apic_id = mpc_apic_id; x86_init.mpparse.mpc_apic_id = mpc_apic_id;
x86_init.mpparse.smp_read_mpc_oem = smp_read_mpc_oem;
} }
} }

8
arch/x86/kernel/mpparse.c
View File

@@ -293,6 +293,8 @@ static void __init smp_dump_mptable(struct mpc_table *mpc, unsigned char *mpt)
1, mpc, mpc->length, 1); 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) static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
{ {
char str[16]; char str[16];
@@ -314,10 +316,8 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
if (early) if (early)
return 1; return 1;
if (mpc->oemptr && x86_quirks->smp_read_mpc_oem) { if (mpc->oemptr)
struct mpc_oemtable *oem_table = (void *)(long)mpc->oemptr; x86_init.mpparse.smp_read_mpc_oem(mpc);
x86_quirks->smp_read_mpc_oem(oem_table, mpc->oemsize);
}
/* /*
* Now process the configuration blocks. * Now process the configuration blocks.

1
arch/x86/kernel/x86_init.c
View File

@@ -30,5 +30,6 @@ struct __initdata x86_init_ops x86_init = {
.mpc_record = x86_init_uint_noop, .mpc_record = x86_init_uint_noop,
.setup_ioapic_ids = x86_init_noop, .setup_ioapic_ids = x86_init_noop,
.mpc_apic_id = default_mpc_apic_id, .mpc_apic_id = default_mpc_apic_id,
.smp_read_mpc_oem = default_smp_read_mpc_oem,
}, },
}; };