[PATCH 03/11] irqchip/gic: Convert to msi_create_parent_irq_domain() helper

Marc Zyngier
2024-12-04T12:46:07Z

switch the GIC family over to that.

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
drivers/irqchip/irq-gic-v2m.c | 9 ++++-----
drivers/irqchip/irq-gic-v3-its.c | 14 +++++---------
drivers/irqchip/irq-gic-v3-mbi.c | 9 ++++-----
3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index db79ae622f3c4..4916743aed314 100644
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -270,16 +270,15 @@ static __init int gicv2m_allocate_domains(struct irq_domain *parent)
if (!v2m)
return 0;

- inner_domain = irq_domain_create_hierarchy(parent, 0, 0, v2m->fwnode,
- &gicv2m_domain_ops, v2m);
+ inner_domain = msi_create_parent_irq_domain(v2m->fwnode,
+ &gicv2m_msi_parent_ops,
+ &gicv2m_domain_ops,
+ 0, 0, v2m, parent);
if (!inner_domain) {
pr_err("Failed to create GICv2m domain\n");
return -ENOMEM;
}

- irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_NEXUS);
- inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT;
- inner_domain->msi_parent_ops = &gicv2m_msi_parent_ops;
return 0;
}

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 334fd15be1de1..6f61ee7c5d394 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -5114,20 +5114,16 @@ static int its_init_domain(struct its_node *its)
info->ops = &its_msi_domain_ops;
info->data = its;

- inner_domain = irq_domain_create_hierarchy(its_parent,
- its->msi_domain_flags, 0,
- its->fwnode_handle, &its_domain_ops,
- info);
+ inner_domain = msi_create_parent_irq_domain(its->fwnode_handle,
+ &gic_v3_its_msi_parent_ops,
+ &its_domain_ops,
+ its->msi_domain_flags, 0,
+ info, its_parent);
if (!inner_domain) {
kfree(info);
return -ENOMEM;
}

- irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_NEXUS);
-
- inner_domain->msi_parent_ops = &gic_v3_its_msi_parent_ops;
- inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT;
-
return 0;
}

diff --git a/drivers/irqchip/irq-gic-v3-mbi.c b/drivers/irqchip/irq-gic-v3-mbi.c
index 63c658375fd55..e5f532f95148d 100644
--- a/drivers/irqchip/irq-gic-v3-mbi.c
+++ b/drivers/irqchip/irq-gic-v3-mbi.c
@@ -211,14 +211,13 @@ static int mbi_allocate_domain(struct irq_domain *parent)
{
struct irq_domain *nexus_domain;

- nexus_domain = irq_domain_create_hierarchy(parent, 0, 0, parent->fwnode,
- &mbi_domain_ops, NULL);
+ nexus_domain = msi_create_parent_irq_domain(parent->fwnode,
+ &gic_v3_mbi_msi_parent_ops,
+ &mbi_domain_ops,
+ 0, 0, NULL, parent);
if (!nexus_domain)
return -ENOMEM;

- irq_domain_update_bus_token(nexus_domain, DOMAIN_BUS_NEXUS);
- nexus_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT;
- nexus_domain->msi_parent_ops = &gic_v3_mbi_msi_parent_ops;
return 0;
}

--
2.39.2