2017-07-07 08:40:11

by Marc Zyngier

Subject: [PATCH] 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-by: John Garry <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
---
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

2017-07-07 09:26:18

by John Garry

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

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 <[email protected]>

2017-07-07 10:18:38

by tip-bot for Vasyl Gomonovych

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

Commit-ID: c5c601c4295f89368f4a304cb3ae4aebdf80db22
Gitweb: http://git.kernel.org/tip/c5c601c4295f89368f4a304cb3ae4aebdf80db22
Author: Marc Zyngier <[email protected]>
AuthorDate: Fri, 7 Jul 2017 09:39:59 +0100
Committer: Thomas Gleixner <[email protected]>
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 <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Agustin Vega-Frias <[email protected]>
Cc: Ma Jun <[email protected]>
Cc: Hanjun Guo <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]

---
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;

2017-07-07 11:49:39

by Hanjun Guo

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

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 <[email protected]>
> Signed-off-by: Marc Zyngier <[email protected]>
> ---
> 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