irqdomain: Make __irq_domain_add() less OF-dependent
Subsystems (3)
PATCH 1/3 irqdomain: Make __irq_domain_add() less OF-dependent
__irq_domain_add() in some places relies on the fact that fwnode can be only type of OF. This prevents refactoring of the code to support other types of fwnode. Make it less OF-dependent by switching to use fwnode directly where it makes sense.
--- kernel/irq/irqdomain.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
kernel/irq/irqdomain.c +6 -7
@@ -132,14 +132,13 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size,const struct irq_domain_ops *ops, void *host_data) { - struct device_node *of_node = to_of_node(fwnode); struct irqchip_fwid *fwid;struct irq_domain *domain;static atomic_t unknown_domains; domain =kzalloc_node (sizeof (*domain) + (sizeof (unsigned int ) * size), -GFP_KERNEL ,of_node_to_nid (of_node)); +GFP_KERNEL ,of_node_to_nid (to_of_node (fwnode)));if (!domain)return NULL ;
@@ -177,15 +176,15 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, domain->fwnode = fwnode;#endif - }else if (of_node) { + }else if (is_of_node (fwnode)) {char *name;/* -* DT paths contain '/', which debugfs is legitimately +* fwnode paths contain '/', which debugfs is legitimately * unhappy about. Replace them with ':', which does * the trick and is not as offensive as '\'... */ - name =kasprintf (GFP_KERNEL ,"%pOF" , of_node); + name =kasprintf (GFP_KERNEL ,"%pfw" , fwnode);if (!name) {kfree (domain);return NULL ;
@@ -210,7 +209,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, domain->flags |=IRQ_DOMAIN_NAME_ALLOCATED ; } -of_node_get (of_node); +fwnode_handle_get (fwnode);/* Fill structure */ INIT_RADIX_TREE (&domain->revmap_tree,GFP_KERNEL );
@@ -259,7 +258,7 @@ void irq_domain_remove(struct irq_domain *domain)pr_debug ("Removed domain %s\n" , domain->name); -of_node_put (irq_domain_get_of_node (domain)); +fwnode_handle_put (domain->fwnode);if (domain->flags &IRQ_DOMAIN_NAME_ALLOCATED )kfree (domain->name);kfree (domain);
Signature · 1 line
2.26.2
PATCH 2/3 irqdomain: Get rid of special treatment for ACPI in __irq_domain_add()
After change __irq_domain_add() to cooperate better with fwnodes we don't need to have special treatment for ACPI case.
Get rid of the special treatment for ACPI.
--- kernel/irq/irqdomain.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
kernel/irq/irqdomain.c +1 -16
@@ -161,22 +161,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, domain->name = fwid->name;break ; } -#ifdef CONFIG_ACPI - }else if (is_acpi_device_node (fwnode)) { -struct acpi_buffer buf = { - .length =ACPI_ALLOCATE_BUFFER , - }; -acpi_handle handle; - - handle =acpi_device_handle (to_acpi_device_node (fwnode)); -if (acpi_get_name (handle,ACPI_FULL_PATHNAME , &buf) ==AE_OK ) { - domain->name = buf.pointer; - domain->flags |=IRQ_DOMAIN_NAME_ALLOCATED ; - } - - domain->fwnode = fwnode; -#endif - }else if (is_of_node (fwnode)) { + }else if (is_of_node (fwnode) ||is_acpi_device_node (fwnode)) {char *name;/*
Signature · 1 line
2.26.2
[tip: irq/core] irqdomain: Get rid of special treatment for ACPI in __irq_domain_add()
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 87526603c89256e18ad2c23821fdaf376b072fc8 Gitweb: https://git.kernel.org/tip/87526603c89256e18ad2c23821fdaf376b072fc8 Author: Andy Shevchenko <[email protected]> AuthorDate: Wed, 20 May 2020 19:49:26 +03:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Thu, 21 May 2020 10:51:50 +01:00
irqdomain: Get rid of special treatment for ACPI in __irq_domain_add()
Now that __irq_domain_add() is able to better deals with generic fwnodes, there is no need to special-case ACPI anymore.
Get rid of the special treatment for ACPI.
--- kernel/irq/irqdomain.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
kernel/irq/irqdomain.c +1 -16
@@ -161,22 +161,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, domain->name = fwid->name;break ; } -#ifdef CONFIG_ACPI - }else if (is_acpi_device_node (fwnode)) { -struct acpi_buffer buf = { - .length =ACPI_ALLOCATE_BUFFER , - }; -acpi_handle handle; - - handle =acpi_device_handle (to_acpi_device_node (fwnode)); -if (acpi_get_name (handle,ACPI_FULL_PATHNAME , &buf) ==AE_OK ) { - domain->name = buf.pointer; - domain->flags |=IRQ_DOMAIN_NAME_ALLOCATED ; - } - - domain->fwnode = fwnode; -#endif - }else if (is_of_node (fwnode)) { + }else if (is_of_node (fwnode) ||is_acpi_device_node (fwnode)) {char *name;/*
PATCH 3/3 irqdomain: Allow software node to be correct one for IRQ domain
In reply to Andy ShevchenkoIn some cases we might need to have an IRQ domain created out of software node. One of such cases is DesignWare GPIO driver when it's instantiated from half-baked ACPI table (alas, we can't fix it for devices which are few years on market) and thus using software nodes to quirk this up. But the driver is using IRQ domains based on per GPIO port firmware nodes, which are in the above case software ones. This brings a warning message to be printed
[ 73.957183] irq: Invalid fwnode type for irqdomain
and creates an unknown IRQ domain.
When we allow software node to be correct one for IRQ domain we will get rid of the warning message and nice domain name at the same time:
% ls -1 /sys/kernel/debug/irq/domains/
...
intel-quark-dw-apb-gpio:portA
--- kernel/irq/irqdomain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/irq/irqdomain.c +2 -1
@@ -161,7 +161,8 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, domain->name = fwid->name;break ; } - }else if (is_of_node (fwnode) ||is_acpi_device_node (fwnode)) { + }else if (is_of_node (fwnode) ||is_acpi_device_node (fwnode) || +is_software_node (fwnode)) {char *name;/*
Signature · 1 line
2.26.2
Re: [PATCH v1 3/3] irqdomain: Allow software node to be correct one for IRQ domain
Hi Andy,
Quoted 37 lines · Andy Shevchenko
In some cases we might need to have an IRQ domain created out of software node. One of such cases is DesignWare GPIO driver when it's instantiated from half-baked ACPI table (alas, we can't fix it for devices which are few years on market) and thus using software nodes to quirk this up. But the driver is using IRQ domains based on per GPIO port firmware nodes, which are in the above case software ones. This brings a warning message to be printed
[ 73.957183] irq: Invalid fwnode type for irqdomainand creates an unknown IRQ domain.
When we allow software node to be correct one for IRQ domain we will get rid of the warning message and nice domain name at the same time:
% ls -1
/sys/kernel/debug/irq/domains/
...
intel-quark-dw-apb-gpio:portASigned-off-by Andy Shevchenko <[email protected]>--- kernel/irq/irqdomain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)kernel/irq/irqdomain.c +2
-1@@ -161,7 +161,8 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, domain->name = fwid->name;break ; } - }else if (is_of_node (fwnode) ||is_acpi_device_node (fwnode)) { + }else if (is_of_node (fwnode) ||is_acpi_device_node (fwnode) || +is_software_node (fwnode)) {char *name;
Quoted 1 line
/*
Thanks for this. I've applied it to irqchip-next. In the future, please consider adding a cover letter describing the overall goal of the series.
Cheers,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Re: [PATCH v1 3/3] irqdomain: Allow software node to be correct one for IRQ domain
Quoted 3 lines · Marc Zyngier
On 2020-05-20 17:49, Andy Shevchenko wrote:
Thanks for this. I've applied it to irqchip-next.
Thank you, Marc!
Quoted 3 lines
In the future,
please consider adding a cover letter describing the overall goal of the series.
I will keep in mind and follow.
Signature · 2 lines
With Best Regards, Andy Shevchenko
[tip: irq/core] irqdomain: Allow software nodes for IRQ domain creation
In reply to Andy ShevchenkoThe following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 9ed78b05f998050784ae863bd5ba4aea2e2141ed Gitweb: https://git.kernel.org/tip/9ed78b05f998050784ae863bd5ba4aea2e2141ed Author: Andy Shevchenko <[email protected]> AuthorDate: Wed, 20 May 2020 19:49:27 +03:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Thu, 21 May 2020 10:53:17 +01:00
irqdomain: Allow software nodes for IRQ domain creation
In some cases we need to have an IRQ domain created out of software node.
One of such cases is DesignWare GPIO driver when it's instantiated from half-baked ACPI table (alas, we can't fix it for devices which are few years on market) and thus using software nodes to quirk this. But the driver is using IRQ domains based on per GPIO port firmware nodes, which are in the above case software ones. This brings a warning message to be printed
[ 73.957183] irq: Invalid fwnode type for irqdomain
and creates an anonymous IRQ domain without a debugfs entry.
Allowing software nodes to be valid for IRQ domains rids us of the warning and debugs gets correctly populated.
% ls -1 /sys/kernel/debug/irq/domains/
...
intel-quark-dw-apb-gpio:portA
--- kernel/irq/irqdomain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/irq/irqdomain.c +2 -1
@@ -161,7 +161,8 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, domain->name = fwid->name;break ; } - }else if (is_of_node (fwnode) ||is_acpi_device_node (fwnode)) { + }else if (is_of_node (fwnode) ||is_acpi_device_node (fwnode) || +is_software_node (fwnode)) {char *name;/*
The following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 181e9d4efaf6aa8d1e7d510aeb7114c0f276fad7 Gitweb: https://git.kernel.org/tip/181e9d4efaf6aa8d1e7d510aeb7114c0f276fad7 Author: Andy Shevchenko <[email protected]> AuthorDate: Wed, 20 May 2020 19:49:25 +03:00 Committer: Marc Zyngier <[email protected]> CommitterDate: Thu, 21 May 2020 10:50:30 +01:00
irqdomain: Make __irq_domain_add() less OF-dependent
__irq_domain_add() relies in some places on the fact that the fwnode can be only of type OF. This prevents refactoring of the code to support other types of fwnode. Make it less OF-dependent by switching it to use the fwnode directly where it makes sense.
--- kernel/irq/irqdomain.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
kernel/irq/irqdomain.c +6 -7
@@ -132,14 +132,13 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size,const struct irq_domain_ops *ops, void *host_data) { - struct device_node *of_node = to_of_node(fwnode); struct irqchip_fwid *fwid;struct irq_domain *domain;static atomic_t unknown_domains; domain =kzalloc_node (sizeof (*domain) + (sizeof (unsigned int ) * size), -GFP_KERNEL ,of_node_to_nid (of_node)); +GFP_KERNEL ,of_node_to_nid (to_of_node (fwnode)));if (!domain)return NULL ;
@@ -177,15 +176,15 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, domain->fwnode = fwnode;#endif - }else if (of_node) { + }else if (is_of_node (fwnode)) {char *name;/* -* DT paths contain '/', which debugfs is legitimately +* fwnode paths contain '/', which debugfs is legitimately * unhappy about. Replace them with ':', which does * the trick and is not as offensive as '\'... */ - name =kasprintf (GFP_KERNEL ,"%pOF" , of_node); + name =kasprintf (GFP_KERNEL ,"%pfw" , fwnode);if (!name) {kfree (domain);return NULL ;
@@ -210,7 +209,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, domain->flags |=IRQ_DOMAIN_NAME_ALLOCATED ; } -of_node_get (of_node); +fwnode_handle_get (fwnode);/* Fill structure */ INIT_RADIX_TREE (&domain->revmap_tree,GFP_KERNEL );
@@ -259,7 +258,7 @@ void irq_domain_remove(struct irq_domain *domain)pr_debug ("Removed domain %s\n" , domain->name); -of_node_put (irq_domain_get_of_node (domain)); +fwnode_handle_put (domain->fwnode);if (domain->flags &IRQ_DOMAIN_NAME_ALLOCATED )kfree (domain->name);kfree (domain);