Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 09:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

irqdomain: Always associate interrupts for legacy domains

Browse Source 
The unification of irq_domain_create_legacy() missed the fact that
interrupts must be associated even when the Linux interrupt number provided
in the first_irq argument is 0.

This breaks all call sites of irq_domain_create_legacy() which supply 0 as
the first_irq argument.

Enforce the association for legacy domains in __irq_domain_instantiate() to
cure this.

[ tglx: Massaged it slightly. ]

Fixes: 70114e7f75 ("irqdomain: Simplify simple and legacy domain creation")
Reported-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by Matti Vaittinen <mazziesaccount@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Link: https://lore.kernel.org/all/c3379142-10bc-4f14-b8ac-a46927aeac38@gmail.com
This commit is contained in:
Matti Vaittinen 2024-08-13 14:34:27 +03:00 committed by Thomas Gleixner
parent 7b9414cb2d
commit 24d02c4e53
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/irq/irqdomain.c
View File

@ -306,7 +306,7 @@ 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, static struct irq_domain *__irq_domain_instantiate(const struct irq_domain_info *info,
bool cond_alloc_descs) bool cond_alloc_descs, bool force_associate)
{ {
struct irq_domain *domain; struct irq_domain *domain;
int err; int err;
@ -342,8 +342,12 @@ static struct irq_domain *__irq_domain_instantiate(const struct irq_domain_info
if (cond_alloc_descs && info->virq_base > 0) if (cond_alloc_descs && info->virq_base > 0)
irq_domain_instantiate_descs(info); irq_domain_instantiate_descs(info);
/* Legacy interrupt domains have a fixed Linux interrupt number */ /*
if (info->virq_base > 0) { * Legacy interrupt domains have a fixed Linux interrupt number
* associated. Other interrupt domains can request association by
* providing a Linux interrupt number > 0.
*/
if (force_associate || info->virq_base > 0) {
irq_domain_associate_many(domain, info->virq_base, info->hwirq_base, irq_domain_associate_many(domain, info->virq_base, info->hwirq_base,
info->size - info->hwirq_base); info->size - info->hwirq_base);
} }
@ -366,7 +370,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) 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); EXPORT_SYMBOL_GPL(irq_domain_instantiate);
@ -470,7 +474,7 @@ struct irq_domain *irq_domain_create_simple(struct fwnode_handle *fwnode,
.ops = ops, .ops = ops,
.host_data = host_data, .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; return IS_ERR(domain) ? NULL : domain;
} }
@ -519,7 +523,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode,
.ops = ops, .ops = ops,
.host_data = host_data, .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; return IS_ERR(domain) ? NULL : domain;
} }