From nobody Fri Dec 19 07:47:18 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 4B0B5C0015E for ; Mon, 24 Jul 2023 13:35:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231688AbjGXNf1 (ORCPT ); Mon, 24 Jul 2023 09:35:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231616AbjGXNe4 (ORCPT ); Mon, 24 Jul 2023 09:34:56 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29F242683 for ; Mon, 24 Jul 2023 06:34:26 -0700 (PDT) Message-ID: <20230724132045.673477506@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690205655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=xYutxZ9rMLywIqqTjqfZZaF9PJm3LP88T/JNH/GhwYU=; b=yEhbpxdZF4G4E66WlkNsz25xLxYxtuM6TKOTmGhCW0gbE0/LAAbSNnmR8WrrxilMcix7GR Mk2d1+dWPMIyDnEHVJtcHdZtrvE7aeR4E6XgDrrCooWX+UqkD+1C9C/7DmRcH59+6kVsqC KX5IsRdAi71fjklAil/MQUJhP0ioRV1SWqyWy6QnCS8OPMBhc9Yavl0AaFv2nr7Kpdw1/h b7opRUA34eZga/UuiFbCZSgq8j0mRjD4HsuZvzjXDiKc8ZHG4MaDo1dEb/5JooeoXIF547 aUPXWHvdgEdPjhjzA8q7TlLAZKWSVpvJIlo1eZwtNQItV6vnjx+77TYEyaUYhQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690205655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=xYutxZ9rMLywIqqTjqfZZaF9PJm3LP88T/JNH/GhwYU=; b=2cu6X8j3VWN1Frn0zPyNqCc3jr3P6ZzpQR+/9fMuPjHJwHUuPxw3UdEd68EinsPSKgTVHn 6SZZRw4q4upzd1Cw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Andrew Cooper , Tom Lendacky , Paolo Bonzini , Wei Liu , Arjan van de Ven , Juergen Gross , Michael Kelley , Peter Keresztes Schmidt , "Peter Zijlstra (Intel)" Subject: [patch V2 18/58] x86/apic: Remove check_phys_apicid_present() References: <20230724131206.500814398@linutronix.de> MIME-Version: 1.0 Date: Mon, 24 Jul 2023 15:34:14 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The only silly usage site is gone. Remove the gunk which was even outright wrong in the bigsmp_32 case which returned true unconditionally. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) --- arch/x86/include/asm/apic.h | 2 -- arch/x86/kernel/apic/apic_common.c | 5 ----- arch/x86/kernel/apic/apic_flat_64.c | 2 -- arch/x86/kernel/apic/apic_noop.c | 2 -- arch/x86/kernel/apic/apic_numachip.c | 2 -- arch/x86/kernel/apic/bigsmp_32.c | 6 ------ arch/x86/kernel/apic/probe_32.c | 1 - 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 | 1 - 11 files changed, 24 deletions(-) --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -305,7 +305,6 @@ struct apic { void (*setup_apic_routing)(void); int (*cpu_present_to_apicid)(int mps_cpu); void (*apicid_to_cpu_present)(int phys_apicid, physid_mask_t *retmap); - int (*check_phys_apicid_present)(int phys_apicid); int (*phys_pkg_id)(int cpuid_apic, int index_msb); =20 u32 (*get_apic_id)(unsigned long x); @@ -485,7 +484,6 @@ extern u32 apic_flat_calc_apicid(unsigne extern bool default_check_apicid_used(physid_mask_t *map, int apicid); extern void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mas= k_t *retmap); extern int default_cpu_present_to_apicid(int mps_cpu); -extern int default_check_phys_apicid_present(int phys_apicid); =20 #else /* CONFIG_X86_LOCAL_APIC */ =20 --- a/arch/x86/kernel/apic/apic_common.c +++ b/arch/x86/kernel/apic/apic_common.c @@ -35,11 +35,6 @@ int default_cpu_present_to_apicid(int mp } EXPORT_SYMBOL_GPL(default_cpu_present_to_apicid); =20 -int default_check_phys_apicid_present(int phys_apicid) -{ - return physid_isset(phys_apicid, phys_cpu_present_map); -} - int default_apic_id_valid(u32 apicid) { return (apicid < 255); --- a/arch/x86/kernel/apic/apic_flat_64.c +++ b/arch/x86/kernel/apic/apic_flat_64.c @@ -124,7 +124,6 @@ static struct apic apic_flat __ro_after_ .setup_apic_routing =3D NULL, .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .apicid_to_cpu_present =3D NULL, - .check_phys_apicid_present =3D default_check_phys_apicid_present, .phys_pkg_id =3D flat_phys_pkg_id, =20 .get_apic_id =3D flat_get_apic_id, @@ -213,7 +212,6 @@ static struct apic apic_physflat __ro_af .setup_apic_routing =3D NULL, .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .apicid_to_cpu_present =3D NULL, - .check_phys_apicid_present =3D default_check_phys_apicid_present, .phys_pkg_id =3D flat_phys_pkg_id, =20 .get_apic_id =3D flat_get_apic_id, --- a/arch/x86/kernel/apic/apic_noop.c +++ b/arch/x86/kernel/apic/apic_noop.c @@ -107,8 +107,6 @@ struct apic apic_noop __ro_after_init =3D .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .apicid_to_cpu_present =3D physid_set_mask_of_physid, =20 - .check_phys_apicid_present =3D default_check_phys_apicid_present, - .phys_pkg_id =3D noop_phys_pkg_id, =20 .get_apic_id =3D noop_get_apic_id, --- a/arch/x86/kernel/apic/apic_numachip.c +++ b/arch/x86/kernel/apic/apic_numachip.c @@ -257,7 +257,6 @@ static const struct apic apic_numachip1 .setup_apic_routing =3D NULL, .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .apicid_to_cpu_present =3D NULL, - .check_phys_apicid_present =3D default_check_phys_apicid_present, .phys_pkg_id =3D numachip_phys_pkg_id, =20 .get_apic_id =3D numachip1_get_apic_id, @@ -303,7 +302,6 @@ static const struct apic apic_numachip2 .setup_apic_routing =3D NULL, .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .apicid_to_cpu_present =3D NULL, - .check_phys_apicid_present =3D default_check_phys_apicid_present, .phys_pkg_id =3D numachip_phys_pkg_id, =20 .get_apic_id =3D numachip2_get_apic_id, --- a/arch/x86/kernel/apic/bigsmp_32.c +++ b/arch/x86/kernel/apic/bigsmp_32.c @@ -63,11 +63,6 @@ static void bigsmp_ioapic_phys_id_map(ph physids_promote(0xFFL, retmap); } =20 -static int bigsmp_check_phys_apicid_present(int phys_apicid) -{ - return 1; -} - static int bigsmp_phys_pkg_id(int cpuid_apic, int index_msb) { return cpuid_apic >> index_msb; @@ -138,7 +133,6 @@ static struct apic apic_bigsmp __ro_afte .setup_apic_routing =3D bigsmp_setup_apic_routing, .cpu_present_to_apicid =3D bigsmp_cpu_present_to_apicid, .apicid_to_cpu_present =3D physid_set_mask_of_physid, - .check_phys_apicid_present =3D bigsmp_check_phys_apicid_present, .phys_pkg_id =3D bigsmp_phys_pkg_id, =20 .get_apic_id =3D bigsmp_get_apic_id, --- a/arch/x86/kernel/apic/probe_32.c +++ b/arch/x86/kernel/apic/probe_32.c @@ -80,7 +80,6 @@ static struct apic apic_default __ro_aft .setup_apic_routing =3D setup_apic_flat_routing, .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .apicid_to_cpu_present =3D physid_set_mask_of_physid, - .check_phys_apicid_present =3D default_check_phys_apicid_present, .phys_pkg_id =3D default_phys_pkg_id, =20 .get_apic_id =3D default_get_apic_id, --- a/arch/x86/kernel/apic/x2apic_cluster.c +++ b/arch/x86/kernel/apic/x2apic_cluster.c @@ -250,7 +250,6 @@ static struct apic apic_x2apic_cluster _ .setup_apic_routing =3D NULL, .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .apicid_to_cpu_present =3D NULL, - .check_phys_apicid_present =3D default_check_phys_apicid_present, .phys_pkg_id =3D x2apic_phys_pkg_id, =20 .get_apic_id =3D x2apic_get_apic_id, --- a/arch/x86/kernel/apic/x2apic_phys.c +++ b/arch/x86/kernel/apic/x2apic_phys.c @@ -174,7 +174,6 @@ static struct apic apic_x2apic_phys __ro .setup_apic_routing =3D NULL, .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .apicid_to_cpu_present =3D NULL, - .check_phys_apicid_present =3D default_check_phys_apicid_present, .phys_pkg_id =3D x2apic_phys_pkg_id, =20 .get_apic_id =3D x2apic_get_apic_id, --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -846,7 +846,6 @@ static struct apic apic_x2apic_uv_x __ro .setup_apic_routing =3D NULL, .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .apicid_to_cpu_present =3D NULL, - .check_phys_apicid_present =3D default_check_phys_apicid_present, .phys_pkg_id =3D uv_phys_pkg_id, =20 .get_apic_id =3D x2apic_get_apic_id, --- a/arch/x86/xen/apic.c +++ b/arch/x86/xen/apic.c @@ -154,7 +154,6 @@ static struct apic xen_pv_apic =3D { .setup_apic_routing =3D NULL, .cpu_present_to_apicid =3D xen_cpu_present_to_apicid, .apicid_to_cpu_present =3D physid_set_mask_of_physid, /* Used on 32-bit = */ - .check_phys_apicid_present =3D default_check_phys_apicid_present, /* smp_= sanity_check needs it */ .phys_pkg_id =3D xen_phys_pkg_id, /* detect_ht */ =20 .get_apic_id =3D xen_get_apic_id,