mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
x86, apic: Clean up bigsmp apic selection code
Make generic_bigsmp_probe() return struct apic *. This will avoid exporting apic_bigsmp, which will be consistent with others. Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Tested-by: Cyrill Gorcunov <gorcunov@openvz.org> Cc: steiner@sgi.com Cc: gorcunov@openvz.org Cc: yinghai@kernel.org Link: http://lkml.kernel.org/r/20110521005526.252703851@sbsiddha-MOBL3.sc.intel.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
8b37e88061
commit
69c252ffce
3 changed files with 32 additions and 30 deletions
|
@ -500,7 +500,7 @@ static inline void default_wait_for_init_deassert(atomic_t *deassert)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern void generic_bigsmp_probe(void);
|
extern struct apic *generic_bigsmp_probe(void);
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_LOCAL_APIC
|
#ifdef CONFIG_X86_LOCAL_APIC
|
||||||
|
|
|
@ -255,4 +255,12 @@ struct apic apic_bigsmp = {
|
||||||
.x86_32_early_logical_apicid = bigsmp_early_logical_apicid,
|
.x86_32_early_logical_apicid = bigsmp_early_logical_apicid,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct apic * __init generic_bigsmp_probe(void)
|
||||||
|
{
|
||||||
|
if (probe_bigsmp())
|
||||||
|
return &apic_bigsmp;
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
apic_driver(apic_bigsmp);
|
apic_driver(apic_bigsmp);
|
||||||
|
|
|
@ -52,31 +52,6 @@ static int __init print_ipi_mode(void)
|
||||||
}
|
}
|
||||||
late_initcall(print_ipi_mode);
|
late_initcall(print_ipi_mode);
|
||||||
|
|
||||||
void __init default_setup_apic_routing(void)
|
|
||||||
{
|
|
||||||
int version = apic_version[boot_cpu_physical_apicid];
|
|
||||||
|
|
||||||
if (num_possible_cpus() > 8) {
|
|
||||||
switch (boot_cpu_data.x86_vendor) {
|
|
||||||
case X86_VENDOR_INTEL:
|
|
||||||
if (!APIC_XAPIC(version)) {
|
|
||||||
def_to_bigsmp = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
/* If P4 and above fall through */
|
|
||||||
case X86_VENDOR_AMD:
|
|
||||||
def_to_bigsmp = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_BIGSMP
|
|
||||||
generic_bigsmp_probe();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (apic->setup_apic_routing)
|
|
||||||
apic->setup_apic_routing();
|
|
||||||
}
|
|
||||||
|
|
||||||
static int default_x86_32_early_logical_apicid(int cpu)
|
static int default_x86_32_early_logical_apicid(int cpu)
|
||||||
{
|
{
|
||||||
return 1 << cpu;
|
return 1 << cpu;
|
||||||
|
@ -224,24 +199,43 @@ static int __init parse_apic(char *arg)
|
||||||
}
|
}
|
||||||
early_param("apic", parse_apic);
|
early_param("apic", parse_apic);
|
||||||
|
|
||||||
void __init generic_bigsmp_probe(void)
|
void __init default_setup_apic_routing(void)
|
||||||
{
|
{
|
||||||
|
int version = apic_version[boot_cpu_physical_apicid];
|
||||||
|
|
||||||
|
if (num_possible_cpus() > 8) {
|
||||||
|
switch (boot_cpu_data.x86_vendor) {
|
||||||
|
case X86_VENDOR_INTEL:
|
||||||
|
if (!APIC_XAPIC(version)) {
|
||||||
|
def_to_bigsmp = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
/* If P4 and above fall through */
|
||||||
|
case X86_VENDOR_AMD:
|
||||||
|
def_to_bigsmp = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_X86_BIGSMP
|
#ifdef CONFIG_X86_BIGSMP
|
||||||
/*
|
/*
|
||||||
* This routine is used to switch to bigsmp mode when
|
* This is used to switch to bigsmp mode when
|
||||||
* - There is no apic= option specified by the user
|
* - There is no apic= option specified by the user
|
||||||
* - generic_apic_probe() has chosen apic_default as the sub_arch
|
* - generic_apic_probe() has chosen apic_default as the sub_arch
|
||||||
* - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support
|
* - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (!cmdline_apic && apic == &apic_default) {
|
if (!cmdline_apic && apic == &apic_default) {
|
||||||
if (apic_bigsmp.probe()) {
|
struct apic *bigsmp = generic_bigsmp_probe();
|
||||||
apic = &apic_bigsmp;
|
if (bigsmp) {
|
||||||
|
apic = bigsmp;
|
||||||
printk(KERN_INFO "Overriding APIC driver with %s\n",
|
printk(KERN_INFO "Overriding APIC driver with %s\n",
|
||||||
apic->name);
|
apic->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (apic->setup_apic_routing)
|
||||||
|
apic->setup_apic_routing();
|
||||||
}
|
}
|
||||||
|
|
||||||
void __init generic_apic_probe(void)
|
void __init generic_apic_probe(void)
|
||||||
|
|
Loading…
Reference in a new issue