x86/apic: Mop up *setup_apic_routing()

default_setup_apic_routing() is a complete misnomer. On 64bit it does the
actual APIC probing and on 32bit it is used to force select the bigsmp APIC
and to emit a redundant message in the apic::setup_apic_routing() callback.

Rename the 64bit and 32bit function so they reflect what they are doing and
remove the useless APIC callback.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 3932089cb9afa9c8dc1b6afad1b8aaa8de00a443..83ecea3baaafbb5a17ed51a2433066f7fc91e626 100644 (file)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -40,11 +40,9 @@
 
 
 #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
-extern void generic_apic_probe(void);
+extern void x86_32_probe_apic(void);
 #else
-static inline void generic_apic_probe(void)
-{
-}
+static inline void x86_32_probe_apic(void) { }
 #endif
 
 #ifdef CONFIG_X86_LOCAL_APIC
@@ -302,7 +300,6 @@ struct apic {
        bool    (*check_apicid_used)(physid_mask_t *map, int apicid);
        void    (*init_apic_ldr)(void);
        void    (*ioapic_phys_id_map)(physid_mask_t *phys_map, physid_mask_t *retmap);
-       void    (*setup_apic_routing)(void);
        int     (*cpu_present_to_apicid)(int mps_cpu);
        int     (*phys_pkg_id)(int cpuid_apic, int index_msb);
 
@@ -457,12 +454,13 @@ static inline unsigned int read_apic_id(void)
 typedef int (*wakeup_cpu_handler)(int apicid, unsigned long start_eip);
 extern void acpi_wake_cpu_handler_update(wakeup_cpu_handler handler);
 extern int default_acpi_madt_oem_check(char *, char *);
+extern void x86_64_probe_apic(void);
 #else
 static inline int default_acpi_madt_oem_check(char *a, char *b) { return 0; }
+static inline void x86_64_probe_apic(void) { }
 #endif
 
 extern int default_apic_id_valid(u32 apicid);
-extern void default_setup_apic_routing(void);
 
 extern u32 apic_default_calc_apicid(unsigned int cpu);
 extern u32 apic_flat_calc_apicid(unsigned int cpu);

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 622dd60229e5703a59b153b88ccf5208410af637..c2656a3ffbec868482786c598527f4c5202a9e7e 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1419,7 +1419,9 @@ void __init apic_intr_mode_init(void)
                break;
        }
 
-       default_setup_apic_routing();
+       x86_64_probe_apic();
+
+       x86_32_install_bigsmp();
 
        if (x86_platform.apic_post_init)
                x86_platform.apic_post_init();

diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 803cf0123f823abfe4bc4323f9634c93bb8f1789..83e02b5796e6894352e9fd897aa5b9faadbc2384 100644 (file)
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -101,7 +101,6 @@ static struct apic apic_flat __ro_after_init = {
        .check_apicid_used              = NULL,
        .init_apic_ldr                  = default_init_apic_ldr,
        .ioapic_phys_id_map             = NULL,
-       .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = flat_phys_pkg_id,
 
@@ -178,7 +177,6 @@ static struct apic apic_physflat __ro_after_init = {
 
        .check_apicid_used              = NULL,
        .ioapic_phys_id_map             = NULL,
-       .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = flat_phys_pkg_id,
 

diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index 8cab632ed273a25f90e076c8c5ac42ff832539ef..e7309fd9cb55586bef6024f7b28f519a13f1e729 100644 (file)
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -94,7 +94,6 @@ struct apic apic_noop __ro_after_init = {
 
        .check_apicid_used              = default_check_apicid_used,
        .ioapic_phys_id_map             = default_ioapic_phys_id_map,
-       .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
 
        .phys_pkg_id                    = noop_phys_pkg_id,

diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index 8f57155d5f30611a0ca27f84aa6e75895809d260..b0d5a6ebc379bebfe31743794d4f4c919c7b7d59 100644 (file)
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -253,7 +253,6 @@ static const struct apic apic_numachip1 __refconst = {
 
        .check_apicid_used              = NULL,
        .ioapic_phys_id_map             = NULL,
-       .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = numachip_phys_pkg_id,
 
@@ -296,7 +295,6 @@ static const struct apic apic_numachip2 __refconst = {
 
        .check_apicid_used              = NULL,
        .ioapic_phys_id_map             = NULL,
-       .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = numachip_phys_pkg_id,
 

diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index 099611e4ea06cf2466df674c412786b1f9ab0a65..9bbdd40107f74c47ecc3f77d503c24fabb08e380 100644 (file)
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -28,13 +28,6 @@ static bool bigsmp_check_apicid_used(physid_mask_t *map, int apicid)
        return false;
 }
 
-static void bigsmp_setup_apic_routing(void)
-{
-       printk(KERN_INFO
-               "Enabling APIC mode:  Physflat.  Using %d I/O APICs\n",
-               nr_ioapics);
-}
-
 static void bigsmp_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap)
 {
        /* For clustered we don't have a good way to do this yet - hack */
@@ -101,7 +94,6 @@ static struct apic apic_bigsmp __ro_after_init = {
 
        .check_apicid_used              = bigsmp_check_apicid_used,
        .ioapic_phys_id_map             = bigsmp_ioapic_phys_id_map,
-       .setup_apic_routing             = bigsmp_setup_apic_routing,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = bigsmp_phys_pkg_id,
 

diff --git a/arch/x86/kernel/apic/local.h b/arch/x86/kernel/apic/local.h
index c14674146cfefc22538010d91fd8bd3ace4d9abb..345acdeab4480c15841dd4e0a97dfcb1a95f8762 100644 (file)
--- a/arch/x86/kernel/apic/local.h
+++ b/arch/x86/kernel/apic/local.h
@@ -66,8 +66,10 @@ void default_send_IPI_mask_sequence_logical(const struct cpumask *mask, int vect
 void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask, int vector);
 void default_send_IPI_mask_logical(const struct cpumask *mask, int vector);
 void x86_32_probe_bigsmp_early(void);
+void x86_32_install_bigsmp(void);
 #else
 static inline void x86_32_probe_bigsmp_early(void) { }
+static inline void x86_32_install_bigsmp(void) { }
 #endif
 
 #ifdef CONFIG_X86_BIGSMP

diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index c6c3a4b2fcfa3b6a6d7ce6029e2aac2f21a7997f..3f717f4c72bc106700a9475c1acfa75ef66d398f 100644 (file)
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -18,15 +18,6 @@
 
 #include "local.h"
 
-static void setup_apic_flat_routing(void)
-{
-#ifdef CONFIG_X86_IO_APIC
-       printk(KERN_INFO
-               "Enabling APIC mode:  Flat.  Using %d I/O APICs\n",
-               nr_ioapics);
-#endif
-}
-
 static int default_apic_id_registered(void)
 {
        return physid_isset(read_apic_id(), phys_cpu_present_map);
@@ -58,7 +49,6 @@ static struct apic apic_default __ro_after_init = {
        .check_apicid_used              = default_check_apicid_used,
        .init_apic_ldr                  = default_init_apic_ldr,
        .ioapic_phys_id_map             = default_ioapic_phys_id_map,
-       .setup_apic_routing             = setup_apic_flat_routing,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = default_phys_pkg_id,
 
@@ -132,16 +122,13 @@ void __init x86_32_probe_bigsmp_early(void)
        set_nr_cpu_ids(8);
 }
 
-void __init default_setup_apic_routing(void)
+void __init x86_32_install_bigsmp(void)
 {
        if (nr_cpu_ids > 8 && !xen_pv_domain())
                apic_bigsmp_force();
-
-       if (apic->setup_apic_routing)
-               apic->setup_apic_routing();
 }
 
-void __init generic_apic_probe(void)
+void __init x86_32_probe_apic(void)
 {
        if (!cmdline_apic) {
                struct apic **drv;

diff --git a/arch/x86/kernel/apic/probe_64.c b/arch/x86/kernel/apic/probe_64.c
index 3c0c8d32be10f301c2e73119138f2f8f0e9f50a1..7c9f1a8a83c87b93bb25a6a89a57c5582ae8668a 100644 (file)
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
@@ -14,7 +14,7 @@
 #include "local.h"
 
 /* Select the appropriate APIC driver */
-void __init default_setup_apic_routing(void)
+void __init x86_64_probe_apic(void)
 {
        struct apic **drv;
 

diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index a8e7a8f8f22adc3eef16083d4ba39d1aa0582984..52d4be15a7dcdcebbc8d32fd04a5338bc2bd02fd 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -247,7 +247,6 @@ static struct apic apic_x2apic_cluster __ro_after_init = {
        .check_apicid_used              = NULL,
        .init_apic_ldr                  = init_x2apic_ldr,
        .ioapic_phys_id_map             = NULL,
-       .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = x2apic_phys_pkg_id,
 

diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index 5ac212940901a313a5aa691793d40fd6dbcc8ea4..c57b5c82b14abfe828d671bf4afeab0e561975c2 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -166,7 +166,6 @@ static struct apic apic_x2apic_phys __ro_after_init = {
 
        .check_apicid_used              = NULL,
        .ioapic_phys_id_map             = NULL,
-       .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = x2apic_phys_pkg_id,
 

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index d6b98bc0745ac970b3b3028ff7c3001ba67a27be..a8caff181adf824034b7a8509b2565910bd44f1d 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -838,7 +838,6 @@ static struct apic apic_x2apic_uv_x __ro_after_init = {
 
        .check_apicid_used              = NULL,
        .ioapic_phys_id_map             = NULL,
-       .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .phys_pkg_id                    = uv_phys_pkg_id,
 

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 779477d92caab4b99f1beb1587050d8a8b0f2728..f83d02b4fb258518e26d168d66b5542286b7b761 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1252,7 +1252,7 @@ void __init setup_arch(char **cmdline_p)
 
        map_vsyscall();
 
-       generic_apic_probe();
+       x86_32_probe_apic();
 
        early_quirks();
 

diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
index 426f4a0ac664cb1c2862586eb0528845e1755d1c..4a27f92b51d153210d0929bba6a0ee0b10d1c0c2 100644 (file)
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -150,7 +150,6 @@ static struct apic xen_pv_apic = {
 
        .check_apicid_used              = default_check_apicid_used, /* Used on 32-bit */
        .ioapic_phys_id_map             = default_ioapic_phys_id_map, /* Used on 32-bit */
-       .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = xen_cpu_present_to_apicid,
        .phys_pkg_id                    = xen_phys_pkg_id, /* detect_ht */