From nobody Fri Sep 12 03:13:29 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 50A0FC0015E for ; Wed, 9 Aug 2023 19:13:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233431AbjHITNj (ORCPT ); Wed, 9 Aug 2023 15:13:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233379AbjHITM7 (ORCPT ); Wed, 9 Aug 2023 15:12:59 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0A0B2D5D; Wed, 9 Aug 2023 12:12:35 -0700 (PDT) Date: Wed, 09 Aug 2023 19:12:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691608345; 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=4YEWXcifivVg86UmH2c6Xpd661pLlI0IsER53UddTuk=; b=QvduAGBgkSz0ceDN27YYH35/C5aGCnaVNA2h2/mvslUHOJUyEeQs2eVNEIW8yocSmT4+Eg pci15o45OyM9wyMoWv97zi89mS+ljKZ0nBVRg9hEXaaEuew+OdTzBGjyX1vk5ldosHCeTs 5RtHH9GoylO9ZW0PT5LdDkIJIBwga6TGIfmH/PKTdITGdF3JfJ/zUDwWQEgWNuAnIZWus0 dJKopS25EQowAwnZYzhvAA2x6dgB6hjpTk57kpMDfBqzpFsUjaLT7rDKDogYV3/RhFxsso wXVLd4RzxkT8HUlVqK3PxQ8PXBKthamRXlqvIYJX+y3RlLb/fmYanmrNtGBdFw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691608345; 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=4YEWXcifivVg86UmH2c6Xpd661pLlI0IsER53UddTuk=; b=59bLDVV0nrsyhvdKlFv6fvE1fGyjWZlqEwq6ZZK6v8FtNHre3ot+IJlcLaXIKQoAARWrZM BHnH0rTq7v4kZhDA== 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: Split register_apic_address() Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , Michael Kelley , Sohil Mehta , Juergen Gross , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169160834444.27769.11587842002054923417.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: 5a88f354dcd8f19436bbda52f075276a5c70424f Gitweb: https://git.kernel.org/tip/5a88f354dcd8f19436bbda52f075276a5= c70424f Author: Thomas Gleixner AuthorDate: Tue, 08 Aug 2023 15:03:48 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 11:58:20 -07:00 x86/apic: Split register_apic_address() Split the fixmap setup out of register_lapic_address() and reuse it when the X2APIC is disabled during setup. This avoids registering the APIC ID (setting 'mp_lapic_addr') twice. [ dhansen: changelog wording tweak ] Signed-off-by: Thomas Gleixner Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) Tested-by: Michael Kelley Tested-by: Sohil Mehta Tested-by: Juergen Gross # Xen PV (dom0 and unpriv. guest) --- arch/x86/kernel/apic/apic.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index d0f4cca..45ae178 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1852,6 +1852,8 @@ void x2apic_setup(void) __x2apic_enable(); } =20 +static __init void apic_set_fixmap(void); + static __init void x2apic_disable(void) { u32 x2apic_id, state =3D x2apic_state; @@ -1872,7 +1874,7 @@ static __init void x2apic_disable(void) } =20 __x2apic_disable(); - register_lapic_address(mp_lapic_addr); + apic_set_fixmap(); } =20 static __init void x2apic_enable(void) @@ -2145,17 +2147,21 @@ void __init init_apic_mappings(void) } } =20 +static __init void apic_set_fixmap(void) +{ + set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr); + apic_mmio_base =3D APIC_BASE; + apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", + apic_mmio_base, mp_lapic_addr); + apic_read_boot_cpu_id(false); +} + void __init register_lapic_address(unsigned long address) { mp_lapic_addr =3D address; =20 - if (x2apic_mode) - return; - - set_fixmap_nocache(FIX_APIC_BASE, address); - apic_mmio_base =3D APIC_BASE; - apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", APIC_BASE, ad= dress); - apic_read_boot_cpu_id(false); + if (!x2apic_mode) + apic_set_fixmap(); } =20 /*