x86/ioapic: Simplify setup_ioapic_ids_from_mpc_nocheck()

No need to go through APIC callbacks. It's already established that this is
an ancient APIC. So just copy the present mask and use the direct physid*
functions all over the place.

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.181901887@linutronix.de

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 8dc91d075b6bf74a670954275ab08dd0f9d9ddb6..6285d880a64cc42bcb526d72049444740051a1e4 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1471,7 +1471,7 @@ static void __init setup_ioapic_ids_from_mpc_nocheck(void)
         * This is broken; anything with a real cpu count has to
         * circumvent this idiocy regardless.
         */
-       apic->ioapic_phys_id_map(&phys_cpu_present_map, &phys_id_present_map);
+       phys_id_present_map = phys_cpu_present_map;
 
        /*
         * Set the IOAPIC ID to the value stored in the MPC table.
@@ -1496,8 +1496,7 @@ static void __init setup_ioapic_ids_from_mpc_nocheck(void)
                 * system must have a unique ID or we get lots of nice
                 * 'stuck on smp_invalidate_needed IPI wait' messages.
                 */
-               if (apic->check_apicid_used(&phys_id_present_map,
-                                           mpc_ioapic_id(ioapic_idx))) {
+               if (physid_isset(mpc_ioapic_id(ioapic_idx), phys_id_present_map)) {
                        pr_err(FW_BUG "IO-APIC#%d ID %d is already used!...\n",
                               ioapic_idx, mpc_ioapic_id(ioapic_idx));
                        for (i = 0; i < broadcast_id; i++)