aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-20 05:11:52 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-31 03:35:45 -0400
commitb3f1b617f49447df6c3f5fac9c225aaea8b724ea (patch)
tree9c1cc5a96be1330868312d7970583838790b14a3
parent90e1c6969d8711edb888a00ec54c74370f125c8f (diff)
x86: Move get/find_smp_config to x86_init_ops
Replace the quirk machinery by a x86_init_ops function which defaults to the standard implementation. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/include/asm/mpspec.h37
-rw-r--r--arch/x86/include/asm/setup.h2
-rw-r--r--arch/x86/include/asm/x86_init.h4
-rw-r--r--arch/x86/kernel/apic/numaq_32.c2
-rw-r--r--arch/x86/kernel/mpparse.c33
-rw-r--r--arch/x86/kernel/setup.c2
-rw-r--r--arch/x86/kernel/visws_quirks.c14
-rw-r--r--arch/x86/kernel/x86_init.c2
8 files changed, 42 insertions, 54 deletions
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index e3c579efde7a..79c94500c0bb 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -4,6 +4,7 @@
4#include <linux/init.h> 4#include <linux/init.h>
5 5
6#include <asm/mpspec_def.h> 6#include <asm/mpspec_def.h>
7#include <asm/x86_init.h>
7 8
8extern int apic_version[MAX_APICS]; 9extern int apic_version[MAX_APICS];
9extern int pic_mode; 10extern int pic_mode;
@@ -41,9 +42,6 @@ extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];
41 42
42#endif /* CONFIG_X86_64 */ 43#endif /* CONFIG_X86_64 */
43 44
44extern void early_find_smp_config(void);
45extern void early_get_smp_config(void);
46
47#if defined(CONFIG_MCA) || defined(CONFIG_EISA) 45#if defined(CONFIG_MCA) || defined(CONFIG_EISA)
48extern int mp_bus_id_to_type[MAX_MP_BUSSES]; 46extern int mp_bus_id_to_type[MAX_MP_BUSSES];
49#endif 47#endif
@@ -52,14 +50,36 @@ extern DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
52 50
53extern unsigned int boot_cpu_physical_apicid; 51extern unsigned int boot_cpu_physical_apicid;
54extern unsigned int max_physical_apicid; 52extern unsigned int max_physical_apicid;
55extern int smp_found_config;
56extern int mpc_default_type; 53extern int mpc_default_type;
57extern unsigned long mp_lapic_addr; 54extern unsigned long mp_lapic_addr;
58 55
59extern void get_smp_config(void); 56#ifdef CONFIG_X86_LOCAL_APIC
57extern int smp_found_config;
58#else
59# define smp_found_config 0
60#endif
61
62static inline void get_smp_config(void)
63{
64 x86_init.mpparse.get_smp_config(0);
65}
66
67static inline void early_get_smp_config(void)
68{
69 x86_init.mpparse.get_smp_config(1);
70}
71
72static inline void find_smp_config(void)
73{
74 x86_init.mpparse.find_smp_config(1);
75}
76
77static inline void early_find_smp_config(void)
78{
79 x86_init.mpparse.find_smp_config(0);
80}
60 81
61#ifdef CONFIG_X86_MPPARSE 82#ifdef CONFIG_X86_MPPARSE
62extern void find_smp_config(void);
63extern void early_reserve_e820_mpc_new(void); 83extern void early_reserve_e820_mpc_new(void);
64extern int enable_update_mptable; 84extern int enable_update_mptable;
65extern int default_mpc_apic_id(struct mpc_cpu *m); 85extern int default_mpc_apic_id(struct mpc_cpu *m);
@@ -69,13 +89,16 @@ extern void default_mpc_oem_bus_info(struct mpc_bus *m, char *str);
69# else 89# else
70# define default_mpc_oem_bus_info NULL 90# define default_mpc_oem_bus_info NULL
71# endif 91# endif
92extern void default_find_smp_config(unsigned int reserve);
93extern void default_get_smp_config(unsigned int early);
72#else 94#else
73static inline void find_smp_config(void) { }
74static inline void early_reserve_e820_mpc_new(void) { } 95static inline void early_reserve_e820_mpc_new(void) { }
75#define enable_update_mptable 0 96#define enable_update_mptable 0
76#define default_mpc_apic_id NULL 97#define default_mpc_apic_id NULL
77#define default_smp_read_mpc_oem NULL 98#define default_smp_read_mpc_oem NULL
78#define default_mpc_oem_bus_info NULL 99#define default_mpc_oem_bus_info NULL
100#define default_find_smp_config x86_init_uint_noop
101#define default_get_smp_config x86_init_uint_noop
79#endif 102#endif
80 103
81void __cpuinit generic_processor_info(int apicid, int version); 104void __cpuinit generic_processor_info(int apicid, int version);
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 6121a8ac7b06..345a2551af90 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -19,8 +19,6 @@ struct x86_quirks {
19 int (*arch_pre_intr_init)(void); 19 int (*arch_pre_intr_init)(void);
20 int (*arch_intr_init)(void); 20 int (*arch_intr_init)(void);
21 int (*arch_trap_init)(void); 21 int (*arch_trap_init)(void);
22 int (*mach_get_smp_config)(unsigned int early);
23 int (*mach_find_smp_config)(unsigned int reserve);
24}; 22};
25 23
26extern void x86_quirk_intr_init(void); 24extern void x86_quirk_intr_init(void);
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 2833a873a903..e0d4729c9054 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -13,6 +13,8 @@ struct mpc_table;
13 * @smp_read_mpc_oem: platform specific oem mpc table setup 13 * @smp_read_mpc_oem: platform specific oem mpc table setup
14 * @mpc_oem_pci_bus: platform specific pci bus setup (default NULL) 14 * @mpc_oem_pci_bus: platform specific pci bus setup (default NULL)
15 * @mpc_oem_bus_info: platform specific mpc bus info 15 * @mpc_oem_bus_info: platform specific mpc bus info
16 * @find_smp_config: find the smp configuration
17 * @get_smp_config: get the smp configuration
16 */ 18 */
17struct x86_init_mpparse { 19struct x86_init_mpparse {
18 void (*mpc_record)(unsigned int mode); 20 void (*mpc_record)(unsigned int mode);
@@ -21,6 +23,8 @@ struct x86_init_mpparse {
21 void (*smp_read_mpc_oem)(struct mpc_table *mpc); 23 void (*smp_read_mpc_oem)(struct mpc_table *mpc);
22 void (*mpc_oem_pci_bus)(struct mpc_bus *m); 24 void (*mpc_oem_pci_bus)(struct mpc_bus *m);
23 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name); 25 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
26 void (*find_smp_config)(unsigned int reserve);
27 void (*get_smp_config)(unsigned int early);
24}; 28};
25 29
26/** 30/**
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index 700273dca684..3dd5fd765341 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -268,8 +268,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
268 .arch_pre_intr_init = NULL, 268 .arch_pre_intr_init = NULL,
269 .arch_intr_init = NULL, 269 .arch_intr_init = NULL,
270 .arch_trap_init = NULL, 270 .arch_trap_init = NULL,
271 .mach_get_smp_config = NULL,
272 .mach_find_smp_config = NULL,
273}; 271};
274 272
275static __init void early_check_numaq(void) 273static __init void early_check_numaq(void)
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index a42f23f1dc7e..75357647b6ec 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -610,7 +610,7 @@ static int __init check_physptr(struct mpf_intel *mpf, unsigned int early)
610/* 610/*
611 * Scan the memory blocks for an SMP configuration block. 611 * Scan the memory blocks for an SMP configuration block.
612 */ 612 */
613static void __init __get_smp_config(unsigned int early) 613void __init default_get_smp_config(unsigned int early)
614{ 614{
615 struct mpf_intel *mpf = mpf_found; 615 struct mpf_intel *mpf = mpf_found;
616 616
@@ -627,11 +627,6 @@ static void __init __get_smp_config(unsigned int early)
627 if (acpi_lapic && acpi_ioapic) 627 if (acpi_lapic && acpi_ioapic)
628 return; 628 return;
629 629
630 if (x86_quirks->mach_get_smp_config) {
631 if (x86_quirks->mach_get_smp_config(early))
632 return;
633 }
634
635 printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n", 630 printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",
636 mpf->specification); 631 mpf->specification);
637#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32) 632#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
@@ -672,16 +667,6 @@ static void __init __get_smp_config(unsigned int early)
672 */ 667 */
673} 668}
674 669
675void __init early_get_smp_config(void)
676{
677 __get_smp_config(1);
678}
679
680void __init get_smp_config(void)
681{
682 __get_smp_config(0);
683}
684
685static void __init smp_reserve_bootmem(struct mpf_intel *mpf) 670static void __init smp_reserve_bootmem(struct mpf_intel *mpf)
686{ 671{
687 unsigned long size = get_mpc_size(mpf->physptr); 672 unsigned long size = get_mpc_size(mpf->physptr);
@@ -747,14 +732,10 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
747 return 0; 732 return 0;
748} 733}
749 734
750static void __init __find_smp_config(unsigned int reserve) 735void __init default_find_smp_config(unsigned int reserve)
751{ 736{
752 unsigned int address; 737 unsigned int address;
753 738
754 if (x86_quirks->mach_find_smp_config) {
755 if (x86_quirks->mach_find_smp_config(reserve))
756 return;
757 }
758 /* 739 /*
759 * FIXME: Linux assumes you have 640K of base ram.. 740 * FIXME: Linux assumes you have 640K of base ram..
760 * this continues the error... 741 * this continues the error...
@@ -789,16 +770,6 @@ static void __init __find_smp_config(unsigned int reserve)
789 smp_scan_config(address, 0x400, reserve); 770 smp_scan_config(address, 0x400, reserve);
790} 771}
791 772
792void __init early_find_smp_config(void)
793{
794 __find_smp_config(0);
795}
796
797void __init find_smp_config(void)
798{
799 __find_smp_config(1);
800}
801
802#ifdef CONFIG_X86_IO_APIC 773#ifdef CONFIG_X86_IO_APIC
803static u8 __initdata irq_used[MAX_IRQ_SOURCES]; 774static u8 __initdata irq_used[MAX_IRQ_SOURCES];
804 775
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index c2a8090e8312..54043cb7ba68 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -981,13 +981,11 @@ void __init setup_arch(char **cmdline_p)
981 */ 981 */
982 acpi_boot_init(); 982 acpi_boot_init();
983 983
984#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
985 /* 984 /*
986 * get boot-time SMP configuration: 985 * get boot-time SMP configuration:
987 */ 986 */
988 if (smp_found_config) 987 if (smp_found_config)
989 get_smp_config(); 988 get_smp_config();
990#endif
991 989
992 prefill_possible_map(); 990 prefill_possible_map();
993 991
diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c
index 97c670df1aed..31e828118f8e 100644
--- a/arch/x86/kernel/visws_quirks.c
+++ b/arch/x86/kernel/visws_quirks.c
@@ -156,12 +156,8 @@ static void visws_machine_power_off(void)
156 outl(PIIX_SPECIAL_STOP, 0xCFC); 156 outl(PIIX_SPECIAL_STOP, 0xCFC);
157} 157}
158 158
159static int __init visws_get_smp_config(unsigned int early) 159static void __init visws_get_smp_config(unsigned int early)
160{ 160{
161 /*
162 * Prevent MP-table parsing by the generic code:
163 */
164 return 1;
165} 161}
166 162
167/* 163/*
@@ -208,7 +204,7 @@ static void __init MP_processor_info(struct mpc_cpu *m)
208 apic_version[m->apicid] = ver; 204 apic_version[m->apicid] = ver;
209} 205}
210 206
211static int __init visws_find_smp_config(unsigned int reserve) 207static void __init visws_find_smp_config(unsigned int reserve)
212{ 208{
213 struct mpc_cpu *mp = phys_to_virt(CO_CPU_TAB_PHYS); 209 struct mpc_cpu *mp = phys_to_virt(CO_CPU_TAB_PHYS);
214 unsigned short ncpus = readw(phys_to_virt(CO_CPU_NUM_PHYS)); 210 unsigned short ncpus = readw(phys_to_virt(CO_CPU_NUM_PHYS));
@@ -230,8 +226,6 @@ static int __init visws_find_smp_config(unsigned int reserve)
230 MP_processor_info(mp++); 226 MP_processor_info(mp++);
231 227
232 mp_lapic_addr = APIC_DEFAULT_PHYS_BASE; 228 mp_lapic_addr = APIC_DEFAULT_PHYS_BASE;
233
234 return 1;
235} 229}
236 230
237static int visws_trap_init(void); 231static int visws_trap_init(void);
@@ -241,8 +235,6 @@ static struct x86_quirks visws_x86_quirks __initdata = {
241 .arch_pre_intr_init = visws_pre_intr_init, 235 .arch_pre_intr_init = visws_pre_intr_init,
242 .arch_intr_init = NULL, 236 .arch_intr_init = NULL,
243 .arch_trap_init = visws_trap_init, 237 .arch_trap_init = visws_trap_init,
244 .mach_get_smp_config = visws_get_smp_config,
245 .mach_find_smp_config = visws_find_smp_config,
246}; 238};
247 239
248void __init visws_early_detect(void) 240void __init visws_early_detect(void)
@@ -263,6 +255,8 @@ void __init visws_early_detect(void)
263 x86_quirks = &visws_x86_quirks; 255 x86_quirks = &visws_x86_quirks;
264 256
265 x86_init.resources.memory_setup = visws_memory_setup; 257 x86_init.resources.memory_setup = visws_memory_setup;
258 x86_init.mpparse.get_smp_config = visws_get_smp_config;
259 x86_init.mpparse.find_smp_config = visws_find_smp_config;
266 260
267 /* 261 /*
268 * Install reboot quirks: 262 * Install reboot quirks:
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 27685edc5460..3488fb62ac03 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -32,5 +32,7 @@ struct __initdata x86_init_ops x86_init = {
32 .mpc_apic_id = default_mpc_apic_id, 32 .mpc_apic_id = default_mpc_apic_id,
33 .smp_read_mpc_oem = default_smp_read_mpc_oem, 33 .smp_read_mpc_oem = default_smp_read_mpc_oem,
34 .mpc_oem_bus_info = default_mpc_oem_bus_info, 34 .mpc_oem_bus_info = default_mpc_oem_bus_info,
35 .find_smp_config = default_find_smp_config,
36 .get_smp_config = default_get_smp_config,
35 }, 37 },
36}; 38};