From patchwork Wed Aug 9 16:49:31 2023 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: 133382 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2978468vqr; Wed, 9 Aug 2023 11:00:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFYmdWKnBvdBTOrmwuawPASa9DaUb09cZOPqRxLPVb87j7DPlVWHNDFkBdigDu4YZ9WxwFd X-Received: by 2002:aca:190f:0:b0:3a7:56a5:4251 with SMTP id l15-20020aca190f000000b003a756a54251mr59221oii.16.1691604059503; Wed, 09 Aug 2023 11:00:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691604059; cv=none; d=google.com; s=arc-20160816; b=MhHri63okJgdx66HRy675coDRu7gdrvTRyBXe9GH+j5MpAx37euSFbmRKVm5KOnPsc HYOM0kNSkpdS0YuyqsCMkVxXf5lhMBMEXerREPLzfxTDqktnk37pJDIGe7760qEr9f2w V0qq+w0wuV+uW7UgE/2OqoOt0lmQcK+oZOn82rvagz/Xzpij/k8nHtibtKftUcj9yEUX 6LPbxFGJvJ+wds03abUABM5+SsMUB4a4ORnCKJ9bukGIVDa8XxpZZFrZRYP22J81nTSV F6S36rH/FVKmVbnGumdZdvtHrOo/LVstKXqEW1UpT5m+OMwE43Wdy0DVS+INfGsA49Q1 Ne4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=2QzhzUaiMWKpnd/b46C2lmtCjFpm7Humm6GL7X2JNQw=; fh=xeBNGOuZM5vy4okdFvBNsMTGHQ6tdBlFPaNKCUScG5A=; b=OHsbJTUgxB2FPzwLYxcrqDNdnLwEM+E4aqsMp+OcpGTntChVFRXlDPa2+D1N7ynCJd LpSrbK2oSyhSljDw1lt6vLOG8HxBB5qlL0VZxQfv5OHAo9uzEp9c7OgNDugLAqDI0sZU H6FvMcMljCPwuFQHgOcwIGnvEW7H0sPb5ZW1g4xXE7lo9UjcrqsQ1l5z//BNct0Ukgbb xFmCvGd0s2NUesclnfJGUdTSlS0morudGvRHgPtbmxC12MOMbUQ2PY9D/uw4CG2hn41M RuFvYl3bThW7xyYQuP1tvID0G+FrnrXbHO2UOrJAVZuFzy3lcmZWl2IRx9MA55+CLgOc HLVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=hZca+NAi; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 c2-20020a17090ab28200b00263419c5c00si1767180pjr.50.2023.08.09.11.00.44; Wed, 09 Aug 2023 11:00:59 -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=hZca+NAi; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 S231598AbjHIQts (ORCPT + 99 others); Wed, 9 Aug 2023 12:49:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231277AbjHIQte (ORCPT ); Wed, 9 Aug 2023 12:49:34 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11F5A1FD8; Wed, 9 Aug 2023 09:49:33 -0700 (PDT) Date: Wed, 09 Aug 2023 16:49:31 -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=2QzhzUaiMWKpnd/b46C2lmtCjFpm7Humm6GL7X2JNQw=; b=hZca+NAiBXXyys7O61ewk5e60SJ1uT2CH1zW8zHxwG2nCb5+egPf6PE8Mr5w7BxEYO5S9P KhyhxevOU3ALkBHHzO4MvISsewfynCupn0ucVg+ef2fTaN5rr26jvAcpxvXOZC4LT0OCHS woMcyuzeSsVvkf6KETP9cruxroC+7/dSQNu7z0XUp6zwNVJTZwSDS4dlEoaozEdQiElwFB 3i+4NiFkn3zRn1TNi1MOYoSJ7Rjf3dkCWPsGbLXY87o05pTtAQmuQmbqnSI3E9nLBnb6vi Fk6mrChCrz8Uz1ewH0FlZNqBrBwhAFiNiIaWiYWcgSc3bX4HV7jHr1+8yRHEOg== 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=2QzhzUaiMWKpnd/b46C2lmtCjFpm7Humm6GL7X2JNQw=; b=8HziiuYRfF+v42IjALr0r4ktnRRhFUyFdn5xmkp5w6OJ6htgmCqbAyLsQJZwoXAFb/7SPT LCCsXfMkFPH2HHDw== 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: Consolidate wait_icr_idle() implementations Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169159977118.27769.14914766211581788495.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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,URIBL_BLOCKED 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: 1773775418310548061 X-GMAIL-MSGID: 1773775418310548061 The following commit has been merged into the x86/apic branch of tip: Commit-ID: a50d313ec05f4f6e3e73395cfd202d9f51967a4f Gitweb: https://git.kernel.org/tip/a50d313ec05f4f6e3e73395cfd202d9f51967a4f 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: Consolidate wait_icr_idle() implementations Two copies and also needlessly public. Move it into ipi.c so it can be inlined. Rename it to apic_mem_wait_icr_idle(). Signed-off-by: Thomas Gleixner Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) --- arch/x86/include/asm/apic.h | 1 - arch/x86/kernel/apic/apic.c | 6 ------ arch/x86/kernel/apic/apic_flat_64.c | 4 ++-- arch/x86/kernel/apic/bigsmp_32.c | 2 +- arch/x86/kernel/apic/ipi.c | 6 +++--- arch/x86/kernel/apic/local.h | 2 ++ arch/x86/kernel/apic/probe_32.c | 2 +- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 4fb71b7..1499865 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -98,7 +98,6 @@ static inline u32 native_apic_mem_read(u32 reg) return *((volatile u32 *)(APIC_BASE + reg)); } -extern void native_apic_wait_icr_idle(void); extern u32 native_safe_apic_wait_icr_idle(void); extern void native_apic_icr_write(u32 low, u32 id); extern u64 native_apic_icr_read(void); diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 4ee95cb..ab26a61 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -240,12 +240,6 @@ static void __init apic_disable(void) apic = &apic_noop; } -void native_apic_wait_icr_idle(void) -{ - while (apic_read(APIC_ICR) & APIC_ICR_BUSY) - cpu_relax(); -} - u32 native_safe_apic_wait_icr_idle(void) { u32 send_status; diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c index a0c875d..57d3afb 100644 --- a/arch/x86/kernel/apic/apic_flat_64.c +++ b/arch/x86/kernel/apic/apic_flat_64.c @@ -111,7 +111,7 @@ static struct apic apic_flat __ro_after_init = { .eoi_write = native_apic_mem_write, .icr_read = native_apic_icr_read, .icr_write = native_apic_icr_write, - .wait_icr_idle = native_apic_wait_icr_idle, + .wait_icr_idle = apic_mem_wait_icr_idle, .safe_wait_icr_idle = native_safe_apic_wait_icr_idle, }; @@ -187,7 +187,7 @@ static struct apic apic_physflat __ro_after_init = { .eoi_write = native_apic_mem_write, .icr_read = native_apic_icr_read, .icr_write = native_apic_icr_write, - .wait_icr_idle = native_apic_wait_icr_idle, + .wait_icr_idle = apic_mem_wait_icr_idle, .safe_wait_icr_idle = native_safe_apic_wait_icr_idle, }; diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c index ffff294..57077fc 100644 --- a/arch/x86/kernel/apic/bigsmp_32.c +++ b/arch/x86/kernel/apic/bigsmp_32.c @@ -108,7 +108,7 @@ static struct apic apic_bigsmp __ro_after_init = { .eoi_write = native_apic_mem_write, .icr_read = native_apic_icr_read, .icr_write = native_apic_icr_write, - .wait_icr_idle = native_apic_wait_icr_idle, + .wait_icr_idle = apic_mem_wait_icr_idle, .safe_wait_icr_idle = native_safe_apic_wait_icr_idle, }; diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c index 614ac55..e0e0567 100644 --- a/arch/x86/kernel/apic/ipi.c +++ b/arch/x86/kernel/apic/ipi.c @@ -102,7 +102,7 @@ static inline int __prepare_ICR2(unsigned int mask) return SET_XAPIC_DEST_FIELD(mask); } -static inline void __xapic_wait_icr_idle(void) +void apic_mem_wait_icr_idle(void) { while (native_apic_mem_read(APIC_ICR) & APIC_ICR_BUSY) cpu_relax(); @@ -137,7 +137,7 @@ static void __default_send_IPI_shortcut(unsigned int shortcut, int vector) if (unlikely(vector == NMI_VECTOR)) safe_apic_wait_icr_idle(); else - __xapic_wait_icr_idle(); + apic_mem_wait_icr_idle(); /* Destination field (ICR2) and the destination mode are ignored */ native_apic_mem_write(APIC_ICR, __prepare_ICR(shortcut, vector, 0)); @@ -154,7 +154,7 @@ void __default_send_IPI_dest_field(unsigned int dest_mask, int vector, if (unlikely(vector == NMI_VECTOR)) safe_apic_wait_icr_idle(); else - __xapic_wait_icr_idle(); + apic_mem_wait_icr_idle(); /* Set the IPI destination field in the ICR */ native_apic_mem_write(APIC_ICR2, __prepare_ICR2(dest_mask)); diff --git a/arch/x86/kernel/apic/local.h b/arch/x86/kernel/apic/local.h index 5b0a0e7..2eb49d4 100644 --- a/arch/x86/kernel/apic/local.h +++ b/arch/x86/kernel/apic/local.h @@ -44,6 +44,8 @@ static inline unsigned int __prepare_ICR(unsigned int shortcut, int vector, void default_init_apic_ldr(void); +void apic_mem_wait_icr_idle(void); + /* * This is used to send an IPI with no shorthand notation (the destination is * specified in bits 56 to 63 of the ICR). diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c index 81c69d7..52f3c6f 100644 --- a/arch/x86/kernel/apic/probe_32.c +++ b/arch/x86/kernel/apic/probe_32.c @@ -64,7 +64,7 @@ static struct apic apic_default __ro_after_init = { .eoi_write = native_apic_mem_write, .icr_read = native_apic_icr_read, .icr_write = native_apic_icr_write, - .wait_icr_idle = native_apic_wait_icr_idle, + .wait_icr_idle = apic_mem_wait_icr_idle, .safe_wait_icr_idle = native_safe_apic_wait_icr_idle, };