From nobody Fri Dec 19 15:46:25 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93D85C001DB for ; Mon, 7 Aug 2023 13:53:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234592AbjHGNxe (ORCPT ); Mon, 7 Aug 2023 09:53:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234479AbjHGNwz (ORCPT ); Mon, 7 Aug 2023 09:52:55 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35554199C for ; Mon, 7 Aug 2023 06:52:50 -0700 (PDT) Message-ID: <20230807135026.906384570@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691416368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=/DR2OONcUrrpFOC5EnxrVQq2tzbpo7dJzpul3Y8MqQY=; b=Ggxxph+xB6huRwFVex14SKwImIP+1HUAKvsn/9s/9Rf2zM95rOa8S+fiNCvSVi8jcMMBUe 1aauBPqsooZBq2jNLD3i9kp+okDoQEfCeER8gCzwUTYrMpsX/x4FGcFhGWPMxsaeofBORf 7GGMBFCg2HhHGsNn0cCSfKH80T0FyzVt4NbUhNkFzq76BczCZIoNevj1QLuJI4+tEXHKEi TVc1BorBB+bmVjiLhf3f9euIX5i8QT4sPY5M1nAcrQZuyMvvN7XL8fPCLx2dCfIC2spOJh 1aR52Kffnvd1QG4SR5aKvwI07chg28WbS91eDVHTy5s+PgtTngVWbzoLxHoSKA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691416368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=/DR2OONcUrrpFOC5EnxrVQq2tzbpo7dJzpul3Y8MqQY=; b=Mounl2QHL3IJulfH/WvCyDPKfqXww4d3rDp0mRc8KCcYVKFNkd/dDT/DynM50UIgX0yJzQ saDKJcW/5b2De6Cw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , Huang Rui , Juergen Gross , Dimitri Sivanich , Michael Kelley , Sohil Mehta , K Prateek Nayak , Kan Liang , Zhang Rui , "Paul E. McKenney" , Feng Tang , Andy Shevchenko Subject: [patch 09/53] x86/mpparse: Rename default_find_smp_config() References: <20230807130108.853357011@linutronix.de> MIME-Version: 1.0 Date: Mon, 7 Aug 2023 15:52:47 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" MPTABLE is not longer the default SMP configuration mechanism. Rename it to mpparse_find_mptable() because that's what it does. Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/mpspec.h | 13 ++++--------- arch/x86/include/asm/x86_init.h | 4 ++-- arch/x86/kernel/mpparse.c | 2 +- arch/x86/kernel/setup.c | 6 ++---- arch/x86/kernel/x86_init.c | 2 +- arch/x86/platform/ce4100/ce4100.c | 2 +- arch/x86/platform/intel-mid/intel-mid.c | 2 +- arch/x86/xen/smp_pv.c | 2 +- 8 files changed, 13 insertions(+), 20 deletions(-) --- 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( x86_init.mpparse.get_smp_config(1); } =20 -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 =20 int generic_processor_info(int apicid); --- 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); }; =20 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c @@ -590,7 +590,7 @@ static int __init smp_scan_config(unsign return ret; } =20 -void __init default_find_smp_config(void) +void __init mpparse_find_mptable(void) { unsigned int address; =20 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1101,10 +1101,8 @@ void __init setup_arch(char **cmdline_p) high_memory =3D (void *)__va(max_pfn * PAGE_SIZE - 1) + 1; #endif =20 - /* - * Find and reserve possible boot-time SMP configuration: - */ - find_smp_config(); + /* Find and reserve MPTABLE area */ + x86_init.mpparse.find_mptable(); =20 early_alloc_pgt_buf(); =20 --- 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 =20 .mpparse =3D { .setup_ioapic_ids =3D x86_init_noop, - .find_smp_config =3D default_find_smp_config, + .find_mptable =3D mpparse_find_mptable, .get_smp_config =3D default_get_smp_config, }, =20 --- 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 =3D sdv_arch_setup; x86_init.resources.probe_roms =3D x86_init_noop; x86_init.mpparse.get_smp_config =3D x86_init_uint_noop; - x86_init.mpparse.find_smp_config =3D x86_init_noop; + x86_init.mpparse.find_mptable =3D x86_init_noop; x86_init.pci.init =3D ce4100_pci_init; x86_init.pci.init_irq =3D sdv_pci_init; =20 --- 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(vo machine_ops.emergency_restart =3D intel_mid_reboot; =20 /* Avoid searching for BIOS MP tables */ - x86_init.mpparse.find_smp_config =3D x86_init_noop; + x86_init.mpparse.find_mptable =3D x86_init_noop; x86_init.mpparse.get_smp_config =3D x86_init_uint_noop; set_bit(MP_BUS_ISA, mp_bus_not_pci); } --- 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 =3D xen_smp_ops; =20 /* Avoid searching for BIOS MP tables */ - x86_init.mpparse.find_smp_config =3D x86_init_noop; + x86_init.mpparse.find_mptable =3D x86_init_noop; x86_init.mpparse.get_smp_config =3D _get_smp_config; }