x86/apic: Remove check_apicid_used() and ioapic_phys_id_map()

No more users.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michael Kelley <mhklinux@outlook.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Link: https://lore.kernel.org/r/20240212154639.243307499@linutronix.de

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 6c5cffceaa1432e882dce4fc4759d73541105a79..16e5e0071f1c7e9c011711730a28a72f13db729a 100644 (file)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -290,9 +290,7 @@ struct apic {
        int     (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);
        bool    (*apic_id_registered)(void);
 
-       bool    (*check_apicid_used)(physid_mask_t *map, u32 apicid);
        void    (*init_apic_ldr)(void);
-       void    (*ioapic_phys_id_map)(physid_mask_t *phys_map, physid_mask_t *retmap);
        u32     (*cpu_present_to_apicid)(int mps_cpu);
 
        u32     (*get_apic_id)(u32 id);
@@ -525,7 +523,6 @@ extern int default_apic_id_valid(u32 apicid);
 extern u32 apic_default_calc_apicid(unsigned int cpu);
 extern u32 apic_flat_calc_apicid(unsigned int cpu);
 
-extern void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap);
 extern u32 default_cpu_present_to_apicid(int mps_cpu);
 
 void apic_send_nmi_to_offline_cpu(unsigned int cpu);

diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index 9bf1e75c1defe466e9de03c008aa0a1e36efa8f4..666dcdbe66b036c633ed883fbc35d7249950f1d5 100644 (file)
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -92,12 +92,6 @@ typedef struct physid_mask physid_mask_t;
 #define physids_empty(map)                                     \
        bitmap_empty((map).mask, MAX_LOCAL_APIC)
 
-static inline void physids_promote(unsigned long physids, physid_mask_t *map)
-{
-       physids_clear(*map);
-       map->mask[0] = physids;
-}
-
 static inline void physid_set_mask_of_physid(int physid, physid_mask_t *map)
 {
        physids_clear(*map);

diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index 1f2de665e12dea41cfa986067d490c53780e2001..b5bb7a2e8340b20db3a04e3f4e1684e6c4404b45 100644 (file)
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -50,8 +50,6 @@ struct apic apic_noop __ro_after_init = {
 
        .disable_esr                    = 0,
 
-       .check_apicid_used              = default_check_apicid_used,
-       .ioapic_phys_id_map             = default_ioapic_phys_id_map,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
 
        .max_apic_id                    = 0xFE,

diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index dc83c2eed2c13daf9fa614c67e673922426d8bb0..29f354a699d50258a82a7960bdc4ee9676f0fdab 100644 (file)
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -18,17 +18,6 @@ static u32 bigsmp_get_apic_id(u32 x)
        return (x >> 24) & 0xFF;
 }
 
-static bool bigsmp_check_apicid_used(physid_mask_t *map, u32 apicid)
-{
-       return false;
-}
-
-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 */
-       physids_promote(0xFFL, retmap);
-}
-
 static void bigsmp_send_IPI_allbutself(int vector)
 {
        default_send_IPI_mask_allbutself_phys(cpu_online_mask, vector);
@@ -79,8 +68,6 @@ static struct apic apic_bigsmp __ro_after_init = {
 
        .disable_esr                    = 1,
 
-       .check_apicid_used              = bigsmp_check_apicid_used,
-       .ioapic_phys_id_map             = bigsmp_ioapic_phys_id_map,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
 
        .max_apic_id                    = 0xFE,

diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 752a955497102941f2b2de3833cab27b91debbaa..cdf4047d88e1794feaa135942b30d04db69cf64d 100644 (file)
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -44,9 +44,7 @@ static struct apic apic_default __ro_after_init = {
 
        .disable_esr                    = 0,
 
-       .check_apicid_used              = default_check_apicid_used,
        .init_apic_ldr                  = default_init_apic_ldr,
-       .ioapic_phys_id_map             = default_ioapic_phys_id_map,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
 
        .max_apic_id                    = 0xFE,

diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 59b05737fe3ecf4ae0563fcc9a8db23df3fce620..4926b127b230b25a13b081cfa320b779f35dc45b 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -231,9 +231,7 @@ static struct apic apic_x2apic_cluster __ro_after_init = {
 
        .disable_esr                    = 0,
 
-       .check_apicid_used              = NULL,
        .init_apic_ldr                  = init_x2apic_ldr,
-       .ioapic_phys_id_map             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
 
        .max_apic_id                    = UINT_MAX,