From patchwork Fri Feb 16 15:17:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 202187 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp588798dyb; Fri, 16 Feb 2024 07:26:54 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUIj4WPdZ9YigyQOWn0Tgk/rEys/8ynvaiJjR0roiQtW4TZrxzm/TJ1e4c9IdRiOWnD0lTeXC++2shpH0ZMmt9uzvJBVA== X-Google-Smtp-Source: AGHT+IGA0+tjFGWTvPVjaoPWcT6rfnBp2ophnt/KYTTBy2dUJhw7j7ghTlHVmSxKy1rk2qqYhYPj X-Received: by 2002:a05:6214:dcc:b0:68f:30b2:21e4 with SMTP id 12-20020a0562140dcc00b0068f30b221e4mr2887467qvt.19.1708097214754; Fri, 16 Feb 2024 07:26:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708097214; cv=pass; d=google.com; s=arc-20160816; b=teL1jeoYTl/2tcnEA6dfykytKAZ0hmbiuAVIKlRmuyVJTqUta5DdmLt6otnBePkq41 pZrEA0muzfHREwDlKDvYeu4cdjv3RC/hihkZxjh1mGllSacSxGvXyC+2w7rf1DSiJleB ztel2hYjBdIfwMPbURG6UQ0QKvUW1AXvEGjlgYwaTpk4poEaY5DSWtmfbRJTUUT+/ihd oHrNLcoOVA0bx08KYkJ5WuIqC/oZ7VqbwLuMazbz/2nLbQ+ghXeWTq5aOvCAwhvQMozV +4A+Ctj8ZCrLUPf/w9rYYfcFJ2Mp/c5njoizBqOg83ilR2HaprLD4OTtOVhttBjhSUQX DIyg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=2+guX6p9+GZlAySuMScx26xWtV3AHd/EP4htMfs7efY=; fh=HfXWoIhgCc+vt39DMIJv/Ec0aAKnw0eFA8QxuIQTUoQ=; b=eDa8MrF4v6bbsqDxBmQEV645J9r48sqaZcjOFu75rEP7QIlQUnUzNNv1l0HRlRS9T8 9ZYikEA50ufkx9jBksMW7IwfZ2GT0dzTpUB1Ai+n7YKbfOQisukvxLETFqog0IFm/gnw aQUVrXIhOD3Ebe6t37QB+NXAysz+NXaEhnrvjH32QHtCd+6jNoSdrMlNZFORjQiqnb/m oQV0/VztHZAWGnJBKCh2xDLmu9OJ+1y8RIHf0xy1IlEGnl+aBMsme6I/Wv4DQjEqdo+s FIzIb4HKWqgfQUmQ1Bce0U+s59msfvlVtN2QRtrjSDOuToBvK0PdCAYkCF69iW8oTWpU ECTg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=WiTZGcje; 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-68831-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68831-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id jt4-20020a05621427e400b0068f41235377si33848qvb.593.2024.02.16.07.26.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:26:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-68831-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=WiTZGcje; 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-68831-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68831-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 36F991C22E78 for ; Fri, 16 Feb 2024 15:25:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6D3C214AD0C; Fri, 16 Feb 2024 15:17:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="WiTZGcje"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="2PH0a4Mm" 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 E54061482F8; Fri, 16 Feb 2024 15:17:19 +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=1708096641; cv=none; b=ucc7oMnkcPexIx5KSzEa79v6/99eGCIS5JodLE+ejFTFB2LJE8hu+K86D7fGIXVbgdEXcbZEDZsKVqoCg2UhDMPcw3tznUL5R+WJQcqOJOb3UZ33jsoLCqHQsteXyCXdslEKN1a4VInrCsXl8HOQrfBDaSB5SgcVIk0iat9FzfQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708096641; c=relaxed/simple; bh=W6IkiDaHSQcH08JZ06jgT61Ci05rfvKYeWWcyFvwBww=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=SC2KyF7q8/BG+myUOmPlw1mHf9Sai+J9cc2APPKDWF09ZUbpOY8RW+8e8XdtLa5TTUUGsMvoHC9pFT7ChhAyZ/Z3+lEGnwxbK1F5XO22bMBA/pcrGKsNquxRis5DIGWZi2cIe2mU0mMRc88k4TMp2a9zxti4D+JAAz/FfBRz2LE= 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=WiTZGcje; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=2PH0a4Mm; 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 Date: Fri, 16 Feb 2024 15:17:17 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708096638; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2+guX6p9+GZlAySuMScx26xWtV3AHd/EP4htMfs7efY=; b=WiTZGcjepeS29ro8t+d0YGjAGhFMpcT/zBbPGi/ATa1zB/m8OWSrFG/ObgIkXCopJyDn+9 Dx7Q3/PPKkd0sMZ5r+0DKlxzWrYUfDBuNvvdn/DtV3xyu6zUVx51+Hid0U53jr0oEIxY3P 8XbgoRr19og+UsAFEvdkY22IOJB3zUGFK9I2BO2uTDS9T3UdzeXJ0pSddFhhJoZywmET+d GbT/goecilJGxim3as762D5OQbKK7bijY70oxAveTP8gD0NbbUU6c3bWfqbXnyE9x/Kbb6 c/fNozs7oHXD1Q/mxMfDQ92LmUYlBdBPZmfdg39ceAOD3FvdJIv5DrWyBCO6bA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708096638; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2+guX6p9+GZlAySuMScx26xWtV3AHd/EP4htMfs7efY=; b=2PH0a4MmWEo+QIajCDR68z+h0+85WYKxmqCYeeIEJ24ta3xhkJdPFWu/8ixkzzZrKssLSe yieCC2Jt2vnDalAw== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/dtb: Rename x86_dtb_init() Cc: Thomas Gleixner , Michael Kelley , Sohil Mehta , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240212154639.495992801@linutronix.de> References: <20240212154639.495992801@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170809663770.398.12953695910445393819.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790819659364149979 X-GMAIL-MSGID: 1791069745058406803 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 5faf8ec77111a699b6a566c4155511fc020f8644 Gitweb: https://git.kernel.org/tip/5faf8ec77111a699b6a566c4155511fc020f8644 Author: Thomas Gleixner AuthorDate: Tue, 13 Feb 2024 22:05:06 +01:00 Committer: Thomas Gleixner CommitterDate: Thu, 15 Feb 2024 22:07:40 +01:00 x86/dtb: Rename x86_dtb_init() 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 Tested-by: Michael Kelley Tested-by: Sohil Mehta Link: https://lore.kernel.org/r/20240212154639.495992801@linutronix.de --- 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(-) diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h index 65dee24..043758a 100644 --- 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 diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index afd0992..c05b900 100644 --- 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; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 0e431c9..39edb89 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1133,7 +1133,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: