From nobody Fri Sep 12 03:11:11 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 73235C001B0 for ; Wed, 9 Aug 2023 16:49:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231593AbjHIQtq (ORCPT ); Wed, 9 Aug 2023 12:49:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231273AbjHIQtd (ORCPT ); Wed, 9 Aug 2023 12:49:33 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE1781BFE; Wed, 9 Aug 2023 09:49:32 -0700 (PDT) Date: Wed, 09 Aug 2023 16:49:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691599771; 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; bh=IYaIqWNI0GZTiA3/hn3fzNOrggvCwYCNASynRGbzUNc=; b=PPLYzKa/GXf24DUD0FA+KhIkkle/zX8QkHMGTAY5SmYH1KLdisaSMeVWlGLE10/belhJcC vXIA05tgDyOlZU/AJpi15ITwAD/lUN5V17HYxwNQZDw8ZwQ4bOKjjj08LQqUD2h20r5fyX THV5Ht1Hx67s9cvp0Z02z0bgALzPgjTBkwN99uZ26W+coL1MLZK6Z5VFMyEJkAl4hDRquz lDxQEv52XIw+5i9J7p9dV+AQ3Ww6Z2m1YRGgSRA8u+QfCBoUn9C9fi3zpWhwgYzHuFgqVo 1jpAyEGpcmh18vri+m1+GExxBtRBc+O0d1UeuH4oYNPuqltKOrVv5RDoiJskZA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691599771; 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; bh=IYaIqWNI0GZTiA3/hn3fzNOrggvCwYCNASynRGbzUNc=; b=6Gb0bLmIcGl169Ujx6IeMlKonAAadQLAC45n7XR90n/4hopGTI120hC2halgNIut/lf9W2 YzhdoItNYw3BG1Dw== 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/apic: Allow apic::wait_icr_idle() to be NULL Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169159977071.27769.9295438560689678165.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/apic branch of tip: Commit-ID: 6770e3729f4ac0273f8583aecb75595abf23976b Gitweb: https://git.kernel.org/tip/6770e3729f4ac0273f8583aecb75595ab= f23976b Author: Thomas Gleixner AuthorDate: Tue, 08 Aug 2023 15:04:04 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 08:10:12 -07:00 x86/apic: Allow apic::wait_icr_idle() to be NULL Nuke more NOOP callbacks and make the invocation conditional. Will be replaced with a static call later. Signed-off-by: Thomas Gleixner Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) --- arch/x86/include/asm/apic.h | 9 ++------- arch/x86/kernel/apic/apic_noop.c | 2 -- arch/x86/kernel/apic/apic_numachip.c | 7 ------- arch/x86/kernel/apic/x2apic_cluster.c | 1 - arch/x86/kernel/apic/x2apic_phys.c | 1 - arch/x86/kernel/apic/x2apic_uv_x.c | 1 - arch/x86/xen/apic.c | 5 ----- 7 files changed, 2 insertions(+), 24 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 1499865..397cd5f 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -206,12 +206,6 @@ static inline u32 native_apic_msr_read(u32 reg) return (u32)msr; } =20 -static inline void native_x2apic_wait_icr_idle(void) -{ - /* no need to wait for icr idle in x2apic */ - return; -} - static inline u32 native_safe_x2apic_wait_icr_idle(void) { /* no need to wait for icr idle in x2apic */ @@ -376,7 +370,8 @@ static inline void apic_icr_write(u32 low, u32 high) =20 static inline void apic_wait_icr_idle(void) { - apic->wait_icr_idle(); + if (apic->wait_icr_idle) + apic->wait_icr_idle(); } =20 static inline u32 safe_apic_wait_icr_idle(void) diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_n= oop.c index c73a7a8..ef31a2e 100644 --- a/arch/x86/kernel/apic/apic_noop.c +++ b/arch/x86/kernel/apic/apic_noop.c @@ -20,7 +20,6 @@ static void noop_send_IPI_mask_allbutself(const struct cp= umask *cpumask, int vec static void noop_send_IPI_allbutself(int vector) { } static void noop_send_IPI_all(int vector) { } static void noop_send_IPI_self(int vector) { } -static void noop_apic_wait_icr_idle(void) { } static void noop_apic_icr_write(u32 low, u32 id) { } =20 static int noop_wakeup_secondary_cpu(int apicid, unsigned long start_eip) @@ -105,6 +104,5 @@ struct apic apic_noop __ro_after_init =3D { .eoi_write =3D noop_apic_write, .icr_read =3D noop_apic_icr_read, .icr_write =3D noop_apic_icr_write, - .wait_icr_idle =3D noop_apic_wait_icr_idle, .safe_wait_icr_idle =3D noop_safe_apic_wait_icr_idle, }; diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/ap= ic_numachip.c index e8e13d7..647ed77 100644 --- a/arch/x86/kernel/apic/apic_numachip.c +++ b/arch/x86/kernel/apic/apic_numachip.c @@ -223,11 +223,6 @@ static int numachip2_acpi_madt_oem_check(char *oem_id,= char *oem_table_id) return 1; } =20 -/* APIC IPIs are queued */ -static void numachip_apic_wait_icr_idle(void) -{ -} - /* APIC NMI IPIs are queued */ static u32 numachip_safe_apic_wait_icr_idle(void) { @@ -269,7 +264,6 @@ static const struct apic apic_numachip1 __refconst =3D { .eoi_write =3D native_apic_mem_write, .icr_read =3D native_apic_icr_read, .icr_write =3D native_apic_icr_write, - .wait_icr_idle =3D numachip_apic_wait_icr_idle, .safe_wait_icr_idle =3D numachip_safe_apic_wait_icr_idle, }; =20 @@ -310,7 +304,6 @@ static const struct apic apic_numachip2 __refconst =3D { .eoi_write =3D native_apic_mem_write, .icr_read =3D native_apic_icr_read, .icr_write =3D native_apic_icr_write, - .wait_icr_idle =3D numachip_apic_wait_icr_idle, .safe_wait_icr_idle =3D numachip_safe_apic_wait_icr_idle, }; =20 diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x= 2apic_cluster.c index 705b33d..7ceef70 100644 --- a/arch/x86/kernel/apic/x2apic_cluster.c +++ b/arch/x86/kernel/apic/x2apic_cluster.c @@ -266,7 +266,6 @@ static struct apic apic_x2apic_cluster __ro_after_init = =3D { .eoi_write =3D native_apic_msr_eoi_write, .icr_read =3D native_x2apic_icr_read, .icr_write =3D native_x2apic_icr_write, - .wait_icr_idle =3D native_x2apic_wait_icr_idle, .safe_wait_icr_idle =3D native_safe_x2apic_wait_icr_idle, }; =20 diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2ap= ic_phys.c index e0fdbf5..c1ab678 100644 --- a/arch/x86/kernel/apic/x2apic_phys.c +++ b/arch/x86/kernel/apic/x2apic_phys.c @@ -180,7 +180,6 @@ static struct apic apic_x2apic_phys __ro_after_init =3D= { .eoi_write =3D native_apic_msr_eoi_write, .icr_read =3D native_x2apic_icr_read, .icr_write =3D native_x2apic_icr_write, - .wait_icr_idle =3D native_x2apic_wait_icr_idle, .safe_wait_icr_idle =3D native_safe_x2apic_wait_icr_idle, }; =20 diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2ap= ic_uv_x.c index 9e25e30..5cb68f6 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -854,7 +854,6 @@ static struct apic apic_x2apic_uv_x __ro_after_init =3D= { .eoi_write =3D native_apic_msr_eoi_write, .icr_read =3D native_x2apic_icr_read, .icr_write =3D native_x2apic_icr_write, - .wait_icr_idle =3D native_x2apic_wait_icr_idle, .safe_wait_icr_idle =3D native_safe_x2apic_wait_icr_idle, }; =20 diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c index f1cd7f2..e709bf0 100644 --- a/arch/x86/xen/apic.c +++ b/arch/x86/xen/apic.c @@ -120,10 +120,6 @@ static int xen_phys_pkg_id(int initial_apic_id, int in= dex_msb) return initial_apic_id >> index_msb; } =20 -static void xen_noop(void) -{ -} - static int xen_cpu_present_to_apicid(int cpu) { if (cpu_present(cpu)) @@ -165,7 +161,6 @@ static struct apic xen_pv_apic =3D { =20 .icr_read =3D xen_apic_icr_read, .icr_write =3D xen_apic_icr_write, - .wait_icr_idle =3D xen_noop, .safe_wait_icr_idle =3D xen_safe_apic_wait_icr_idle, };