Skip to content

Commit c147e1e

Browse files
committed
x86/apic/msi: Use DOMAIN_BUS_GENERIC_MSI for HPET/IO-APIC domain search
The recent restriction to invoke irqdomain_ops::select() only when the domain bus token is not DOMAIN_BUS_ANY breaks the search for the parent MSI domain of HPET and IO-APIC. The latter causes a full boot fail. The restriction itself makes sense to avoid adding DOMAIN_BUS_ANY matches into the various ARM specific select() callbacks. Reverting this change would obviously break ARM platforms again and require DOMAIN_BUS_ANY matches added to various places. A simpler solution is to use the DOMAIN_BUS_GENERIC_MSI token for the HPET and IO-APIC parent domain search. This works out of the box because the affected parent domains check only for the firmware specification content and not for the bus token. Fixes: 5aa3c0c ("genirq/irqdomain: Don't call ops->select for DOMAIN_BUS_ANY tokens") Reported-by: Borislav Petkov (AMD) <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Tested-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/878r38cy8n.ffs@tglx
1 parent 5b98d21 commit c147e1e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/x86/kernel/apic/io_apic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2354,7 +2354,7 @@ static int mp_irqdomain_create(int ioapic)
23542354
fwspec.param_count = 1;
23552355
fwspec.param[0] = mpc_ioapic_id(ioapic);
23562356

2357-
parent = irq_find_matching_fwspec(&fwspec, DOMAIN_BUS_ANY);
2357+
parent = irq_find_matching_fwspec(&fwspec, DOMAIN_BUS_GENERIC_MSI);
23582358
if (!parent) {
23592359
if (!cfg->dev)
23602360
irq_domain_free_fwnode(fn);

arch/x86/kernel/hpet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ static struct irq_domain *hpet_create_irq_domain(int hpet_id)
568568
fwspec.param_count = 1;
569569
fwspec.param[0] = hpet_id;
570570

571-
parent = irq_find_matching_fwspec(&fwspec, DOMAIN_BUS_ANY);
571+
parent = irq_find_matching_fwspec(&fwspec, DOMAIN_BUS_GENERIC_MSI);
572572
if (!parent) {
573573
irq_domain_free_fwnode(fn);
574574
kfree(domain_info);

0 commit comments

Comments
 (0)