From patchwork Tue Feb 13 21:05:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 200619 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp810897dyb; Tue, 13 Feb 2024 13:11:54 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV1ASBJ2VYi4pOPEutD6ca4wNFBHOKp9vP6B8EgkbDQSF1k0kPog0dtElr7vmz1edKh2O88GEWxneQPnVUvpa04p0GGuA== X-Google-Smtp-Source: AGHT+IGddBXGliXoREB+UQcbvaZmcbOrII2aETODC5yXih73retTkXQ7hRMDweFmkS8rd3PzOBL/ X-Received: by 2002:a17:906:4894:b0:a3d:fb7:84a3 with SMTP id v20-20020a170906489400b00a3d0fb784a3mr330330ejq.77.1707858714451; Tue, 13 Feb 2024 13:11:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707858714; cv=pass; d=google.com; s=arc-20160816; b=ZKdbKE+71hJ5nQKUyajW+CKUpcCOiFPZ/6FZKSDkwVwACyKN2B4s+VAvyNX0g9D4xD 4fjO7q4Y/Adlyuwi/8uSlRZbRKfrwgx0puK0eXqvWu1tlWEOmjSgP5hCFJEdgzV6pII0 PwelML9slJU63RmHX2NqN7d4Y0uAF9FKF3J+4dnlTDyTDKjFdLjRXrR8bpxlH1U/TQx2 cwE2yWoGFIWOX94kpcjolj6+fHxjUOGtS2pH5DNg//JAA8PFpMGiG/D1u2xIZRhHaIG4 sKp7FNGwjNOS/hD4t0HcR0EjwKEQkKH6heMTudl35rZDF5r9FFEnQGSKTaW92vvkd0DW gaRA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=date:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:subject:cc:to:from:dkim-signature :dkim-signature:message-id; bh=WKnV8cmjnyf4puxHx+D7XpKpE60kVjCp3v5e0THf4uQ=; fh=NAHh+0/mDmXbAEuwSpkJIxTtRJUD8x+9sJRa0yfXeXk=; b=In3Qqc+ETD1Y3lYgiQLYsSZX3zboUy7adZEbyTkUdtDmyTsNPeUOMhXINqGXRHjpgu 3NNKSq3EEmLM2goB9FvfPvcVFe/vKABK2OwZ3aPcK6GmDPt71gi15AMe/fJzNepAyO+6 4K246xRtR3wK3ZgF8ECZM0r7RBavQf0Xt2GH5rLfen81ufpiv0LpaGvymNq0efdUS5Uz fmavT60RujLv+M2y/rW8xpyd67S6q4Ipf1ssGEt0n6BN57GDCyDgW555weMFFjWL2av4 +9rPb4tNi7TBdcUMXYITr3V6zt9rEpBmu1vd+0UT205VbBktuOLZkHpXL0J+IzcMEDAb lhBA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=iLHrOvBh; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-64272-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64272-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de X-Forwarded-Encrypted: i=2; AJvYcCWXLluDsrIonfUxfIfvMJX9clmA6O5ycM+m4yaSKfyUxeiqX5KadtWkB6AC/j4/5ldeJXDDd/CiZNASjO3hRyyHjttGfw== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id oq9-20020a170906cc8900b00a3d2e89d236si239406ejb.1029.2024.02.13.13.11.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 13:11:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64272-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=iLHrOvBh; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-64272-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64272-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 1355A1F22794 for ; Tue, 13 Feb 2024 21:11:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 244FB626CD; Tue, 13 Feb 2024 21:05:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="iLHrOvBh"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="NuecDBnh" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3036869DF6 for ; Tue, 13 Feb 2024 21:05:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707858309; cv=none; b=bFmg4xZj7q1kQRrGYAfKbNpgJYRfyzGc6z1vyJ+j5Q/8z18S2Je5w0nPkxmb1fb+ptdBCtp+6hnNDerwerduABCZpgBDO1JUW14ekHHHWvEAOgSdfVje8PO/PX+Dsx/rHhQor5p9XwZlBGmlasK5UbFl5oW3HjrHtbH/zq7HubI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707858309; c=relaxed/simple; bh=/py/Xwe4fVOjWrl4DdrzzF4uh9lZ5bJilDGGPUdzVcE=; h=Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type:Date; b=rWswpz+Ulen6SmEFHxuJ1pndNHqCdL4ex8DTLj+6QhNfybETxcOq+vSsbWNkYt5tFsyCsTXyZMV7cmZ0ZOhCNaiAS8rD8hBf5iYYFMcpprYCIy0nISmop8TRyKbUgITQX6BI7bldvvUP+irXsVVplc6I7scbdCk45cm2edPSkeA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=iLHrOvBh; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=NuecDBnh; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Message-ID: <20240212154639.495992801@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1707858306; 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=WKnV8cmjnyf4puxHx+D7XpKpE60kVjCp3v5e0THf4uQ=; b=iLHrOvBhUiVQ+lAlywu1m0FNEbSHk9En+wXJu3GH8iICNq8mVmYmI6QITL5uXwGSnhTH4q LDg2C3mBlce6TI57o42y563bZiYt0oa9/1PSQgNRi6GItM8tiEWmZfAZb/ELr1Y32mffez TgqiAplPymAa3cgXb3uLu6ReZ06mjlvG0VAp3wmzIKU1jB09Dbn3FgMakR8N9oox/q6ECh zqIRB+wjh28yA2Z6ccE1E8TC1/iOvzjpPNM+5QdLSD6nwdhNdsNh0npSg/O7hyz5YEhbNv mudmSCXofygbH/vCSug8j0e0dZ2gtOjxvMs5h/18jji6H2aTs52h5qYtclFRiA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1707858306; 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=WKnV8cmjnyf4puxHx+D7XpKpE60kVjCp3v5e0THf4uQ=; b=NuecDBnhFy9QlNmopDT55NyFKeD2nW5Bg1stDtJce9OjL3VpgOk2RLCJdy2p9ng+WMKtlx GmuBK4xR0HYq1WDA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , Huang Rui , Juergen Gross , Dimitri Sivanich , Sohil Mehta , K Prateek Nayak , Kan Liang , Zhang Rui , "Paul E. McKenney" , Feng Tang , Andy Shevchenko , Michael Kelley , "Peter Zijlstra (Intel)" , Andy Shevchenko , Wei Liu Subject: [patch V3 11/22] x86/dtb: Rename x86_dtb_init() References: <20240212154529.402604963@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Tue, 13 Feb 2024 22:05:06 +0100 (CET) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790819659364149979 X-GMAIL-MSGID: 1790819659364149979 From: Thomas Gleixner 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 @@ -302,7 +302,7 @@ void __init x86_flattree_get_config(void } #endif -void __init x86_dtb_init(void) +void __init x86_dtb_parse_smp_config(void) { if (!of_have_populated_dt()) return; --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1131,7 +1131,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: