From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: x86@kernel.org, Andrew Cooper <andrew.cooper3@citrix.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Paolo Bonzini <pbonzini@redhat.com>, Wei Liu <wei.liu@kernel.org>,
Arjan van de Ven <arjan@linux.intel.com>,
Juergen Gross <jgross@suse.com>,
Michael Kelley <mikelley@microsoft.com>,
Peter Keresztes Schmidt <peter@keresztesschmidt.de>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>
Subject: [patch V3 19/60] x86/apic: Remove check_phys_apicid_present()
Date: Tue, 1 Aug 2023 12:47:04 +0200 (CEST) [thread overview]
Message-ID: <20230801103816.199680570@linutronix.de> (raw)
In-Reply-To: <20230801103042.936020332@linutronix.de>
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 <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
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);
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_mask_t *retmap);
extern int default_cpu_present_to_apicid(int mps_cpu);
-extern int default_check_phys_apicid_present(int phys_apicid);
#else /* CONFIG_X86_LOCAL_APIC */
--- 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);
-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 = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
- .check_phys_apicid_present = default_check_phys_apicid_present,
.phys_pkg_id = flat_phys_pkg_id,
.get_apic_id = flat_get_apic_id,
@@ -213,7 +212,6 @@ static struct apic apic_physflat __ro_af
.setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
- .check_phys_apicid_present = default_check_phys_apicid_present,
.phys_pkg_id = flat_phys_pkg_id,
.get_apic_id = 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 =
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = physid_set_mask_of_physid,
- .check_phys_apicid_present = default_check_phys_apicid_present,
-
.phys_pkg_id = noop_phys_pkg_id,
.get_apic_id = 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 = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
- .check_phys_apicid_present = default_check_phys_apicid_present,
.phys_pkg_id = numachip_phys_pkg_id,
.get_apic_id = numachip1_get_apic_id,
@@ -303,7 +302,6 @@ static const struct apic apic_numachip2
.setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
- .check_phys_apicid_present = default_check_phys_apicid_present,
.phys_pkg_id = numachip_phys_pkg_id,
.get_apic_id = 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);
}
-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 = bigsmp_setup_apic_routing,
.cpu_present_to_apicid = bigsmp_cpu_present_to_apicid,
.apicid_to_cpu_present = physid_set_mask_of_physid,
- .check_phys_apicid_present = bigsmp_check_phys_apicid_present,
.phys_pkg_id = bigsmp_phys_pkg_id,
.get_apic_id = 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 = setup_apic_flat_routing,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = physid_set_mask_of_physid,
- .check_phys_apicid_present = default_check_phys_apicid_present,
.phys_pkg_id = default_phys_pkg_id,
.get_apic_id = 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 = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
- .check_phys_apicid_present = default_check_phys_apicid_present,
.phys_pkg_id = x2apic_phys_pkg_id,
.get_apic_id = 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 = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
- .check_phys_apicid_present = default_check_phys_apicid_present,
.phys_pkg_id = x2apic_phys_pkg_id,
.get_apic_id = 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 = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
- .check_phys_apicid_present = default_check_phys_apicid_present,
.phys_pkg_id = uv_phys_pkg_id,
.get_apic_id = 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 = {
.setup_apic_routing = NULL,
.cpu_present_to_apicid = xen_cpu_present_to_apicid,
.apicid_to_cpu_present = physid_set_mask_of_physid, /* Used on 32-bit */
- .check_phys_apicid_present = default_check_phys_apicid_present, /* smp_sanity_check needs it */
.phys_pkg_id = xen_phys_pkg_id, /* detect_ht */
.get_apic_id = xen_get_apic_id,
next prev parent reply other threads:[~2023-08-01 10:48 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-01 10:46 [patch V3 00/60] x86/apic: Decrapification and static calls Thomas Gleixner
2023-08-01 10:46 ` [patch V3 01/60] x86/cpu: Make identify_boot_cpu() static Thomas Gleixner
2023-08-01 10:46 ` [patch V3 02/60] x86/cpu: Remove unused physid_*() nonsense Thomas Gleixner
2023-08-01 10:46 ` [patch V3 03/60] x86/apic: Rename disable_apic Thomas Gleixner
2023-08-01 10:46 ` [patch V3 04/60] x86/apic/ioapic: Rename skip_ioapic_setup Thomas Gleixner
2023-08-01 10:46 ` [patch V3 05/60] x86/apic: Remove pointless x86_bios_cpu_apicid Thomas Gleixner
2023-08-01 10:46 ` [patch V3 06/60] x86/apic: Get rid of hard_smp_processor_id() Thomas Gleixner
2023-08-01 10:46 ` [patch V3 07/60] x86/apic: Remove unused max_physical_apicid Thomas Gleixner
2023-08-01 10:46 ` [patch V3 08/60] x86/apic: Nuke unused apic::inquire_remote_apic() Thomas Gleixner
2023-08-01 10:46 ` [patch V3 09/60] x86/apic: Get rid of boot_cpu_physical_apicid madness Thomas Gleixner
2023-08-01 10:46 ` [patch V3 10/60] x86/apic: Register boot CPU APIC early Thomas Gleixner
2023-08-01 10:46 ` [patch V3 11/60] x86/apic: Remove the pointless APIC version check Thomas Gleixner
2023-08-01 10:46 ` [patch V3 12/60] x86/of: Fix the APIC address registration Thomas Gleixner
2023-08-03 22:42 ` Dave Hansen
2023-08-03 23:35 ` Thomas Gleixner
2023-08-01 10:46 ` [patch V3 13/60] x86/apic: Make some APIC init functions bool Thomas Gleixner
2023-08-01 10:46 ` [patch V3 14/60] x86/apic: Split register_apic_address() Thomas Gleixner
2023-08-01 10:46 ` [patch V3 15/60] x86/apic: Sanitize APIC address setup Thomas Gleixner
2023-08-01 10:47 ` [patch V3 16/60] x86/xen/pv: Pretend that it found SMP configuration Thomas Gleixner
2023-08-01 10:47 ` [patch V3 17/60] x86/apic: Sanitize num_processors handling Thomas Gleixner
2023-08-01 10:47 ` [patch V3 18/60] x86/apic: Nuke another processor check Thomas Gleixner
2023-08-01 10:47 ` Thomas Gleixner [this message]
2023-08-01 10:47 ` [patch V3 20/60] x86/apic: Get rid of apic_phys Thomas Gleixner
2023-08-01 10:47 ` [patch V3 21/60] x86/apic/32: Sanitize logical APIC ID handling Thomas Gleixner
2023-08-01 10:47 ` [patch V3 22/60] x86/apic/32: Remove x86_cpu_to_logical_apicid Thomas Gleixner
2023-08-01 10:47 ` [patch V3 23/60] x86/apic/ipi: Code cleanup Thomas Gleixner
2023-08-01 10:47 ` [patch V3 24/60] x86/apic: Mop up early_per_cpu() abuse Thomas Gleixner
2023-08-01 10:47 ` [patch V3 25/60] x86/apic/32: Remove pointless default_acpi_madt_oem_check() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 26/60] x86/apic/32: Decrapify the def_bigsmp mechanism Thomas Gleixner
2023-08-07 20:11 ` Dave Hansen
2023-08-07 21:18 ` Thomas Gleixner
2023-08-01 10:47 ` [patch V3 27/60] x86/apic/32: Remove bigsmp_cpu_present_to_apicid() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 28/60] x86/apic: Nuke empty init_apic_ldr() callbacks Thomas Gleixner
2023-08-01 10:47 ` [patch V3 29/60] x86/apic: Nuke apic::apicid_to_cpu_present() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 30/60] x86/ioapic/32: Decrapify phys_id_present_map operation Thomas Gleixner
2023-08-01 10:47 ` [patch V3 31/60] x86/apic: Mop up *setup_apic_routing() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 32/60] x86/apic: Mop up apic::apic_id_registered() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 33/60] x86/apic/ipi: Tidy up the code and fixup comments Thomas Gleixner
2023-08-01 10:47 ` [patch V3 34/60] x86/apic: Consolidate wait_icr_idle() implementations Thomas Gleixner
2023-08-01 10:47 ` [patch V3 35/60] x86/apic: Allow apic::wait_icr_idle() to be NULL Thomas Gleixner
2023-08-01 10:47 ` [patch V3 36/60] x86/apic: Allow apic::safe_wait_icr_idle() " Thomas Gleixner
2023-08-01 10:47 ` [patch V3 37/60] x86/apic: Move safe wait_icr_idle() next to apic_mem_wait_icr_idle() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 38/60] x86/apic/uv: Get rid of wrapper callbacks Thomas Gleixner
2023-08-01 10:47 ` [patch V3 39/60] x86/apic/x2apic: Share all common IPI functions Thomas Gleixner
2023-08-01 10:47 ` [patch V3 40/60] x86/apic/64: Uncopypaste probing Thomas Gleixner
2023-08-01 10:47 ` [patch V3 41/60] x86/apic: Wrap APIC ID validation into an inline Thomas Gleixner
2023-08-01 10:47 ` [patch V3 42/60] x86/apic: Add max_apic_id member Thomas Gleixner
2023-08-01 10:47 ` [patch V3 43/60] x86/apic: Simplify X2APIC ID validation Thomas Gleixner
2023-08-01 10:47 ` [patch V3 44/60] x86/apic: Prepare x2APIC for using apic::max_apic_id Thomas Gleixner
2023-08-01 10:47 ` [patch V3 45/60] x86/apic: Sanitize APID ID range validation Thomas Gleixner
2023-08-08 13:34 ` Qiuxu Zhuo
2023-08-08 18:55 ` Thomas Gleixner
2023-08-09 12:01 ` Zhang, Rui
2023-08-01 10:47 ` [patch V3 46/60] x86/apic: Remove pointless NULL initializations Thomas Gleixner
2023-08-01 10:47 ` [patch V3 47/60] x86/apic/noop: Tidy up the code Thomas Gleixner
2023-08-01 10:47 ` [patch V3 48/60] x86/apic: Remove pointless arguments from [native_]eoi_write() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 49/60] x86/apic: Nuke ack_APIC_irq() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 50/60] x86/apic: Wrap apic->native_eoi() into a helper Thomas Gleixner
2023-08-01 10:47 ` [patch V3 51/60] x86/apic: Provide common init infrastructure Thomas Gleixner
2023-08-09 1:41 ` Qiuxu Zhuo
2023-08-01 10:47 ` [patch V3 52/60] x86/xen/apic: Use standard apic driver mechanism for Xen PV Thomas Gleixner
2023-08-01 10:47 ` [patch V3 53/60] x86/apic: Provide apic_update_callback() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 54/60] x86/apic: Replace acpi_wake_cpu_handler_update() and apic_set_eoi_cb() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 55/60] x86/apic: Convert other overrides to apic_update_callback() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 56/60] x86/xen/apic: Mark apic __ro_after_init Thomas Gleixner
2023-08-01 10:47 ` [patch V3 57/60] x86/apic: Mark all hotpath APIC callback wrappers __always_inline Thomas Gleixner
2023-08-01 10:47 ` [patch V3 58/60] x86/apic: Wrap IPI calls into helper functions Thomas Gleixner
2023-08-01 10:47 ` [patch V3 59/60] x86/apic: Provide static call infrastructure for APIC callbacks Thomas Gleixner
2023-08-01 10:47 ` [patch V3 60/60] x86/apic: Turn on static calls Thomas Gleixner
2023-08-02 11:55 ` [patch V3 00/60] x86/apic: Decrapification and " Juergen Gross
2023-08-03 0:05 ` Sohil Mehta
2023-08-03 3:50 ` Michael Kelley (LINUX)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230801103816.199680570@linutronix.de \
--to=tglx@linutronix.de \
--cc=andrew.cooper3@citrix.com \
--cc=arjan@linux.intel.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mikelley@microsoft.com \
--cc=pbonzini@redhat.com \
--cc=peter@keresztesschmidt.de \
--cc=peterz@infradead.org \
--cc=thomas.lendacky@amd.com \
--cc=wei.liu@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®