irqdomain: Fix irq_domain_create_legacy() when first_irq is 0
Subsystems (2)
PATCH 1/1 irqdomain: Fix irq_domain_create_legacy() when first_irq is 0
commit 70114e7f7585 ("irqdomain: Simplify simple and legacy domain creation") changed logic of calling the irq_domain_associate_many() from the irq_domain_create_legacy() when first_irq is set to 0. Before the change, the irq_domain_associate_many() is unconditionally called inside the irq_domain_create_legacy(). After the change, the call is omitted when first_irq is set to 0. This breaks MIPS systemns where drivers/irqchip/irq-mips-cpu.c has irq_domain_add_legacy() called with first_irq set to 0.
Fixes 70114e7f7585 ("irqdomain: Simplify simple and legacy domain creation")
Signed-off-by Matti Vaittinen <[email protected]>
---
This was tested on MIPS by Jiaxun. Please feel free to add the tested-by line if you like :)
kernel/irq/irqdomain.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/irq/irqdomain.c +6 -6
@@ -300,7 +300,8 @@ static void irq_domain_instantiate_descs(const struct irq_domain_info *info) }static struct irq_domain *__irq_domain_instantiate (const struct irq_domain_info *info, -bool cond_alloc_descs) +bool cond_alloc_descs, +bool cond_force_associate) {struct irq_domain *domain;int err;
@@ -337,10 +338,9 @@ static struct irq_domain *__irq_domain_instantiate(const struct irq_domain_infoirq_domain_instantiate_descs (info);/* Legacy interrupt domains have a fixed Linux interrupt number */ -if (info->virq_base >0 ) { +if (cond_force_associate || info->virq_base >0 )irq_domain_associate_many (domain, info->virq_base, info->hwirq_base, info->size - info->hwirq_base); - }return domain;
@@ -360,7 +360,7 @@ static struct irq_domain *__irq_domain_instantiate(const struct irq_domain_info*/ struct irq_domain *irq_domain_instantiate (const struct irq_domain_info *info) { -return __irq_domain_instantiate (info, false); +return __irq_domain_instantiate (info, false, false); }EXPORT_SYMBOL_GPL (irq_domain_instantiate);
@@ -464,7 +464,7 @@ struct irq_domain *irq_domain_create_simple(struct fwnode_handle *fwnode, .ops = ops, .host_data = host_data, }; -struct irq_domain *domain =__irq_domain_instantiate (&info, true); +struct irq_domain *domain =__irq_domain_instantiate (&info, true, false);return IS_ERR (domain) ?NULL : domain; }
@@ -513,7 +513,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode, .ops = ops, .host_data = host_data, }; -struct irq_domain *domain =irq_domain_instantiate (&info); +struct irq_domain *domain =__irq_domain_instantiate (&info, false, true);return IS_ERR (domain) ?NULL : domain; }
base-commit: 1e7c05292531e5b6bebe409cd531ed4ec0b2ff56
Signature · 14 lines
2.45.2 -- Matti Vaittinen, Linux device drivers ROHM Semiconductors, Finland SWDC Kiviharjunlenkki 1E 90220 OULU FINLAND ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~ Simon says - in Latin please. ~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~ Thanks to Simon Glass for the translation =]