The following commit has been merged into the x86/apic branch of tip: Commit-ID: fc60fd009c830a21c7699c6e36ab9ec51b9dd939 Gitweb: https://git.kernel.org/tip/fc60fd009c830a21c7699c6e36ab9ec51b9dd939 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Tue, 13 Feb 2024 22:05:03 +01:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Thu, 15 Feb 2024 22:07:40 +01:00 x86/mpparse: Provide separate early/late callbacks The early argument of x86_init::mpparse::get_smp_config() is more than confusing. Provide two callbacks, one for each purpose. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Tested-by: Michael Kelley <mhklinux@xxxxxxxxxxx> Tested-by: Sohil Mehta <sohil.mehta@xxxxxxxxx> Link: https://lore.kernel.org/r/20240212154639.370491894@xxxxxxxxxxxxx --- arch/x86/include/asm/x86_init.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index 4ae7764..375825f 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h @@ -17,11 +17,15 @@ struct irq_domain; * @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); }; /**