Now that we have a concise helper to create an MSI parent domain,
switch the GIC family over to that.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
drivers/irqchip/irq-gic-v2m.c | 12 +++++++-----
drivers/irqchip/irq-gic-v3-its.c | 19 +++++++++----------
drivers/irqchip/irq-gic-v3-mbi.c | 11 ++++++-----
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index 62676994d0695..9050792e3242f 100644
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -268,16 +268,18 @@ 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(&(struct irq_domain_info){
+ .fwnode = v2m->fwnode,
+ .ops = &gicv2m_domain_ops,
+ .host_data = v2m,
+ .parent = parent,
+ }, &gicv2m_msi_parent_ops);
+
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 9e6380f597488..9ea3a6723263c 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -5128,20 +5128,19 @@ 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(&(struct irq_domain_info){
+ .fwnode = its->fwnode_handle,
+ .ops = &its_domain_ops,
+ .host_data = info,
+ .domain_flags = its->msi_domain_flags,
+ .parent = its_parent,
+ }, &gic_v3_its_msi_parent_ops);
+
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 | IRQ_DOMAIN_FLAG_MSI_IMMUTABLE;
-
return 0;
}
@@ -5518,7 +5517,7 @@ static struct its_node __init *its_node_init(struct resource *res,
its->base = its_base;
its->phys_base = res->start;
its->get_msi_base = its_irq_get_msi_base;
- its->msi_domain_flags = IRQ_DOMAIN_FLAG_ISOLATED_MSI;
+ its->msi_domain_flags = IRQ_DOMAIN_FLAG_ISOLATED_MSI | IRQ_DOMAIN_FLAG_MSI_IMMUTABLE;
its->numa_node = numa_node;
its->fwnode_handle = handle;
diff --git a/drivers/irqchip/irq-gic-v3-mbi.c b/drivers/irqchip/irq-gic-v3-mbi.c
index e562b57923229..11fa5df9da8c7 100644
--- a/drivers/irqchip/irq-gic-v3-mbi.c
+++ b/drivers/irqchip/irq-gic-v3-mbi.c
@@ -208,14 +208,15 @@ 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(&(struct irq_domain_info){
+ .fwnode = parent->fwnode,
+ .ops = &mbi_domain_ops,
+ .parent = parent,
+ }, &gic_v3_mbi_msi_parent_ops);
+
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.2On Tue, May 13 2025 at 18:28, Marc Zyngier wrote:
> 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(&(struct irq_domain_info){
> + .fwnode = v2m->fwnode,
> + .ops = &gicv2m_domain_ops,
> + .host_data = v2m,
> + .parent = parent,
> + }, &gicv2m_msi_parent_ops);
> +
This really makes my eyes bleed.
if (!v2m)
return 0;
- inner_domain = irq_domain_create_hierarchy(parent, 0, 0, v2m->fwnode,
- &gicv2m_domain_ops, v2m);
+ struct irq_domain_info info = {
+ .fwnode = v2m->fwnode,
+ .ops = &gicv2m_domain_ops,
+ .host_data = v2m,
+ .parent = parent,
+ };
+
+ inner_domain = msi_create_parent_irq_domain(&info, &gicv2m_msi_parent_ops);
That's too readable, right?
No need to resend, I just hacked up a few lines of coccinelle script to
eliminate this offense.
Thanks,
tglx
On Fri, 16 May 2025 11:36:07 +0100,
Thomas Gleixner <tglx@linutronix.de> wrote:
>
> On Tue, May 13 2025 at 18:28, Marc Zyngier wrote:
> > 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(&(struct irq_domain_info){
> > + .fwnode = v2m->fwnode,
> > + .ops = &gicv2m_domain_ops,
> > + .host_data = v2m,
> > + .parent = parent,
> > + }, &gicv2m_msi_parent_ops);
> > +
>
> This really makes my eyes bleed.
>
> if (!v2m)
> return 0;
>
> - inner_domain = irq_domain_create_hierarchy(parent, 0, 0, v2m->fwnode,
> - &gicv2m_domain_ops, v2m);
> + struct irq_domain_info info = {
> + .fwnode = v2m->fwnode,
> + .ops = &gicv2m_domain_ops,
> + .host_data = v2m,
> + .parent = parent,
> + };
> +
> + inner_domain = msi_create_parent_irq_domain(&info, &gicv2m_msi_parent_ops);
>
> That's too readable, right?
>
> No need to resend, I just hacked up a few lines of coccinelle script to
> eliminate this offense.
I personally find the rework much uglier than the original contraption.
Variables declared in the middle of the code, Rust-style? Meh.
But hey, your call.
M.
--
Without deviation from the norm, progress is not possible.
On Fri, May 16 2025 at 11:47, Marc Zyngier wrote:
> On Fri, 16 May 2025 11:36:07 +0100,
> Thomas Gleixner <tglx@linutronix.de> wrote:
>> No need to resend, I just hacked up a few lines of coccinelle script to
>> eliminate this offense.
>
> I personally find the rework much uglier than the original contraption.
> Variables declared in the middle of the code, Rust-style? Meh.
That's not a Rust invention and we already moved over to do this to make
the __free() magic more obvious.
Thanks,
tglx
The following commit has been merged into the irq/msi branch of tip:
Commit-ID: c6b77822347afc17623120dbc4d10c6658304622
Gitweb: https://git.kernel.org/tip/c6b77822347afc17623120dbc4d10c6658304622
Author: Marc Zyngier <maz@kernel.org>
AuthorDate: Tue, 13 May 2025 18:28:13 +01:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 16 May 2025 21:32:20 +02:00
irqchip/gic: Convert to msi_create_parent_irq_domain() helper
Switch the GIC family of interrupt chip drivers over to the common helper
function to create the interrupt domains.
[ tglx: Moved the struct out of the function call argument ]
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250513172819.2216709-4-maz@kernel.org
---
drivers/irqchip/irq-gic-v2m.c | 16 ++++++++--------
drivers/irqchip/irq-gic-v3-its.c | 22 +++++++++-------------
drivers/irqchip/irq-gic-v3-mbi.c | 16 ++++++----------
3 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index 6267699..102f171 100644
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -261,23 +261,23 @@ static struct msi_parent_ops gicv2m_msi_parent_ops = {
static __init int gicv2m_allocate_domains(struct irq_domain *parent)
{
- struct irq_domain *inner_domain;
+ struct irq_domain_info info = {
+ .ops = &gicv2m_domain_ops,
+ .parent = parent,
+ };
struct v2m_data *v2m;
v2m = list_first_entry_or_null(&v2m_nodes, struct v2m_data, entry);
if (!v2m)
return 0;
- inner_domain = irq_domain_create_hierarchy(parent, 0, 0, v2m->fwnode,
- &gicv2m_domain_ops, v2m);
- if (!inner_domain) {
+ info.host_data = v2m;
+ info.fwnode = v2m->fwnode;
+
+ if (!msi_create_parent_irq_domain(&info, &gicv2m_msi_parent_ops)) {
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 d651cd4..57ecf5b 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -5122,7 +5122,12 @@ out_unmap:
static int its_init_domain(struct its_node *its)
{
- struct irq_domain *inner_domain;
+ struct irq_domain_info dom_info = {
+ .fwnode = its->fwnode_handle,
+ .ops = &its_domain_ops,
+ .domain_flags = its->msi_domain_flags,
+ .parent = its_parent,
+ };
struct msi_domain_info *info;
info = kzalloc(sizeof(*info), GFP_KERNEL);
@@ -5131,21 +5136,12 @@ static int its_init_domain(struct its_node *its)
info->ops = &its_msi_domain_ops;
info->data = its;
+ dom_info.host_data = info;
- inner_domain = irq_domain_create_hierarchy(its_parent,
- its->msi_domain_flags, 0,
- its->fwnode_handle, &its_domain_ops,
- info);
- if (!inner_domain) {
+ if (!msi_create_parent_irq_domain(&dom_info, &gic_v3_its_msi_parent_ops)) {
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 | IRQ_DOMAIN_FLAG_MSI_IMMUTABLE;
-
return 0;
}
@@ -5522,7 +5518,7 @@ static struct its_node __init *its_node_init(struct resource *res,
its->base = its_base;
its->phys_base = res->start;
its->get_msi_base = its_irq_get_msi_base;
- its->msi_domain_flags = IRQ_DOMAIN_FLAG_ISOLATED_MSI;
+ its->msi_domain_flags = IRQ_DOMAIN_FLAG_ISOLATED_MSI | IRQ_DOMAIN_FLAG_MSI_IMMUTABLE;
its->numa_node = numa_node;
its->fwnode_handle = handle;
diff --git a/drivers/irqchip/irq-gic-v3-mbi.c b/drivers/irqchip/irq-gic-v3-mbi.c
index e562b57..6a4afd1 100644
--- a/drivers/irqchip/irq-gic-v3-mbi.c
+++ b/drivers/irqchip/irq-gic-v3-mbi.c
@@ -206,17 +206,13 @@ static const struct msi_parent_ops gic_v3_mbi_msi_parent_ops = {
static int mbi_allocate_domain(struct irq_domain *parent)
{
- struct irq_domain *nexus_domain;
+ struct irq_domain_info info = {
+ .fwnode = parent->fwnode,
+ .ops = &mbi_domain_ops,
+ .parent = parent,
+ };
- nexus_domain = irq_domain_create_hierarchy(parent, 0, 0, parent->fwnode,
- &mbi_domain_ops, NULL);
- 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;
+ return msi_create_parent_irq_domain(&info, &gic_v3_mbi_msi_parent_ops) ? 0 : -ENOMEM;
}
int __init mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent)© 2016 - 2025 Red Hat, Inc.