From nobody Fri Sep 12 03:14:24 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 14F24C001B0 for ; Wed, 9 Aug 2023 16:50:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231450AbjHIQuC (ORCPT ); Wed, 9 Aug 2023 12:50:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231365AbjHIQth (ORCPT ); Wed, 9 Aug 2023 12:49:37 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8916C1BFA; Wed, 9 Aug 2023 09:49:36 -0700 (PDT) Date: Wed, 09 Aug 2023 16:49:34 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691599775; 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=h6BxIhWomep6OoqB/tu8RGH64/FHrhfxbUDYwhu/4aw=; b=mWIBcl9SaEF5bnBAiPLZ9VWPK1GNWt/iuCX95s24C4d6zWM8+M8H8GgFNjUBQilwX3lLBl w8ATH/lHvf/oy56Ox1ZI8k8kqu7NjSglG9fN+UHlIqZ8ouR8IibxkqwK99lgVqM0/0ZQgO x2toEK3SbbREbJRvShw66u7Z+WyZvVwI0s+95FmZgGQfmSyTOhbTaTEGI5xlZhES+2Dkji WOccnZzrU8mVh9SQsrohmFBCb1dcQ+xEtpJGoRArB8Uw3ea6KWXaI5z4fY6FzBmUjtfU1h a4d00aLUV+ju/7CewmFVNUzD1ksBaH5t4G/CzKEYUCT7l9itkNRI1KWljDI5bQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691599775; 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=h6BxIhWomep6OoqB/tu8RGH64/FHrhfxbUDYwhu/4aw=; b=XVgUhs6O/vZXjZ+tHjEwbiTXWVkAuEAFvpms8yOQOPCrklBnfv8tSHtr/u/CC6tZxlS3b1 xYMfJP40om5cl3Bg== 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/32: Remove bigsmp_cpu_present_to_apicid() Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169159977460.27769.11135507874065330229.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: 72338b564fae8e30a16344f0d1321823db5daed6 Gitweb: https://git.kernel.org/tip/72338b564fae8e30a16344f0d1321823d= b5daed6 Author: Thomas Gleixner AuthorDate: Tue, 08 Aug 2023 15:03:56 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 08:10:12 -07:00 x86/apic/32: Remove bigsmp_cpu_present_to_apicid() It's a copy of default_cpu_present_to_apicid() with the omission of the actual check whether the CPU is present. This APIC callback should die completely, but the XEN APIC implementation does something different which needs to be addressed first. Signed-off-by: Thomas Gleixner Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/apic/bigsmp_32.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp= _32.c index a26cb46..aba8ce1 100644 --- a/arch/x86/kernel/apic/bigsmp_32.c +++ b/arch/x86/kernel/apic/bigsmp_32.c @@ -43,14 +43,6 @@ static void bigsmp_setup_apic_routing(void) nr_ioapics); } =20 -static int bigsmp_cpu_present_to_apicid(int mps_cpu) -{ - if (mps_cpu < nr_cpu_ids) - return (int) per_cpu(x86_cpu_to_apicid, mps_cpu); - - return BAD_APICID; -} - static void bigsmp_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask= _t *retmap) { /* For clustered we don't have a good way to do this yet - hack */ @@ -119,7 +111,7 @@ static struct apic apic_bigsmp __ro_after_init =3D { .init_apic_ldr =3D bigsmp_init_apic_ldr, .ioapic_phys_id_map =3D bigsmp_ioapic_phys_id_map, .setup_apic_routing =3D bigsmp_setup_apic_routing, - .cpu_present_to_apicid =3D bigsmp_cpu_present_to_apicid, + .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .apicid_to_cpu_present =3D physid_set_mask_of_physid, .phys_pkg_id =3D bigsmp_phys_pkg_id,