[PATCH] irqdomain: Allow ACPI device nodes to be used as irqdomain identifiers

[PATCH] irqdomain: Allow ACPI device nodes to be used as irqdomain identifiers

[Marc Zyngier]

A number of irqchip implementations are (ab)using the irqdomain
allocator by passing a fwnode that is neither a FWNODE_OF or
a FWNODE_IRQCHIP.

This is pretty bad, but it also feels pretty crap to force these
drivers to allocate their own irqchip_fwid when they already have
a proper fwnode.

Instead, let's teach the irqdomain allocator about ACPI device
nodes, and add some lovely name generation code... Tested on
an arm64 D05 system.

Reported-by: John Garry <john.garry@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 kernel/irq/irqdomain.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 14fe862aa2e3..71ed8a849345 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -1,5 +1,6 @@
 #define pr_fmt(fmt)  "irq: " fmt
 
+#include <linux/acpi.h>
 #include <linux/debugfs.h>
 #include <linux/hardirq.h>
 #include <linux/interrupt.h>
@@ -155,6 +156,21 @@ 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 (of_node) {
 		char *name;
 
-- 
2.11.0

Re: [PATCH] irqdomain: Allow ACPI device nodes to be used as irqdomain identifiers

[John Garry]

On 07/07/2017 09:39, Marc Zyngier wrote:
> A number of irqchip implementations are (ab)using the irqdomain
> allocator by passing a fwnode that is neither a FWNODE_OF or
> a FWNODE_IRQCHIP.
>
> This is pretty bad, but it also feels pretty crap to force these
> drivers to allocate their own irqchip_fwid when they already have
> a proper fwnode.
>
> Instead, let's teach the irqdomain allocator about ACPI device
> nodes, and add some lovely name generation code... Tested on
> an arm64 D05 system.
>

Thanks

FWIW, since I reported the issue:
Tested-by: John Garry <john.garry@huawei.com>

[tip:irq/urgent] irqdomain: Allow ACPI device nodes to be used as irqdomain identifiers

[tip-bot for Marc Zyngier]

Commit-ID:  c5c601c4295f89368f4a304cb3ae4aebdf80db22
Gitweb:     http://git.kernel.org/tip/c5c601c4295f89368f4a304cb3ae4aebdf80db22
Author:     Marc Zyngier <marc.zyngier@arm.com>
AuthorDate: Fri, 7 Jul 2017 09:39:59 +0100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri, 7 Jul 2017 12:13:29 +0200

irqdomain: Allow ACPI device nodes to be used as irqdomain identifiers

A number of irqchip implementations are (ab)using the irqdomain allocator
by passing a fwnode that is neither a FWNODE_OF or a FWNODE_IRQCHIP.

This is pretty bad, but it also feels pretty crap to force these drivers to
allocate their own irqchip_fwid when they already have a proper fwnode.

Instead, let's teach the irqdomain allocator about ACPI device nodes, and
add some lovely name generation code... Tested on an arm64 D05 system.

Reported-and-tested-by: John Garry <john.garry@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Agustin Vega-Frias <agustinv@codeaurora.org>
Cc: Ma Jun <majun258@huawei.com>
Cc: Hanjun Guo <hanjun.guo@linaro.org>
Link: http://lkml.kernel.org/r/20170707083959.10349-1-marc.zyngier@arm.com

---
 kernel/irq/irqdomain.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index ed47688..f1f2514 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -1,5 +1,6 @@
 #define pr_fmt(fmt)  "irq: " fmt
 
+#include <linux/acpi.h>
 #include <linux/debugfs.h>
 #include <linux/hardirq.h>
 #include <linux/interrupt.h>
@@ -155,6 +156,21 @@ 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 (of_node) {
 		char *name;
 

Re: [PATCH] irqdomain: Allow ACPI device nodes to be used as irqdomain identifiers

[Hanjun Guo]

On 2017/7/7 16:39, Marc Zyngier wrote:
> A number of irqchip implementations are (ab)using the irqdomain
> allocator by passing a fwnode that is neither a FWNODE_OF or
> a FWNODE_IRQCHIP.
>
> This is pretty bad, but it also feels pretty crap to force these
> drivers to allocate their own irqchip_fwid when they already have
> a proper fwnode.
>
> Instead, let's teach the irqdomain allocator about ACPI device
> nodes, and add some lovely name generation code... Tested on
> an arm64 D05 system.
>
> Reported-by: John Garry <john.garry@huawei.com>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
>  kernel/irq/irqdomain.c | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)

Thomas already queued this patch, but I did a test on D03
and it works.

Thanks
Hanjun