hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2009-08-20 10:41:58 +02:00
parent de93410310
commit fd6c666149
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,10 +62,12 @@ extern void get_smp_config(void);
extern void find_smp_config(void); 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);
#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
#endif #endif
void __cpuinit generic_processor_info(int apicid, int version); void __cpuinit generic_processor_info(int apicid, int version);

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

@ -12,7 +12,6 @@
/* /*
* Any setup quirks to be performed? * Any setup quirks to be performed?
*/ */
struct mpc_cpu;
struct mpc_bus; struct mpc_bus;
struct mpc_oemtable; struct mpc_oemtable;
@ -25,7 +24,6 @@ struct x86_quirks {
int (*mach_get_smp_config)(unsigned int early); int (*mach_get_smp_config)(unsigned int early);
int (*mach_find_smp_config)(unsigned int reserve); 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_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, void (*smp_read_mpc_oem)(struct mpc_oemtable *oemtable,

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

@ -1,14 +1,18 @@
#ifndef _ASM_X86_PLATFORM_H #ifndef _ASM_X86_PLATFORM_H
#define _ASM_X86_PLATFORM_H #define _ASM_X86_PLATFORM_H
struct mpc_cpu;
/** /**
* 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
*/ */
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);
}; };
/** /**

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

@ -270,7 +270,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
.arch_trap_init = NULL, .arch_trap_init = NULL,
.mach_get_smp_config = NULL, .mach_get_smp_config = NULL,
.mach_find_smp_config = NULL, .mach_find_smp_config = NULL,
.mpc_apic_id = mpc_apic_id,
.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, .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_quirks = &numaq_x86_quirks;
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;
} }
} }

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

@ -45,6 +45,11 @@ static int __init mpf_checksum(unsigned char *mp, int len)
return sum & 0xFF; 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) static void __init MP_processor_info(struct mpc_cpu *m)
{ {
int apicid; int apicid;
@ -55,10 +60,7 @@ static void __init MP_processor_info(struct mpc_cpu *m)
return; return;
} }
if (x86_quirks->mpc_apic_id) apicid = x86_init.mpparse.mpc_apic_id(m);
apicid = x86_quirks->mpc_apic_id(m);
else
apicid = m->apicid;
if (m->cpuflag & CPU_BOOTPROCESSOR) { if (m->cpuflag & CPU_BOOTPROCESSOR) {
bootup_cpu = " (Bootup-CPU)"; bootup_cpu = " (Bootup-CPU)";

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

@ -6,6 +6,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <asm/bios_ebda.h> #include <asm/bios_ebda.h>
#include <asm/mpspec.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/e820.h> #include <asm/e820.h>
@ -28,5 +29,6 @@ struct __initdata x86_init_ops x86_init = {
.mpparse = { .mpparse = {
.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,
}, },
}; };