superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

irqdomain: Handle domain bus token in irq_domain_create() 

irq_domain_update_bus_token() is the only way to set the domain bus
token. This is sub-optimal as irq_domain_update_bus_token() can be called
only once the domain is created and needs to revert some operations, change
the domain name and redo the operations.

In order to avoid this revert/change/redo sequence, take the domain bus
into account token during the domain creation.

Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240614173232.1184015-12-herve.codina@bootlin.com
pull/923/head
Herve Codina 2024-06-14 19:32:12 +02:00 committed by Thomas Gleixner
parent 80f6abe0d3
commit 0b21add71b
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/irqdomain.h
View File

@ -265,6 +265,7 @@ void irq_domain_free_fwnode(struct fwnode_handle *fwnode);
* @hwirq_max: Maximum number of interrupts supported by controller * @hwirq_max: Maximum number of interrupts supported by controller
* @direct_max: Maximum value of direct maps; * @direct_max: Maximum value of direct maps;
* Use ~0 for no limit; 0 for no direct mapping * Use ~0 for no limit; 0 for no direct mapping
* @bus_token: Domain bus token
* @ops: Domain operation callbacks * @ops: Domain operation callbacks
* @host_data: Controller private data pointer * @host_data: Controller private data pointer
*/ */
@ -274,6 +275,7 @@ struct irq_domain_info {
unsigned int size; unsigned int size;
irq_hw_number_t hwirq_max; irq_hw_number_t hwirq_max;
int direct_max; int direct_max;
enum irq_domain_bus_token bus_token;
const struct irq_domain_ops *ops; const struct irq_domain_ops *ops;
void *host_data; void *host_data;
#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY #ifdef CONFIG_IRQ_DOMAIN_HIERARCHY

30
kernel/irq/irqdomain.c
View File

@ -129,7 +129,8 @@ void irq_domain_free_fwnode(struct fwnode_handle *fwnode)
EXPORT_SYMBOL_GPL(irq_domain_free_fwnode); EXPORT_SYMBOL_GPL(irq_domain_free_fwnode);
static int irq_domain_set_name(struct irq_domain *domain, static int irq_domain_set_name(struct irq_domain *domain,
const struct fwnode_handle *fwnode) const struct fwnode_handle *fwnode,
enum irq_domain_bus_token bus_token)
{ {
static atomic_t unknown_domains; static atomic_t unknown_domains;
struct irqchip_fwid *fwid; struct irqchip_fwid *fwid;
@ -140,13 +141,23 @@ static int irq_domain_set_name(struct irq_domain *domain,
switch (fwid->type) { switch (fwid->type) {
case IRQCHIP_FWNODE_NAMED: case IRQCHIP_FWNODE_NAMED:
case IRQCHIP_FWNODE_NAMED_ID: case IRQCHIP_FWNODE_NAMED_ID:
domain->name = kstrdup(fwid->name, GFP_KERNEL); domain->name = bus_token ?
kasprintf(GFP_KERNEL, "%s-%d",
fwid->name, bus_token) :
kstrdup(fwid->name, GFP_KERNEL);
if (!domain->name) if (!domain->name)
return -ENOMEM; return -ENOMEM;
domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED; domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
break; break;
default: default:
domain->name = fwid->name; domain->name = fwid->name;
if (bus_token) {
domain->name = kasprintf(GFP_KERNEL, "%s-%d",
fwid->name, bus_token);
if (!domain->name)
return -ENOMEM;
domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
}
break; break;
} }
} else if (is_of_node(fwnode) || is_acpi_device_node(fwnode) || } else if (is_of_node(fwnode) || is_acpi_device_node(fwnode) ||
@ -158,7 +169,9 @@ static int irq_domain_set_name(struct irq_domain *domain,
* unhappy about. Replace them with ':', which does * unhappy about. Replace them with ':', which does
* the trick and is not as offensive as '\'... * the trick and is not as offensive as '\'...
*/ */
name = kasprintf(GFP_KERNEL, "%pfw", fwnode); name = bus_token ?
kasprintf(GFP_KERNEL, "%pfw-%d", fwnode, bus_token) :
kasprintf(GFP_KERNEL, "%pfw", fwnode);
if (!name) if (!name)
return -ENOMEM; return -ENOMEM;
@ -169,8 +182,12 @@ static int irq_domain_set_name(struct irq_domain *domain,
if (!domain->name) { if (!domain->name) {
if (fwnode) if (fwnode)
pr_err("Invalid fwnode type for irqdomain\n"); pr_err("Invalid fwnode type for irqdomain\n");
domain->name = kasprintf(GFP_KERNEL, "unknown-%d", domain->name = bus_token ?
atomic_inc_return(&unknown_domains)); kasprintf(GFP_KERNEL, "unknown-%d-%d",
atomic_inc_return(&unknown_domains),
bus_token) :
kasprintf(GFP_KERNEL, "unknown-%d",
atomic_inc_return(&unknown_domains));
if (!domain->name) if (!domain->name)
return -ENOMEM; return -ENOMEM;
domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED; domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
@ -194,7 +211,7 @@ static struct irq_domain *__irq_domain_create(const struct irq_domain_info *info
if (!domain) if (!domain)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
err = irq_domain_set_name(domain, info->fwnode); err = irq_domain_set_name(domain, info->fwnode, info->bus_token);
if (err) { if (err) {
kfree(domain); kfree(domain);
return ERR_PTR(err); return ERR_PTR(err);
@ -207,6 +224,7 @@ static struct irq_domain *__irq_domain_create(const struct irq_domain_info *info
INIT_RADIX_TREE(&domain->revmap_tree, GFP_KERNEL); INIT_RADIX_TREE(&domain->revmap_tree, GFP_KERNEL);
domain->ops = info->ops; domain->ops = info->ops;
domain->host_data = info->host_data; domain->host_data = info->host_data;
domain->bus_token = info->bus_token;
domain->hwirq_max = info->hwirq_max; domain->hwirq_max = info->hwirq_max;
if (info->direct_max) if (info->direct_max)