Skip to contentSkip to conversation

irqchip/gic-v3-its: Don't override quirk settings with default values

PATCH New Marc Zyngier 1 participant 1 message Oct 24, 2023

Subsystems (2)
lore
Share & tools
lore

Marc Zyngier

author maintainer
#0 lore raw

PATCH 1/1 irqchip/gic-v3-its: Don't override quirk settings with default values

When splitting the allocation of the ITS node from its configuration, some of the default settings were kept in the latter instead of being moved to the former.

This has the side effect of negating some of the quirk detection that have happened in between, amongst which the dreaded Synquacer hack (that also affect Dominic's TI platform).

Move the initialisation of these fields early, so that they can again be overriden by the Synquacer quirk.

Fixes 9585a495ac93 ("irqchip/gic-v3-its: Split allocation from initialisation of its_node")

Reported by: Dominic Rath <[email protected]>

---

Notes:
Hi Thomas,

This is an urgent, last-minute fix for a regression that I introduced in -rc6. I'd appreciate it if you could send it along to Linus before v6.6 gets released.

Thanks,

M.

 drivers/irqchip/irq-gic-v3-its.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +2 -2
index 75a2dd550625..a8c89df1a997 100644
@@ -5112,8 +5112,6 @@ static int __init its_probe_one(struct its_node *its)
 	}
 	its->cmd_base = (void *)page_address(page);
 	its->cmd_write = its->cmd_base;
-	its->get_msi_base = its_irq_get_msi_base;
-	its->msi_domain_flags = IRQ_DOMAIN_FLAG_ISOLATED_MSI;
 
 	err = its_alloc_tables(its);
 	if (err)
@@ -5362,6 +5360,8 @@ static struct its_node __init *its_node_init(struct resource *res,
 	its->typer = gic_read_typer(its_base + GITS_TYPER);
 	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->numa_node = numa_node;
 	its->fwnode_handle = handle;
Signature · 1 line
2.39.2