Commit e061c7ae authored by Thomas Gleixner's avatar Thomas Gleixner

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: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarMichael Kelley <mhklinux@outlook.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Link: https://lore.kernel.org/r/20240212154639.306287711@linutronix.de

parent 3e48d804
...@@ -56,21 +56,16 @@ static inline void early_get_smp_config(void) ...@@ -56,21 +56,16 @@ static inline void early_get_smp_config(void)
x86_init.mpparse.get_smp_config(1); x86_init.mpparse.get_smp_config(1);
} }
static inline void find_smp_config(void)
{
x86_init.mpparse.find_smp_config();
}
#ifdef CONFIG_X86_MPPARSE #ifdef CONFIG_X86_MPPARSE
extern void e820__memblock_alloc_reserved_mpc_new(void); extern void e820__memblock_alloc_reserved_mpc_new(void);
extern int enable_update_mptable; 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); extern void default_get_smp_config(unsigned int early);
#else #else
static inline void e820__memblock_alloc_reserved_mpc_new(void) { } static inline void e820__memblock_alloc_reserved_mpc_new(void) { }
#define enable_update_mptable 0 #define enable_update_mptable 0
#define default_find_smp_config x86_init_noop #define mpparse_find_mptable x86_init_noop
#define default_get_smp_config x86_init_uint_noop #define default_get_smp_config x86_init_uint_noop
#endif #endif
int generic_processor_info(int apicid); int generic_processor_info(int apicid);
......
...@@ -15,12 +15,12 @@ struct irq_domain; ...@@ -15,12 +15,12 @@ struct irq_domain;
/** /**
* struct x86_init_mpparse - platform specific mpparse ops * struct x86_init_mpparse - platform specific mpparse ops
* @setup_ioapic_ids: platform specific ioapic id override * @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 * @get_smp_config: get the smp configuration
*/ */
struct x86_init_mpparse { struct x86_init_mpparse {
void (*setup_ioapic_ids)(void); void (*setup_ioapic_ids)(void);
void (*find_smp_config)(void); void (*find_mptable)(void);
void (*get_smp_config)(unsigned int early); void (*get_smp_config)(unsigned int early);
}; };
......
...@@ -587,7 +587,7 @@ static int __init smp_scan_config(unsigned long base, unsigned long length) ...@@ -587,7 +587,7 @@ static int __init smp_scan_config(unsigned long base, unsigned long length)
return ret; return ret;
} }
void __init default_find_smp_config(void) void __init mpparse_find_mptable(void)
{ {
unsigned int address; unsigned int address;
......
...@@ -970,10 +970,8 @@ void __init setup_arch(char **cmdline_p) ...@@ -970,10 +970,8 @@ void __init setup_arch(char **cmdline_p)
high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1; high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1;
#endif #endif
/* /* Find and reserve MPTABLE area */
* Find and reserve possible boot-time SMP configuration: x86_init.mpparse.find_mptable();
*/
find_smp_config();
early_alloc_pgt_buf(); early_alloc_pgt_buf();
......
...@@ -70,7 +70,7 @@ struct x86_init_ops x86_init __initdata = { ...@@ -70,7 +70,7 @@ struct x86_init_ops x86_init __initdata = {
.mpparse = { .mpparse = {
.setup_ioapic_ids = x86_init_noop, .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, .get_smp_config = default_get_smp_config,
}, },
......
...@@ -138,7 +138,7 @@ void __init x86_ce4100_early_setup(void) ...@@ -138,7 +138,7 @@ void __init x86_ce4100_early_setup(void)
x86_init.oem.arch_setup = sdv_arch_setup; x86_init.oem.arch_setup = sdv_arch_setup;
x86_init.resources.probe_roms = x86_init_noop; x86_init.resources.probe_roms = x86_init_noop;
x86_init.mpparse.get_smp_config = x86_init_uint_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 = ce4100_pci_init;
x86_init.pci.init_irq = sdv_pci_init; x86_init.pci.init_irq = sdv_pci_init;
......
...@@ -118,7 +118,7 @@ void __init x86_intel_mid_early_setup(void) ...@@ -118,7 +118,7 @@ void __init x86_intel_mid_early_setup(void)
machine_ops.emergency_restart = intel_mid_reboot; machine_ops.emergency_restart = intel_mid_reboot;
/* Avoid searching for BIOS MP tables */ /* 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; x86_init.mpparse.get_smp_config = x86_init_uint_noop;
set_bit(MP_BUS_ISA, mp_bus_not_pci); set_bit(MP_BUS_ISA, mp_bus_not_pci);
} }
...@@ -455,6 +455,6 @@ void __init xen_smp_init(void) ...@@ -455,6 +455,6 @@ void __init xen_smp_init(void)
smp_ops = xen_smp_ops; smp_ops = xen_smp_ops;
/* Avoid searching for BIOS MP tables */ /* 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; x86_init.mpparse.get_smp_config = _get_smp_config;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment