x86/mpparse: Rename default_find_smp_config()

MPTABLE is no longer the default SMP configuration mechanism.  Rename it to
mpparse_find_mptable() because that's what it does.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michael Kelley <mhklinux@outlook.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Link: https://lore.kernel.org/r/20240212154639.306287711@linutronix.de

diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index 666dcdbe66b036c633ed883fbc35d7249950f1d5..c154dd7261e7ed8417075603b5ec0ae13f81ec45 100644 (file)
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -56,21 +56,16 @@ static inline void early_get_smp_config(void)
        x86_init.mpparse.get_smp_config(1);
 }
 
-static inline void find_smp_config(void)
-{
-       x86_init.mpparse.find_smp_config();
-}
-
 #ifdef CONFIG_X86_MPPARSE
 extern void e820__memblock_alloc_reserved_mpc_new(void);
 extern int enable_update_mptable;
-extern void default_find_smp_config(void);
+extern void mpparse_find_mptable(void);
 extern void default_get_smp_config(unsigned int early);
 #else
 static inline void e820__memblock_alloc_reserved_mpc_new(void) { }
-#define enable_update_mptable 0
-#define default_find_smp_config x86_init_noop
-#define default_get_smp_config x86_init_uint_noop
+#define enable_update_mptable  0
+#define mpparse_find_mptable   x86_init_noop
+#define default_get_smp_config x86_init_uint_noop
 #endif
 
 int generic_processor_info(int apicid);

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index c878616a18b85750c92f764f1895cafb0698dd85..4ae77642011f112e3b49dbb2b2e699d3181768ed 100644 (file)
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -15,12 +15,12 @@ struct irq_domain;
 /**
  * struct x86_init_mpparse - platform specific mpparse ops
  * @setup_ioapic_ids:          platform specific ioapic id override
- * @find_smp_config:           find the smp configuration
+ * @find_mptable:              Find MPTABLE early to reserve the memory region
  * @get_smp_config:            get the smp configuration
  */
 struct x86_init_mpparse {
        void (*setup_ioapic_ids)(void);
-       void (*find_smp_config)(void);
+       void (*find_mptable)(void);
        void (*get_smp_config)(unsigned int early);
 };
 

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index b223922248e9f0af271a0fa69b19afb495b9840f..86acccdbd6315b538cc0ca90b296bdff2d1bbf35 100644 (file)
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -587,7 +587,7 @@ static int __init smp_scan_config(unsigned long base, unsigned long length)
        return ret;
 }
 
-void __init default_find_smp_config(void)
+void __init mpparse_find_mptable(void)
 {
        unsigned int address;
 

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 84201071dfacd186da34cdca12cbda41a39eedf1..0e431c98c96d6dbb5de0ec44990aa72f9909d4bf 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -970,10 +970,8 @@ void __init setup_arch(char **cmdline_p)
        high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1;
 #endif
 
-       /*
-        * Find and reserve possible boot-time SMP configuration:
-        */
-       find_smp_config();
+       /* Find and reserve MPTABLE area */
+       x86_init.mpparse.find_mptable();
 
        early_alloc_pgt_buf();
 

diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index a37ebd3b47736dfe55f5e7518df50e4135cdcfab..0bbef495a43ff1b3e717077e084b115ea5ff0750 100644 (file)
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -70,7 +70,7 @@ struct x86_init_ops x86_init __initdata = {
 
        .mpparse = {
                .setup_ioapic_ids       = x86_init_noop,
-               .find_smp_config        = default_find_smp_config,
+               .find_mptable           = mpparse_find_mptable,
                .get_smp_config         = default_get_smp_config,
        },
 

diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c
index bbe7e91245494938fa2c3c692556f131b0ad4f44..de7f1e9ea01d7a000c5ee014ab52b241ae59fe10 100644 (file)
--- a/arch/x86/platform/ce4100/ce4100.c
+++ b/arch/x86/platform/ce4100/ce4100.c
@@ -138,7 +138,7 @@ void __init x86_ce4100_early_setup(void)
        x86_init.oem.arch_setup = sdv_arch_setup;
        x86_init.resources.probe_roms = x86_init_noop;
        x86_init.mpparse.get_smp_config = x86_init_uint_noop;
-       x86_init.mpparse.find_smp_config = x86_init_noop;
+       x86_init.mpparse.find_mptable = x86_init_noop;
        x86_init.pci.init = ce4100_pci_init;
        x86_init.pci.init_irq = sdv_pci_init;
 

diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
index f4592dc7a1c193b4cbfad2a83ca237a6061b2f67..595dd4cfc6be636e5b2ec21c1c94b49b31068ba9 100644 (file)
--- a/arch/x86/platform/intel-mid/intel-mid.c
+++ b/arch/x86/platform/intel-mid/intel-mid.c
@@ -118,7 +118,7 @@ void __init x86_intel_mid_early_setup(void)
        machine_ops.emergency_restart  = intel_mid_reboot;
 
        /* Avoid searching for BIOS MP tables */
-       x86_init.mpparse.find_smp_config = x86_init_noop;
+       x86_init.mpparse.find_mptable = x86_init_noop;
        x86_init.mpparse.get_smp_config = x86_init_uint_noop;
        set_bit(MP_BUS_ISA, mp_bus_not_pci);
 }

diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c
index 3ae29c25ff85584dd3bfdab68eb85d701a44f56b..44c35b12430ff506f4e58fd7eb9436f8366cadfe 100644 (file)
--- a/arch/x86/xen/smp_pv.c
+++ b/arch/x86/xen/smp_pv.c
@@ -455,6 +455,6 @@ void __init xen_smp_init(void)
        smp_ops = xen_smp_ops;
 
        /* Avoid searching for BIOS MP tables */
-       x86_init.mpparse.find_smp_config = x86_init_noop;
+       x86_init.mpparse.find_mptable = x86_init_noop;
        x86_init.mpparse.get_smp_config = _get_smp_config;
 }