From patchwork Mon Aug 7 13:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 132089 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1492916vqr; Mon, 7 Aug 2023 07:32:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHVu4GndIVqyMPNS6kRxqty0ITh7yfX5BlmAdDDHwcYZAh6BQOpYJuA/ro5mJZUTuH2BmCb X-Received: by 2002:a17:90b:4a0a:b0:268:1001:d49c with SMTP id kk10-20020a17090b4a0a00b002681001d49cmr7281623pjb.31.1691418728892; Mon, 07 Aug 2023 07:32:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691418728; cv=none; d=google.com; s=arc-20160816; b=rVJslapxy8oEaF0tcne3Qxbw3QbeGZZR1AixJQexMeVGhpUD62lhlHlvRLa4oEWPeQ g3xm1vx4zkQxx9UorywOflPCtUNtRDH1yykdUe35Onqnq3Gt1urvWxidePxNNIkf7D3t RTkEPMbsBeDVWYLS9ndhaY2iKzoJFWG8N/BOVWQ0kG3c+gHhkF0ksB0pbm49BO6reyC7 WNj8eW4iAYLQL/bEZ03kfBKGV7tfsi7JNWuJjp1XTY4qrMHxblTBK3fEeiEM7wbfUc/o fuFQYF+NK3T1kMPBq+0aWtnVD2ClilSkg5fRjHQZwG7t6twUuhWDLMCcTZSlME/4h6Xa ULQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=/LBxxfhEQgbaGsq91nXw+XvYY9V2TrRdpuXMU4IXdUM=; fh=/92WVKYrcN3rA268QXyKzVtm/UtxHeI2lnbU295XDiQ=; b=B3p7+/p+6GaGxTfwbZwS7HDt4yKE0S24XjkrRg2RCFDrqnhL0dp/I4alIRu1gXr1Et tnhPCZxB8WdoOiBBUIoEvdeKCzXKnyux741cfdKIWM4+uK4kcLMFV1Uvi1mw0b0xMqOV lroE1KrNqWv7WEjXXaFIU6rFPfogqBQ/5a6V6P+SUTp8m0QX4wCdDCmcanMYZGPHw86A 9HrMs3G8hbnh1yAqs/WXptTPPKtqE3PD24dHq6mue4WOG4lxCo1aqjnuHGSw0/1elGYs iWxNH3by3iPS+HyP0ngEEWg3DCpND6Py7zYbtRH/+7FEbtLyXu/q6L25euVxEf1bV2yN NLNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=o8LQe7Ls; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a2-20020a17090ad80200b00250331e6044si5943246pjv.25.2023.08.07.07.31.54; Mon, 07 Aug 2023 07:32:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=o8LQe7Ls; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234597AbjHGNxk (ORCPT + 99 others); Mon, 7 Aug 2023 09:53:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234568AbjHGNw7 (ORCPT ); Mon, 7 Aug 2023 09:52:59 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 971E7F3 for ; Mon, 7 Aug 2023 06:52:54 -0700 (PDT) Message-ID: <20230807135027.064321764@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691416372; 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=/LBxxfhEQgbaGsq91nXw+XvYY9V2TrRdpuXMU4IXdUM=; b=o8LQe7Ls4Z+/qGPCnSTzkqJR7EB9PiToMXBVPmICdCqg0/Km0aped2/ubIhsQNkXQl1z9n 1ajBj0Ku4iHL+Skz56EQgDFXxqxz7Ydgs/wKaei/FhaXs4l24iomECpgwygIwsjHvHxjW3 10ICos8H5LMLM1ms0qkEvLp+5Sj+YbCfu8+oGM1XTNTzZR5JCcDDWH9+yqSkp3shtqUO5t 96lJQCb27KgaMJ1Fc2wEUM3RPN4ixeU0IY/AgX+k0J057fgZz+tdA8wJ9NrbvZ3fvAa/E0 ia+/58ca7bfpBHHWvg8oGti2O1fzH+pxBsO8RctGz+fkkUyUaceE/53KMuLltg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691416372; 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=/LBxxfhEQgbaGsq91nXw+XvYY9V2TrRdpuXMU4IXdUM=; b=S8EHjFNgdV+eWvx3T6Au9tOnjKenvPyGPuFUOHVr2kVZL2/oAUg4UCd/4JTuaxxtreoGx4 F58d3Bugq9s58xBw== 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 12/53] x86/dtb: Rename x86_dtb_init() References: <20230807130108.853357011@linutronix.de> MIME-Version: 1.0 Date: Mon, 7 Aug 2023 15:52:52 +0200 (CEST) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773581084810299566 X-GMAIL-MSGID: 1773581084810299566 x86_dtb_init() is a misnomer and it really should be used as a SMP configuration parser which is selected by the platform via x86_init::mpparse:parse_smp_config(). Rename it to x86_dtb_parse_smp_config() in preparation for that. Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/prom.h | 4 ++-- arch/x86/kernel/devicetree.c | 2 +- arch/x86/kernel/setup.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) --- a/arch/x86/include/asm/prom.h +++ b/arch/x86/include/asm/prom.h @@ -23,11 +23,11 @@ extern int of_ioapic; extern u64 initial_dtb; extern void add_dtb(u64 data); void x86_of_pci_init(void); -void x86_dtb_init(void); +void x86_dtb_parse_smp_config(void); #else static inline void add_dtb(u64 data) { } static inline void x86_of_pci_init(void) { } -static inline void x86_dtb_init(void) { } +static inline void x86_dtb_parse_smp_config(void) { } #define of_ioapic 0 #endif --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -304,7 +304,7 @@ static void __init x86_flattree_get_conf static inline void x86_flattree_get_config(void) { } #endif -void __init x86_dtb_init(void) +void __init x86_dtb_parse_smp_config(void) { x86_flattree_get_config(); --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1260,7 +1260,7 @@ void __init setup_arch(char **cmdline_p) * Read APIC and some other early information from ACPI tables. */ acpi_boot_init(); - x86_dtb_init(); + x86_dtb_parse_smp_config(); /* * get boot-time SMP configuration: