x86/ioapic: Use I/O-APIC ID for finding irqdomain, not index

In commit b643128b917 ("x86/ioapic: Use irq_find_matching_fwspec() to
find remapping irqdomain") the I/O-APIC code was changed to find its
parent irqdomain using irq_find_matching_fwspec(), but the key used
for the lookup was wrong. It shouldn't use 'ioapic' which is the index
into its own ioapics[] array. It should use the actual arbitration
ID of the I/O-APIC in question, which is mpc_ioapic_id(ioapic).

Fixes: b643128b917 ("x86/ioapic: Use irq_find_matching_fwspec() to find remapping irqdomain")
Reported-by: lkp <oliver.sang@intel.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/57adf2c305cd0c5e9d860b2f3007a7e676fd0f9f.camel@infradead.org

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 1cfd65ef295b058a8b6099220695c570a227a361..0602c9533d17aeaf2c73f7aa5da424d7d0f5beed 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2345,14 +2345,14 @@ static int mp_irqdomain_create(int ioapic)
        if (cfg->dev) {
                fn = of_node_to_fwnode(cfg->dev);
        } else {
-               fn = irq_domain_alloc_named_id_fwnode("IO-APIC", ioapic);
+               fn = irq_domain_alloc_named_id_fwnode("IO-APIC", mpc_ioapic_id(ioapic));
                if (!fn)
                        return -ENOMEM;
        }
 
        fwspec.fwnode = fn;
        fwspec.param_count = 1;
-       fwspec.param[0] = ioapic;
+       fwspec.param[0] = mpc_ioapic_id(ioapic);
 
        parent = irq_find_matching_fwspec(&fwspec, DOMAIN_BUS_ANY);
        if (!parent) {