mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

x86/mpparse: Switch to new init callbacks 

Now that all platforms have the new split SMP configuration callbacks set
up, flip the switch and remove the old callback pointer and mop up the
platform code.

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.870883080@linutronix.de
This commit is contained in:
Thomas Gleixner 2024-02-13 22:05:14 +01:00
parent c22e19cd2c
commit dcb7600849
10 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/hyperv/hv_vtl.c
View File

@ -29,7 +29,6 @@ void __init hv_vtl_init_platform(void)
x86_init.mpparse.find_mptable = x86_init_noop;
x86_init.mpparse.early_parse_smp_cfg = x86_init_noop;
x86_init.mpparse.parse_smp_cfg = x86_init_noop;
x86_init.mpparse.get_smp_config = x86_init_uint_noop;
x86_platform.get_wallclock = get_rtc_noop;
x86_platform.set_wallclock = set_rtc_noop;

9
arch/x86/include/asm/mpspec.h
View File

@ -46,14 +46,9 @@ extern int smp_found_config;
# define smp_found_config 0
#endif
static inline void get_smp_config(void)
{
x86_init.mpparse.get_smp_config(0);
}
static inline void early_get_smp_config(void)
{
x86_init.mpparse.get_smp_config(1);
x86_init.mpparse.early_parse_smp_cfg();
}
#ifdef CONFIG_X86_MPPARSE
@ -62,14 +57,12 @@ extern int enable_update_mptable;
extern void mpparse_find_mptable(void);
extern void mpparse_parse_early_smp_config(void);
extern void mpparse_parse_smp_config(void);
extern void mpparse_get_smp_config(unsigned int early);
#else
static inline void e820__memblock_alloc_reserved_mpc_new(void) { }
#define enable_update_mptable 0
#define mpparse_find_mptable x86_init_noop
#define mpparse_parse_early_smp_config x86_init_noop
#define mpparse_parse_smp_config x86_init_noop
#define mpparse_get_smp_config x86_init_uint_noop
#endif
int generic_processor_info(int apicid);

2
arch/x86/include/asm/x86_init.h
View File

@ -16,14 +16,12 @@ struct irq_domain;
* struct x86_init_mpparse - platform specific mpparse ops
* @setup_ioapic_ids: platform specific ioapic id override
* @find_mptable: Find MPTABLE early to reserve the memory region
* @get_smp_config: get the smp configuration
* @early_parse_smp_cfg: Parse the SMP configuration data early before initmem_init()
* @parse_smp_cfg: Parse the SMP configuration data
*/
struct x86_init_mpparse {
void (*setup_ioapic_ids)(void);
void (*find_mptable)(void);
void (*get_smp_config)(unsigned int early);
void (*early_parse_smp_cfg)(void);
void (*parse_smp_cfg)(void);
};

8
arch/x86/kernel/jailhouse.c
View File

@ -89,7 +89,7 @@ static void __init jailhouse_x2apic_init(void)
#endif
}
static void __init jailhouse_get_smp_config(unsigned int early)
static void __init jailhouse_parse_smp_config(void)
{
struct ioapic_domain_cfg ioapic_cfg = {
.type = IOAPIC_DOMAIN_STRICT,
@ -118,11 +118,6 @@ static void __init jailhouse_get_smp_config(unsigned int early)
}
}
static void __init jailhouse_parse_smp_config(void)
{
jailhouse_get_smp_config(false);
}
static void jailhouse_no_restart(void)
{
pr_notice("Jailhouse: Restart not supported, halting\n");
@ -211,7 +206,6 @@ static void __init jailhouse_init_platform(void)
x86_init.mpparse.find_mptable = x86_init_noop;
x86_init.mpparse.early_parse_smp_cfg = x86_init_noop;
x86_init.mpparse.parse_smp_cfg = jailhouse_parse_smp_config;
x86_init.mpparse.get_smp_config = jailhouse_get_smp_config;
x86_init.pci.arch_init = jailhouse_pci_arch_init;
x86_platform.calibrate_cpu = jailhouse_get_tsc;

2
arch/x86/kernel/mpparse.c
View File

@ -473,7 +473,7 @@ static int __init check_physptr(struct mpf_intel *mpf, unsigned int early)
/*
* Scan the memory blocks for an SMP configuration block.
*/
void __init mpparse_get_smp_config(unsigned int early)
static __init void mpparse_get_smp_config(unsigned int early)
{
struct mpf_intel *mpf;

10
arch/x86/kernel/setup.c
View File

@ -1130,15 +1130,11 @@ void __init setup_arch(char **cmdline_p)
early_quirks();
/*
* Read APIC and some other early information from ACPI tables.
* Parse SMP configuration. Try ACPI first and then the platform
* specific parser.
*/
acpi_boot_init();
x86_dtb_parse_smp_config();
/*
* get boot-time SMP configuration:
*/
get_smp_config();
x86_init.mpparse.parse_smp_cfg();
/*
* Systems w/o ACPI and mptables might not have it mapped the local

3
arch/x86/kernel/x86_init.c
View File

@ -71,7 +71,8 @@ struct x86_init_ops x86_init __initdata = {
.mpparse = {
.setup_ioapic_ids = x86_init_noop,
.find_mptable = mpparse_find_mptable,
.get_smp_config = mpparse_get_smp_config,
.early_parse_smp_cfg = mpparse_parse_early_smp_config,
.parse_smp_cfg = mpparse_parse_smp_config,
},
.irqs = {

1
arch/x86/platform/ce4100/ce4100.c
View File

@ -140,7 +140,6 @@ void __init x86_ce4100_early_setup(void)
x86_init.mpparse.find_mptable = x86_init_noop;
x86_init.mpparse.early_parse_smp_cfg = x86_init_noop;
x86_init.mpparse.parse_smp_cfg = x86_dtb_parse_smp_config;
x86_init.mpparse.get_smp_config = x86_init_uint_noop;
x86_init.pci.init = ce4100_pci_init;
x86_init.pci.init_irq = sdv_pci_init;

1
arch/x86/platform/intel-mid/intel-mid.c
View File

@ -121,6 +121,5 @@ void __init x86_intel_mid_early_setup(void)
x86_init.mpparse.find_mptable = x86_init_noop;
x86_init.mpparse.early_parse_smp_cfg = x86_init_noop;
x86_init.mpparse.parse_smp_cfg = x86_init_noop;
x86_init.mpparse.get_smp_config = x86_init_uint_noop;
set_bit(MP_BUS_ISA, mp_bus_not_pci);
}

11
arch/x86/xen/smp_pv.c
View File

@ -148,14 +148,11 @@ int xen_smp_intr_init_pv(unsigned int cpu)
return rc;
}
static void __init _get_smp_config(unsigned int early)
static void __init xen_pv_smp_config(void)
{
int i, rc;
unsigned int subtract = 0;
if (early)
return;
num_processors = 0;
disabled_cpus = 0;
for (i = 0; i < nr_cpu_ids; i++) {
@ -185,11 +182,6 @@ static void __init _get_smp_config(unsigned int early)
smp_found_config = 1;
}
static void __init xen_pv_smp_config(void)
{
_get_smp_config(false);
}
static void __init xen_pv_smp_prepare_boot_cpu(void)
{
BUG_ON(smp_processor_id() != 0);
@ -463,5 +455,4 @@ void __init xen_smp_init(void)
x86_init.mpparse.find_mptable = x86_init_noop;
x86_init.mpparse.early_parse_smp_cfg = x86_init_noop;
x86_init.mpparse.parse_smp_cfg = xen_pv_smp_config;
x86_init.mpparse.get_smp_config = _get_smp_config;
}