From patchwork Fri Feb 16 15:17:19 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: 202189 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp588965dyb; Fri, 16 Feb 2024 07:27:10 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVXm15xHeBD/H9gIU3su+kbs8tvPD1yim+uLXWr0BYdqCvQ/OQ9WyK+DOgiaw5yQ4TDw7yqKlykZ47Nd8OiO9gYqcsrUw== X-Google-Smtp-Source: AGHT+IFWJDymrCqnCE2E5enqu5DFZrm2EKI9KyihZbAT3K73OV/94JXJdYy9XHdQsIyHojsy5BNl X-Received: by 2002:a17:903:11c3:b0:1db:7195:5fca with SMTP id q3-20020a17090311c300b001db71955fcamr5571684plh.34.1708097230690; Fri, 16 Feb 2024 07:27:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708097230; cv=pass; d=google.com; s=arc-20160816; b=wtalbsrVrCID0ijloo2XZ3c6l32zqvcoMJKnULYl8kJg87qn6Ht8YOaS9lMBJ4j80f tHhCSlfG7EjYRApexFa+ei063gwMN2KjDDW6grQTuzbUgQ7i7QuXx6cTkQRuo1iZC9g/ zA9C83cdcDQrQFFX7eP3UOUw/gXGAy3K8vSEi81s8L+DFe06Tn21c1zl7+rgoGe+k5om ah13ZFdSth08YezU+sELehSisvFf5q9bohVll+lFdlaZhv/eWLG+YeEeoDSA/OMpJGMx S+GR2D5BGruox4GI4kePWv9/WAMU5twlr3jwYpgLYnt6uAlauff/easA9Zz3ehJnHJT3 1iBA== 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=veTeQnAQhbqKkWRZk6azUX3f55HqJNE+Bushe6cY600=; fh=HfXWoIhgCc+vt39DMIJv/Ec0aAKnw0eFA8QxuIQTUoQ=; b=xeU3tL4CQ+mLPC1BMT62antL8mJO5QspUp6zqi6zc54Br9EhMjCUDDArLsvzJNd1LX FKhCpDY7UT0vMm7VvUSwbBX/xWpRkKXdrLa5+zW4Vg7S4z7ntDjUAEPZro+FwG4dVgJR 81pa7NUQ8m8nSQWjtNAeTQ7uM32lvXFUDN+G1woLwVqtmKaCIX0eL0A2dySXsiKFf0b/ 7FKPzfs6WGkF7lcJW4mTCwXOisbSN+G8Ec0pFhRsgP72Va0+DXgjjVAyGxNQb5jQgoHg TiBtUfSxkTnbd6ofRo6UJmJ19HKh/8NKUrcQFVUiIGT+Qta43c2+tXRhlStHvUVNP/Ad mLDw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="rKTpR+/u"; 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-68834-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68834-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id ix3-20020a170902f80300b001d70b8d77b9si9757plb.307.2024.02.16.07.27.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:27:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-68834-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="rKTpR+/u"; 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-68834-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-68834-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 3D6FF287105 for ; Fri, 16 Feb 2024 15:26:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 51CD514D420; Fri, 16 Feb 2024 15:17:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="rKTpR+/u"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="4jRAuxfI" 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 00D9D148FF4; Fri, 16 Feb 2024 15:17:21 +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=1708096644; cv=none; b=bg8wTXcg4sgAR1nJWnwS0Ra4w+nueRaR2X6LyBGo8BJCjSLPyuLddEcQqkVCLXw3zxuxO8gl15yRMJFwM7ITZKN292DKS9iLSvc+O32xXfw9shI0XCEugf7CToGvdTf+Gpsd9QboWZqnPqV/VuUTs6wTH8PFmlgRkErzARFsgeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708096644; c=relaxed/simple; bh=PHCqxJtAp7L8c03u3mnuTBEiP/9LDBpk2avNFxq+ucU=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=LP9nxmLKrXlmQibuN4vmLG2hYOS8SuWynRPYNAGJtZ3umK2di4b1pZXdx/L0bxD3/5O6+0oFPllB4374VWz6p90TXM07rPQjJv8XWaf5dV/fZidtuQkgpbQFtpxTU3FWci4V12pgOp+eA0+kE6EX0OvS2Z8gSj5ShRegMGIjso4= 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=rKTpR+/u; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=4jRAuxfI; 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:19 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708096640; 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=veTeQnAQhbqKkWRZk6azUX3f55HqJNE+Bushe6cY600=; b=rKTpR+/uJX/xfIffM7zNdqkXivYUBmxBirWL4pYXY2sqN9dmskuVHPZ3U7QlByosT5Rsno +iQYWgPR47cl8Dbd3OnAvk1dwoPLBTKIkasaV2lHOuKxr0DTr8QFo1dH04JMArpDVcJsrL 9hXJKQw2RtXFwxtu4YjXmwAhWJKJPIcQBMYPRTMwj+hOrU+B9YLk6+oZXeeUvD04B0mVA6 4MwmTjaBmsybLm3awogxSKTv87IPkC2lgpIoxihXp+9rT8XrVJwNy/l8anSp9jTwjDK1Up J4cVeqtdXwmV/Eg0bqAuQjWIoBOBwO0DmSOj5vAJbK6dwRv2UlxnWQz6O9vlbQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708096640; 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=veTeQnAQhbqKkWRZk6azUX3f55HqJNE+Bushe6cY600=; b=4jRAuxfIUmsTSZv8GKjB634rQS+bFkdK8fgazksWBcEjv3quLw8AY9tZIcppWs7vlLqJzQ kYXT3EQAC/TLOIAQ== 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/mpparse: Rename default_find_smp_config() Cc: Thomas Gleixner , Michael Kelley , Sohil Mehta , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240212154639.306287711@linutronix.de> References: <20240212154639.306287711@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170809663971.398.11639430256558521810.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: 1790819634307571541 X-GMAIL-MSGID: 1791069761547300401 The following commit has been merged into the x86/apic branch of tip: Commit-ID: e061c7ae0830ff320d77566849a5cc30decfa602 Gitweb: https://git.kernel.org/tip/e061c7ae0830ff320d77566849a5cc30decfa602 Author: Thomas Gleixner AuthorDate: Tue, 13 Feb 2024 22:05:02 +01:00 Committer: Thomas Gleixner CommitterDate: Thu, 15 Feb 2024 22:07:40 +01:00 x86/mpparse: Rename default_find_smp_config() MPTABLE is no longer the default SMP configuration mechanism. Rename it to mpparse_find_mptable() because that's what it does. Signed-off-by: Thomas Gleixner Tested-by: Michael Kelley Tested-by: Sohil Mehta Link: https://lore.kernel.org/r/20240212154639.306287711@linutronix.de --- 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(-) diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 666dcdb..c154dd7 100644 --- 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(void) x86_init.mpparse.get_smp_config(1); } -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 int generic_processor_info(int apicid); diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index c878616..4ae7764 100644 --- 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); }; diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index b223922..86acccd 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c @@ -587,7 +587,7 @@ static int __init smp_scan_config(unsigned long base, unsigned long length) return ret; } -void __init default_find_smp_config(void) +void __init mpparse_find_mptable(void) { unsigned int address; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 8420107..0e431c9 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -970,10 +970,8 @@ void __init setup_arch(char **cmdline_p) high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1; #endif - /* - * Find and reserve possible boot-time SMP configuration: - */ - find_smp_config(); + /* Find and reserve MPTABLE area */ + x86_init.mpparse.find_mptable(); early_alloc_pgt_buf(); diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index a37ebd3..0bbef49 100644 --- 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 = { .mpparse = { .setup_ioapic_ids = x86_init_noop, - .find_smp_config = default_find_smp_config, + .find_mptable = mpparse_find_mptable, .get_smp_config = default_get_smp_config, }, diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c index bbe7e91..de7f1e9 100644 --- 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 = sdv_arch_setup; x86_init.resources.probe_roms = x86_init_noop; x86_init.mpparse.get_smp_config = x86_init_uint_noop; - x86_init.mpparse.find_smp_config = x86_init_noop; + x86_init.mpparse.find_mptable = x86_init_noop; x86_init.pci.init = ce4100_pci_init; x86_init.pci.init_irq = sdv_pci_init; diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c index f4592dc..595dd4c 100644 --- 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(void) machine_ops.emergency_restart = intel_mid_reboot; /* Avoid searching for BIOS MP tables */ - x86_init.mpparse.find_smp_config = x86_init_noop; + x86_init.mpparse.find_mptable = x86_init_noop; x86_init.mpparse.get_smp_config = x86_init_uint_noop; set_bit(MP_BUS_ISA, mp_bus_not_pci); } diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c index 3ae29c2..44c35b1 100644 --- 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 = xen_smp_ops; /* Avoid searching for BIOS MP tables */ - x86_init.mpparse.find_smp_config = x86_init_noop; + x86_init.mpparse.find_mptable = x86_init_noop; x86_init.mpparse.get_smp_config = _get_smp_config; }