leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/ioapic: Use irq_find_matching_fwspec() to find remapping irqdomain

Browse Source 
All possible parent domains have a select method now. Make use of it.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201024213535.443185-29-dwmw2@infradead.org
This commit is contained in:
David Woodhouse 2020-10-24 22:35:28 +01:00 committed by Thomas Gleixner
parent c2a5881c28
commit b643128b91
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/x86/kernel/apic/io_apic.c
View File

@ -2320,36 +2320,37 @@ out:
static int mp_irqdomain_create(int ioapic) static int mp_irqdomain_create(int ioapic)
{ {
struct irq_alloc_info info;
struct irq_domain *parent; struct irq_domain *parent;
int hwirqs = mp_ioapic_pin_count(ioapic); int hwirqs = mp_ioapic_pin_count(ioapic);
struct ioapic *ip = &ioapics[ioapic]; struct ioapic *ip = &ioapics[ioapic];
struct ioapic_domain_cfg *cfg = &ip->irqdomain_cfg; struct ioapic_domain_cfg *cfg = &ip->irqdomain_cfg;
struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(ioapic); struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(ioapic);
struct fwnode_handle *fn; struct fwnode_handle *fn;
char *name = "IO-APIC"; struct irq_fwspec fwspec;
if (cfg->type == IOAPIC_DOMAIN_INVALID) if (cfg->type == IOAPIC_DOMAIN_INVALID)
return 0; return 0;
init_irq_alloc_info(&info, NULL);
info.type = X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT;
info.devid = mpc_ioapic_id(ioapic);
parent = irq_remapping_get_irq_domain(&info);
if (!parent)
parent = x86_vector_domain;
else
name = "IO-APIC-IR";
/* Handle device tree enumerated APICs proper */ /* Handle device tree enumerated APICs proper */
if (cfg->dev) { if (cfg->dev) {
fn = of_node_to_fwnode(cfg->dev); fn = of_node_to_fwnode(cfg->dev);
} else { } else {
fn = irq_domain_alloc_named_id_fwnode(name, ioapic); fn = irq_domain_alloc_named_id_fwnode("IO-APIC", ioapic);
if (!fn) if (!fn)
return -ENOMEM; return -ENOMEM;
} }
fwspec.fwnode = fn;
fwspec.param_count = 1;
fwspec.param[0] = ioapic;
parent = irq_find_matching_fwspec(&fwspec, DOMAIN_BUS_ANY);
if (!parent) {
if (!cfg->dev)
irq_domain_free_fwnode(fn);
return -ENODEV;
}
ip->irqdomain = irq_domain_create_linear(fn, hwirqs, cfg->ops, ip->irqdomain = irq_domain_create_linear(fn, hwirqs, cfg->ops,
(void *)(long)ioapic); (void *)(long)ioapic);