irqchip: qcom: Add IRQ combiner driver
v3 cover irqchip: qcom: Add IRQ combiner driver
Add support for IRQ combiners in the Top-level Control and Status Registers (TCSR) hardware block in Qualcomm Technologies chips.
The first patch adds support for ResourceSource/IRQ domain mapping when using Extended IRQ Resources with a specific ResourceSource. The core ACPI resource management code has been changed to lookup the IRQ domain when an IRQ resource indicates a ResourceSource, and register the IRQ on that domain, instead of a GSI.
The second patch takes advantage of the new capabilities to implement the driver for the IRQ combiners.
Changes V1 -> V2:
* Remove use of GPIO library for the combiner
* Refactor to use fwnode/ResourceSource to IRQ domain mapping introduced in ACPI core
Changes V2 -> V3:
* Removed parsing of _PRS to find IRQs
* Removed acpi_irq_domain_create and acpi_irq_domain_remove
Agustin Vega-Frias (2):
ACPI: Add support for ResourceSource/IRQ domain mapping
irqchip: qcom: Add IRQ combiner driver
drivers/acpi/Makefile | 1 + drivers/acpi/irqdomain.c | 108 +++++++++++ drivers/acpi/resource.c | 23 ++- drivers/irqchip/Kconfig | 8 + drivers/irqchip/Makefile | 1 + drivers/irqchip/qcom-irq-combiner.c | 344 ++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 + 7 files changed, 483 insertions(+), 8 deletions(-) create mode 100644 drivers/acpi/irqdomain.c create mode 100644 drivers/irqchip/qcom-irq-combiner.c
Signature · 3 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v3 1/2 ACPI: Add support for ResourceSource/IRQ domain mapping
This allows irqchip drivers to associate an ACPI DSDT device to an IRQ domain and provides support for using the ResourceSource in Extended IRQ Resources to find the domain and map the IRQs specified on that domain.
--- drivers/acpi/Makefile | 1 + drivers/acpi/irqdomain.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/acpi/resource.c | 23 ++++++---- include/linux/acpi.h | 6 +++ 4 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 drivers/acpi/irqdomain.c
drivers/acpi/Makefile +1 -0
@@ -56,6 +56,7 @@ acpi-$(CONFIG_ACPI_NUMA) += numa.o acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o acpi-y += acpi_lpat.o acpi-$(CONFIG_ACPI_GENERIC_GSI) += gsi.o +acpi-y += irqdomain.o # These are (potentially) separate modules
drivers/acpi/irqdomain.c new file +108 -0
108 lines not on this page · raw message
drivers/acpi/resource.c +15 -8
@@ -381,14 +381,15 @@ static void acpi_dev_irqresource_disabled(struct resource *res, u32 gsi) res->flags =IORESOURCE_IRQ |IORESOURCE_DISABLED |IORESOURCE_UNSET ; } -static void acpi_dev_get_irqresource (struct resource *res,u32 gsi, +static void acpi_dev_get_irqresource (struct resource *res,u32 rcirq, +struct acpi_resource_source *source,u8 triggering,u8 polarity,u8 shareable,bool legacy) {int irq, p, t; -if (!valid_IRQ (gsi)) { -acpi_dev_irqresource_disabled (res, gsi); +if ((source->string_length ==0 ) && !valid_IRQ (rcirq)) { +acpi_dev_irqresource_disabled (res, rcirq);return ; }
@@ -402,12 +403,12 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,* using extended IRQ descriptors we take the IRQ configuration * from _CRS directly. */ -if (legacy && !acpi_get_override_irq (gsi, &t, &p)) { +if (legacy && !acpi_get_override_irq (rcirq, &t, &p)) {u8 trig = t ?ACPI_LEVEL_SENSITIVE :ACPI_EDGE_SENSITIVE ;u8 pol = p ?ACPI_ACTIVE_LOW :ACPI_ACTIVE_HIGH ;if (triggering != trig || polarity != pol) { -pr_warning ("ACPI: IRQ %d override to %s, %s\n" , gsi, +pr_warning ("ACPI: IRQ %d override to %s, %s\n" , rcirq, t ?"level" :"edge" , p ?"low" :"high" ); triggering = trig; polarity = pol;
@@ -415,12 +416,16 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, } res->flags =acpi_dev_irq_flags (triggering, polarity, shareable); - irq =acpi_register_gsi (NULL , gsi, triggering, polarity); +if (source->string_length >0 ) + irq =acpi_irq_domain_register_irq (source, rcirq, triggering, + polarity); +else + irq =acpi_register_gsi (NULL , rcirq, triggering, polarity);if (irq >=0 ) { res->start = irq; res->end = irq; }else { -acpi_dev_irqresource_disabled (res, gsi); +acpi_dev_irqresource_disabled (res, rcirq); } }
@@ -448,6 +453,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, {struct acpi_resource_irq *irq;struct acpi_resource_extended_irq *ext_irq; +struct acpi_resource_source dummy = {0 ,0 ,NULL };switch (ares->type) {case ACPI_RESOURCE_TYPE_IRQ :
@@ -460,7 +466,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,acpi_dev_irqresource_disabled (res,0 );return false; } -acpi_dev_get_irqresource (res, irq->interrupts[index], +acpi_dev_get_irqresource (res, irq->interrupts[index], &dummy, irq->triggering, irq->polarity, irq->sharable, true);break ;
@@ -471,6 +477,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,return false; }acpi_dev_get_irqresource (res, ext_irq->interrupts[index], + &ext_irq->resource_source, ext_irq->triggering, ext_irq->polarity, ext_irq->sharable, false);break ;
include/linux/acpi.h +6 -0
@@ -26,6 +26,7 @@#include <linux/resource_ext.h> #include <linux/device.h> #include <linux/property.h> +#include <linux/irqdomain.h> #ifndef _LINUX#define _LINUX
@@ -294,6 +295,11 @@ int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi);void acpi_set_irq_model (enum acpi_irq_model_id model,struct fwnode_handle *fwnode); +int acpi_irq_domain_register_irq (struct acpi_resource_source *source,u32 rcirq, +int trigger,int polarity); +int acpi_irq_domain_unregister_irq (struct acpi_resource_source *source, +u32 rcirq); +#ifdef CONFIG_X86_IO_APIC extern int acpi_get_override_irq (u32 gsi,int *trigger,int *polarity);#else
Signature · 3 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH V3 1/2] ACPI: Add support for ResourceSource/IRQ domain mapping
Adding linux-arm-kernel and linux-acpi
Quoted 269 lines · Agustin Vega-Frias
This allows irqchip drivers to associate an ACPI DSDT device to an IRQ domain and provides support for using the ResourceSource in Extended IRQ Resources to find the domain and map the IRQs specified on that domain.
Signed-off-by Agustin Vega-Frias <[email protected]>--- drivers/acpi/Makefile | 1 + drivers/acpi/irqdomain.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/acpi/resource.c | 23 ++++++---- include/linux/acpi.h | 6 +++ 4 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 drivers/acpi/irqdomain.cdrivers/acpi/Makefile +1
-0@@ -56,6 +56,7 @@ acpi-$(CONFIG_ACPI_NUMA) += numa.o acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o acpi-y += acpi_lpat.o acpi-$(CONFIG_ACPI_GENERIC_GSI) += gsi.o +acpi-y += irqdomain.o # These are (potentially) separate modulesdrivers/acpi/irqdomain.c new file +6
-0@@ -0,0 +1,108 @@ +/* +* ACPI ResourceSource/IRQ domain mapping support +* +* Copyright (c) 2016, The Linux Foundation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */drivers/acpi/irqdomain.c new file +6
-0+#include <linux/acpi.h> +#include <linux/irq.h> +#include <linux/irqdomain.h> + +/** +* acpi_irq_domain_register_irq() - Register the mapping for an IRQ produced
+ * by the givenacpi_resource_source
to a
+ * Linux IRQ number
+ * @source: IRQ source
+ * @rcirq: IRQ number
+ * @trigger: trigger type of the IRQ number to be mapped
+ * @polarity: polarity of the IRQ to be mapped
+ *
+ * Returns: a valid linux IRQ number on success+ * -ENODEV if the given acpi_resource_source cannot be found + * -EPROBE_DEFER if the IRQ domain has not been registered + * -EINVAL for all other errors+ */
+int acpi_irq_domain_register_irq(structacpi_resource_source*source, u32 rcirq,drivers/acpi/irqdomain.c new file +36
-0+ int trigger, int polarity) +{ +struct irq_domain *domain; +struct acpi_device *device; +acpi_handle handle; +acpi_status status; +unsigned int type; +int ret; + + status =acpi_get_handle (NULL , source->string_ptr, &handle); +if (ACPI_FAILURE (status)) +return -ENODEV ; + + device =acpi_bus_get_acpi_device (handle); +if (!device) +return -ENODEV ; + + domain =irq_find_matching_fwnode (&device->fwnode,DOMAIN_BUS_ANY ); +if (!domain) { + ret = -EPROBE_DEFER ; + goto out_put_device; + } + + type =acpi_dev_get_irq_type (trigger, polarity); + ret =irq_create_mapping (domain, rcirq); +if (ret) +irq_set_irq_type (ret, type); + +out_put_device: +acpi_bus_put_acpi_device (device); +return ret; +} +EXPORT_SYMBOL_GPL (acpi_irq_domain_register_irq); + +/** +* acpi_irq_domain_unregister_irq() - Delete the mapping for an IRQ produced
+ * by the givenacpi_resource_sourceto a
+ * Linux IRQ number
+ * @source: IRQ source
+ * @rcirq: IRQ number
+ *
+ * Returns: 0 on success
+ *-ENODEVif the givenacpi_resource_sourcecannot be found
+ *-EINVALfor all other errors
+ */
+int acpi_irq_domain_unregister_irq(structacpi_resource_source*source,drivers/acpi/irqdomain.c new file +29
-0+ u32 rcirq) +{ +struct irq_domain *domain; +struct acpi_device *device; +acpi_handle handle; +acpi_status status; +int ret =0 ; + + status =acpi_get_handle (NULL , source->string_ptr, &handle); +if (ACPI_FAILURE (status)) +return -ENODEV ; + + device =acpi_bus_get_acpi_device (handle); +if (!device) +return -ENODEV ; + + domain =irq_find_matching_fwnode (&device->fwnode,DOMAIN_BUS_ANY ); +if (!domain) { + ret = -EINVAL ; + goto out_put_device; + } + +irq_dispose_mapping (irq_find_mapping (domain, rcirq)); + +out_put_device: +acpi_bus_put_acpi_device (device); +return ret; +} +EXPORT_SYMBOL_GPL (acpi_irq_domain_unregister_irq);drivers/acpi/resource.c +6
-5@@ -381,14 +381,15 @@ static void acpi_dev_irqresource_disabled(struct resource *res, u32 gsi) res->flags = IORESOURCE_IRQ | IORESOURCE_DISABLED | IORESOURCE_UNSET; } -static void acpi_dev_get_irqresource (struct resource *res,u32 gsi, +static void acpi_dev_get_irqresource (struct resource *res,u32 rcirq, +struct acpi_resource_source *source,u8 triggering,u8 polarity,u8 shareable,bool legacy) {int irq, p, t; -if (!valid_IRQ (gsi)) { -acpi_dev_irqresource_disabled (res, gsi); +if ((source->string_length ==0 ) && !valid_IRQ (rcirq)) { +acpi_dev_irqresource_disabled (res, rcirq);return ; }@@ -402,12 +403,12 @@ static void acpi_dev_get_irqresource(structresource *res, u32 gsi, * using extended IRQ descriptors we take the IRQ configuration * from _CRS directly. */ -if (legacy && !acpi_get_override_irq (gsi, &t, &p)) { +if (legacy && !acpi_get_override_irq (rcirq, &t, &p)) {u8 trig = t ?ACPI_LEVEL_SENSITIVE :ACPI_EDGE_SENSITIVE ;u8 pol = p ?ACPI_ACTIVE_LOW :ACPI_ACTIVE_HIGH ;if (triggering != trig || polarity != pol) { -pr_warning ("ACPI: IRQ %d override to %s, %s\n" , gsi, +pr_warning ("ACPI: IRQ %d override to %s, %s\n" , rcirq, t ?"level" :"edge" , p ?"low" :"high" ); triggering = trig;drivers/acpi/resource.c +7
-2polarity = pol;@@ -415,12 +416,16 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, } res->flags =acpi_dev_irq_flags (triggering, polarity, shareable); - irq =acpi_register_gsi (NULL , gsi, triggering, polarity); +if (source->string_length >0 ) + irq =acpi_irq_domain_register_irq (source, rcirq, triggering, + polarity); +else + irq =acpi_register_gsi (NULL , rcirq, triggering, polarity);if (irq >=0 ) { res->start = irq; res->end = irq; }else { -acpi_dev_irqresource_disabled (res, gsi); +acpi_dev_irqresource_disabled (res, rcirq); } }@@ -448,6 +453,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, { struct acpi_resource_irq *irq;struct acpi_resource_extended_irq *ext_irq; +struct acpi_resource_source dummy = {0 ,0 ,NULL };switch (ares->type) {drivers/acpi/resource.c +1
-1case ACPI_RESOURCE_TYPE_IRQ :@@ -460,7 +466,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, acpi_dev_irqresource_disabled(res, 0);return false; } -acpi_dev_get_irqresource (res, irq->interrupts[index], +acpi_dev_get_irqresource (res, irq->interrupts[index], &dummy, irq->triggering, irq->polarity, irq->sharable, true);drivers/acpi/resource.c +1
-0break ;@@ -471,6 +477,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, return false; }acpi_dev_get_irqresource (res, ext_irq->interrupts[index], + &ext_irq->resource_source, ext_irq->triggering, ext_irq->polarity, ext_irq->sharable, false);drivers/acpi/resource.c +0
-0break ;include/linux/acpi.h +6
-0@@ -26,6 +26,7 @@#include <linux/resource_ext.h> #include <linux/device.h> #include <linux/property.h> +#include <linux/irqdomain.h> #ifndef _LINUX#define _LINUX@@ -294,6 +295,11 @@ int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi);void acpi_set_irq_model (enum acpi_irq_model_id model,struct fwnode_handle *fwnode); +int acpi_irq_domain_register_irq (struct acpi_resource_source *source,u32 rcirq, +int trigger,int polarity); +int acpi_irq_domain_unregister_irq (struct acpi_resource_source *source, +u32 rcirq); +#ifdef
CONFIG_X86_IO_APIC
extern int acpi_get_override_irq(u32 gsi, int *trigger, int
*polarity);
#else
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
Signature · 4 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH V3 1/2] ACPI: Add support for ResourceSource/IRQ domain mapping
In reply to Agustin Vega-FriasQuoted 45 lines · On Fri, 13 May 2016 12:16:42 -0400 Agustin Vega-Frias…
This allows irqchip drivers to associate an ACPI DSDT device to an IRQ domain and provides support for using the ResourceSource in Extended IRQ Resources to find the domain and map the IRQs specified on that domain.
Signed-off-by Agustin Vega-Frias <[email protected]>--- drivers/acpi/Makefile | 1 + drivers/acpi/irqdomain.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/acpi/resource.c | 23 ++++++---- include/linux/acpi.h | 6 +++ 4 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 drivers/acpi/irqdomain.cdrivers/acpi/Makefile +1
-0@@ -56,6 +56,7 @@ acpi-$(CONFIG_ACPI_NUMA) += numa.o acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o acpi-y += acpi_lpat.o acpi-$(CONFIG_ACPI_GENERIC_GSI) += gsi.o +acpi-y += irqdomain.o # These are (potentially) separate modulesdrivers/acpi/irqdomain.c new file +13
-0@@ -0,0 +1,108 @@ +/* +* ACPI ResourceSource/IRQ domain mapping support +* +* Copyright (c) 2016, The Linux Foundation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details.
drivers/acpi/irqdomain.c line 23
Quoted 10 lines
drivers/acpi/irqdomain.c new file +10
-0+*/ +#include <linux/acpi.h> +#include <linux/irq.h> +#include <linux/irqdomain.h> + +/** +* acpi_irq_domain_register_irq() - Register the mapping for an IRQ produced +* by the given acpi_resource_source to a +* Linux IRQ number +* @source: IRQ source
I'm a bit uncertain if this describe the interrupt producer (the device that shakes an interrupt line) or the interrupt collator (the device that presents a bunch of interrupts to a downstream element). I'm tempted to say that this is the latter, but that's far from being clear.
drivers/acpi/irqdomain.c line 26
Quoted 3 lines
drivers/acpi/irqdomain.c new file +3
-0+* @rcirq: IRQ number +* @trigger: trigger type of the IRQ number to be mapped +* @polarity: polarity of the IRQ to be mapped
So if I'm right in my above understanding, you've reinvented an existing abstraction (irq_fwspec).
Quoted 14 lines
drivers/acpi/irqdomain.c new file +14
-0+* +* Returns: a valid linux IRQ number on success +* -ENODEV if the given acpi_resource_source cannot be found +* -EPROBE_DEFER if the IRQ domain has not been registered +* -EINVAL for all other errors +*/ +int acpi_irq_domain_register_irq (struct acpi_resource_source *source,u32 rcirq, +int trigger,int polarity) +{ +struct irq_domain *domain; +struct acpi_device *device; +acpi_handle handle; +acpi_status status; +unsigned int type;
drivers/acpi/irqdomain.c line 50
Quoted 10 lines
drivers/acpi/irqdomain.c new file +10
-0+int ret; + + status =acpi_get_handle (NULL , source->string_ptr, &handle); +if (ACPI_FAILURE (status)) +return -ENODEV ; + + device =acpi_bus_get_acpi_device (handle); +if (!device) +return -ENODEV ; +
So at this point, you should be able to create a irq_fwspec, and call into irq_create_fwspec_mapping(), without the need to open-code stuff we already have. And as a bonus point, you'd end-up with code that'd be similar to what is in gsi.c...
Quoted 47 lines
drivers/acpi/irqdomain.c new file +47
-0+ domain =irq_find_matching_fwnode (&device->fwnode,DOMAIN_BUS_ANY ); +if (!domain) { + ret = -EPROBE_DEFER ; + goto out_put_device; + } + + type =acpi_dev_get_irq_type (trigger, polarity); + ret =irq_create_mapping (domain, rcirq); +if (ret) +irq_set_irq_type (ret, type); + +out_put_device: +acpi_bus_put_acpi_device (device); +return ret; +} +EXPORT_SYMBOL_GPL (acpi_irq_domain_register_irq); + +/** +* acpi_irq_domain_unregister_irq() - Delete the mapping for an IRQ produced +* by the given acpi_resource_source to a +* Linux IRQ number +* @source: IRQ source +* @rcirq: IRQ number +* +* Returns: 0 on success +* -ENODEV if the given acpi_resource_source cannot be found +* -EINVAL for all other errors +*/ +int acpi_irq_domain_unregister_irq (struct acpi_resource_source *source, +u32 rcirq) +{ +struct irq_domain *domain; +struct acpi_device *device; +acpi_handle handle; +acpi_status status; +int ret =0 ; + + status =acpi_get_handle (NULL , source->string_ptr, &handle); +if (ACPI_FAILURE (status)) +return -ENODEV ; + + device =acpi_bus_get_acpi_device (handle); +if (!device) +return -ENODEV ; + + domain =irq_find_matching_fwnode (&device->fwnode,DOMAIN_BUS_ANY ); +if (!domain) {
drivers/acpi/irqdomain.c line 107
Quoted 10 lines
drivers/acpi/irqdomain.c new file +10
-0+ ret = -EINVAL ; + goto out_put_device; + } + +irq_dispose_mapping (irq_find_mapping (domain, rcirq)); + +out_put_device: +acpi_bus_put_acpi_device (device); +return ret; +}
Again, this smell a lot like gsi.c, with added sugar on top.
Quoted 40 lines
drivers/acpi/irqdomain.c new file +1
-0+EXPORT_SYMBOL_GPL (acpi_irq_domain_unregister_irq);drivers/acpi/resource.c +6
-5@@ -381,14 +381,15 @@ static void acpi_dev_irqresource_disabled(struct resource *res, u32 gsi) res->flags =IORESOURCE_IRQ |IORESOURCE_DISABLED |IORESOURCE_UNSET ; } -static void acpi_dev_get_irqresource (struct resource *res,u32 gsi, +static void acpi_dev_get_irqresource (struct resource *res,u32 rcirq, +struct acpi_resource_source *source,u8 triggering,u8 polarity,u8 shareable,bool legacy) {int irq, p, t; -if (!valid_IRQ (gsi)) { -acpi_dev_irqresource_disabled (res, gsi); +if ((source->string_length ==0 ) && !valid_IRQ (rcirq)) { +acpi_dev_irqresource_disabled (res, rcirq);return ; }@@ -402,12 +403,12 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,* using extended IRQ descriptors we take the IRQ configuration * from _CRS directly. */ -if (legacy && !acpi_get_override_irq (gsi, &t, &p)) { +if (legacy && !acpi_get_override_irq (rcirq, &t, &p)) {u8 trig = t ?ACPI_LEVEL_SENSITIVE :ACPI_EDGE_SENSITIVE ;u8 pol = p ?ACPI_ACTIVE_LOW :ACPI_ACTIVE_HIGH ;if (triggering != trig || polarity != pol) { -pr_warning ("ACPI: IRQ %d override to %s, %s\n" , gsi, +pr_warning ("ACPI: IRQ %d override to %s, %s\n" , rcirq, t ?"level" :"edge" , p ?"low" :"high" ); triggering = trig; polarity = pol;
drivers/acpi/resource.c static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, · line 423
Quoted 9 lines
drivers/acpi/resource.c +5
-1@@ -415,12 +416,16 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, } res->flags =acpi_dev_irq_flags (triggering, polarity, shareable); - irq =acpi_register_gsi (NULL , gsi, triggering, polarity); +if (source->string_length >0 ) + irq =acpi_irq_domain_register_irq (source, rcirq, triggering, + polarity); +else + irq =acpi_register_gsi (NULL , rcirq, triggering, polarity);
Do you see what I mean about these being similar?
Quoted 48 lines
drivers/acpi/resource.c +4
-2if (irq >=0 ) { res->start = irq; res->end = irq; }else { -acpi_dev_irqresource_disabled (res, gsi); +acpi_dev_irqresource_disabled (res, rcirq); } }@@ -448,6 +453,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, {struct acpi_resource_irq *irq;struct acpi_resource_extended_irq *ext_irq; +struct acpi_resource_source dummy = {0 ,0 ,NULL };switch (ares->type) {case ACPI_RESOURCE_TYPE_IRQ :@@ -460,7 +466,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,acpi_dev_irqresource_disabled (res,0 );return false; } -acpi_dev_get_irqresource (res, irq->interrupts[index], +acpi_dev_get_irqresource (res, irq->interrupts[index], &dummy, irq->triggering, irq->polarity, irq->sharable, true);break ;@@ -471,6 +477,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,return false; }acpi_dev_get_irqresource (res, ext_irq->interrupts[index], + &ext_irq->resource_source, ext_irq->triggering, ext_irq->polarity, ext_irq->sharable, false);break ;include/linux/acpi.h +1
-0@@ -26,6 +26,7 @@#include <linux/resource_ext.h> #include <linux/device.h> #include <linux/property.h> +#include <linux/irqdomain.h> #ifndef _LINUX#define _LINUX@@ -294,6 +295,11 @@ int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi); void acpi_set_irq_model(enum acpi_irq_model_id model,
include/linux/acpi.h int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi); · line 305
Quoted 10 lines
include/linux/acpi.h +5
-0struct fwnode_handle *fwnode); +int acpi_irq_domain_register_irq (struct acpi_resource_source *source,u32 rcirq, +int trigger,int polarity); +int acpi_irq_domain_unregister_irq (struct acpi_resource_source *source, +u32 rcirq); +#ifdef CONFIG_X86_IO_APIC extern int acpi_get_override_irq (u32 gsi,int *trigger,int *polarity);#else
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny.
Re: [PATCH V3 1/2] ACPI: Add support for ResourceSource/IRQ domain mapping
Quoted 59 lines · Marc Zyngier
Quoted 56 lines · On Fri, 13 May 2016 12:16:42 -0400 Agustin Vega-Frias…
This allows irqchip drivers to associate an ACPI DSDT device to an IRQ domain and provides support for using the ResourceSource in Extended IRQ Resources to find the domain and map the IRQs specified on that domain.
Signed-off-by Agustin Vega-Frias <[email protected]>--- drivers/acpi/Makefile | 1 + drivers/acpi/irqdomain.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/acpi/resource.c | 23 ++++++---- include/linux/acpi.h | 6 +++ 4 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 drivers/acpi/irqdomain.cdrivers/acpi/Makefile +1
-0@@ -56,6 +56,7 @@ acpi-$(CONFIG_ACPI_NUMA) += numa.o acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o acpi-y += acpi_lpat.o acpi-$(CONFIG_ACPI_GENERIC_GSI) += gsi.o +acpi-y += irqdomain.o # These are (potentially) separate modulesdrivers/acpi/irqdomain.c new file +6
-0@@ -0,0 +1,108 @@ +/* +* ACPI ResourceSource/IRQ domain mapping support +* +* Copyright (c) 2016, The Linux Foundation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */drivers/acpi/irqdomain.c new file +6
-0+#include <linux/acpi.h> +#include <linux/irq.h> +#include <linux/irqdomain.h> + +/** +* acpi_irq_domain_register_irq() - Register the mapping for an IRQ produced
+ * by the givenacpi_resource_source
Quoted 8 lines
Quoted 3 lines
to a
+ * Linux IRQ number
+ * @source: IRQ sourceI'm a bit uncertain if this describe the interrupt producer (the device that shakes an interrupt line) or the interrupt collator (the device that presents a bunch of interrupts to a downstream element). I'm tempted to say that this is the latter, but that's far from being clear.
That is correct, acpi_resource_source is a device that produces IRQs for other devices.
Quoted 30 lines
Quoted 4 lines
+ * @rcirq: IRQ number
+ * @trigger: trigger type of the IRQ number to be mapped
+ * @polarity: polarity of the IRQ to be mappedSo if I'm right in my above understanding, you've reinvented an existing abstraction (
irq_fwspec).Quoted 22 lines
+ *
+ * Returns: a valid linux IRQ number on success+ * -ENODEV if the given acpi_resource_source cannot be found + * -EPROBE_DEFER if the IRQ domain has not been registered + * -EINVAL for all other errors+ */
+int acpi_irq_domain_register_irq(structacpi_resource_source*source, u32 rcirq,drivers/acpi/irqdomain.c new file +14
-0+ int trigger, int polarity) +{ +struct irq_domain *domain; +struct acpi_device *device; +acpi_handle handle; +acpi_status status; +unsigned int type; +int ret; + + status =acpi_get_handle (NULL , source->string_ptr, &handle); +if (ACPI_FAILURE (status)) +return -ENODEV ; + + device =acpi_bus_get_acpi_device (handle);
Quoted 9 lines
drivers/acpi/irqdomain.c line 50
Quoted 3 lines
drivers/acpi/irqdomain.c new file +3
-0+if (!device) +return -ENODEV ; +So at this point, you should be able to create a
irq_fwspec, and call intoirq_create_fwspec_mapping(), without the need to open-code stuff we already have. And as a bonus point, you'd end-up with code that'd be similar to what is ingsi.c...
Got it.
Quoted 54 lines
Quoted 54 lines
drivers/acpi/irqdomain.c new file +19
-0+ domain =irq_find_matching_fwnode (&device->fwnode,DOMAIN_BUS_ANY ); +if (!domain) { + ret = -EPROBE_DEFER ; + goto out_put_device; + } + + type =acpi_dev_get_irq_type (trigger, polarity); + ret =irq_create_mapping (domain, rcirq); +if (ret) +irq_set_irq_type (ret, type); + +out_put_device: +acpi_bus_put_acpi_device (device); +return ret; +} +EXPORT_SYMBOL_GPL (acpi_irq_domain_register_irq); + +/** +* acpi_irq_domain_unregister_irq() - Delete the mapping for an IRQ produced
+ * by the givenacpi_resource_sourceto a
+ * Linux IRQ number
+ * @source: IRQ source
+ * @rcirq: IRQ number
+ *
+ * Returns: 0 on success
+ *-ENODEVif the givenacpi_resource_sourcecannot be found
+ *-EINVALfor all other errors
+ */
+int acpi_irq_domain_unregister_irq(structacpi_resource_source*source,drivers/acpi/irqdomain.c new file +22
-0+ u32 rcirq) +{ +struct irq_domain *domain; +struct acpi_device *device; +acpi_handle handle; +acpi_status status; +int ret =0 ; + + status =acpi_get_handle (NULL , source->string_ptr, &handle); +if (ACPI_FAILURE (status)) +return -ENODEV ; + + device =acpi_bus_get_acpi_device (handle); +if (!device) +return -ENODEV ; + + domain =irq_find_matching_fwnode (&device->fwnode,DOMAIN_BUS_ANY ); +if (!domain) { + ret = -EINVAL ; + goto out_put_device; + } +
Quoted 8 lines
drivers/acpi/irqdomain.c line 107
Quoted 6 lines
drivers/acpi/irqdomain.c new file +6
-0+irq_dispose_mapping (irq_find_mapping (domain, rcirq)); + +out_put_device: +acpi_bus_put_acpi_device (device); +return ret; +}Again, this smell a lot like
gsi.c, with added sugar on top.
Yes, this can go away since a client can just call irq_dispose_mapping which finds the domain from the irq_data.
Quoted 125 lines
Quoted 44 lines
drivers/acpi/irqdomain.c new file +1
-0+EXPORT_SYMBOL_GPL (acpi_irq_domain_unregister_irq);drivers/acpi/resource.c +4
-3@@ -381,14 +381,15 @@ static void acpi_dev_irqresource_disabled(struct resource *res, u32 gsi) res->flags = IORESOURCE_IRQ | IORESOURCE_DISABLED |IORESOURCE_UNSET ; } -static void acpi_dev_get_irqresource (struct resource *res,u32 gsi, +static void acpi_dev_get_irqresource (struct resource *res,u32 rcirq, +struct acpi_resource_source *source,u8 triggering,u8 polarity,u8 shareable,bool legacy) {int irq, p, t; -if (!valid_IRQ (gsi)) { -acpi_dev_irqresource_disabled (res, gsi); +if ((source->string_length ==0 ) && !valid_IRQ (rcirq)) { +acpi_dev_irqresource_disabled (res, rcirq);return ;drivers/acpi/resource.c +2
-2}@@ -402,12 +403,12 @@ static void acpi_dev_get_irqresource(structresource *res, u32 gsi, * using extended IRQ descriptors we take the IRQ configuration * from _CRS directly. */ -if (legacy && !acpi_get_override_irq (gsi, &t, &p)) { +if (legacy && !acpi_get_override_irq (rcirq, &t, &p)) {u8 trig = t ?ACPI_LEVEL_SENSITIVE :ACPI_EDGE_SENSITIVE ;u8 pol = p ?ACPI_ACTIVE_LOW :ACPI_ACTIVE_HIGH ;if (triggering != trig || polarity != pol) { -pr_warning ("ACPI: IRQ %d override to %s, %s\n" , gsi, +pr_warning ("ACPI: IRQ %d override to %s, %s\n" , rcirq, t ?"level" :"edge" , p ?"low" :"high" ); triggering = trig;drivers/acpi/resource.c +0
-0polarity = pol;drivers/acpi/resource.c static void acpi_dev_get_irqresource(struct · line 424
Quoted 10 lines
drivers/acpi/resource.c +5
-1@@ -415,12 +416,16 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, } res->flags =acpi_dev_irq_flags (triggering, polarity, shareable); - irq =acpi_register_gsi (NULL , gsi, triggering, polarity); +if (source->string_length >0 ) + irq =acpi_irq_domain_register_irq (source, rcirq, triggering, + polarity); +else + irq =acpi_register_gsi (NULL , rcirq, triggering, polarity);Do you see what I mean about these being similar?
Quoted 61 lines
drivers/acpi/resource.c +2
-1if (irq >=0 ) { res->start = irq; res->end = irq; }else { -acpi_dev_irqresource_disabled (res, gsi); +acpi_dev_irqresource_disabled (res, rcirq); } }@@ -448,6 +453,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, { struct acpi_resource_irq *irq;struct acpi_resource_extended_irq *ext_irq; +struct acpi_resource_source dummy = {0 ,0 ,NULL };switch (ares->type) {drivers/acpi/resource.c +1
-1case ACPI_RESOURCE_TYPE_IRQ :@@ -460,7 +466,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, acpi_dev_irqresource_disabled(res, 0);return false; } -acpi_dev_get_irqresource (res, irq->interrupts[index], +acpi_dev_get_irqresource (res, irq->interrupts[index], &dummy, irq->triggering, irq->polarity, irq->sharable, true);drivers/acpi/resource.c +1
-0break ;@@ -471,6 +477,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, return false; }acpi_dev_get_irqresource (res, ext_irq->interrupts[index], + &ext_irq->resource_source, ext_irq->triggering, ext_irq->polarity, ext_irq->sharable, false);drivers/acpi/resource.c +0
-0break ;include/linux/acpi.h +6
-0@@ -26,6 +26,7 @@#include <linux/resource_ext.h> #include <linux/device.h> #include <linux/property.h> +#include <linux/irqdomain.h> #ifndef _LINUX#define _LINUX@@ -294,6 +295,11 @@ int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi);void acpi_set_irq_model (enum acpi_irq_model_id model,struct fwnode_handle *fwnode); +int acpi_irq_domain_register_irq (struct acpi_resource_source *source,u32 rcirq, +int trigger,int polarity); +int acpi_irq_domain_unregister_irq (struct acpi_resource_source *source, +u32 rcirq); +Quoted 4 lines
#ifdef
CONFIG_X86_IO_APIC
extern int acpi_get_override_irq(u32 gsi, int *trigger, int
*polarity);
#elseThanks,
Quoted 3 lines
M.--
Jazz is not dead. It just smells funny.
Thanks.
Signature · 3 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH V3 1/2] ACPI: Add support for ResourceSource/IRQ domain mapping
+cc linux-acpi, linux-arm-kernel
(blocked, send again, sorry for the noise)
Quoted 30 lines · Hanjun Guo
Hi,
Quoted 27 lines · agustinv at codeaurora.org
Quoted 13 lines · Marc Zyngier
Quoted 3 lines · On Fri, 13 May 2016 12:16:42 -0400 Agustin Vega-Frias…
+ * @rcirq: IRQ number
+ * @trigger: trigger type of the IRQ number to be mapped
+ * @polarity: polarity of the IRQ to be mappedSo if I'm right in my above understanding, you've reinvented an existing abstraction (
irq_fwspec).Quoted 5 lines
So at this point, you should be able to create a
irq_fwspec, and call intoirq_create_fwspec_mapping(), without the need to open-code stuff we already have. And as a bonus point, you'd end-up with code that'd be similar to what is ingsi.c...Got it.
Quoted 4 lines
Quoted 1 line
Again, this smell a lot like
gsi.c, with added sugar on top.
Quoted 9 lines
Quoted 1 line
Yes, this can go away since a client can just call
irq_dispose_mappingwhich finds the domain from theirq_data.I reworked my previous patches [1] which trying to support a mbi-gen interrupt controller, here is the updated one for discussion to see it's a option or not:
[1]: http://git.linaro.org/people/hanjun.guo/acpi.git/shortlog/refs/heads/7-topic-d02-mbi-gen
patch: ACPI: resource: pass acpi dev toacpi_register_gsi()
acpi: gsi: make the interrupt parent be selectable</people/hanjun.guo/acpi.git/commit/28867116a69e4907e6f08971e75b533ec90a4dd2>
drivers/acpi/gsi.c | 8 +++-- drivers/acpi/resource.c | 85 ++++++++++++++++++++++++++++++++++--------------- include/acpi/acpi_bus.h | 1 + 3 files changed, 66 insertions(+), 28 deletions(-)
drivers/acpi/gsi.c +6 -2
@@ -74,13 +74,17 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) {struct irq_fwspec fwspec; +struct acpi_device *adev = dev ?to_acpi_device (dev) :NULL ; -if (WARN_ON (!acpi_gsi_domain_id)) { +if (acpi_gsi_domain_id) + fwspec.fwnode = acpi_gsi_domain_id; +else if (adev && &adev->fwnode && adev->interrupt_parent) + fwspec.fwnode = adev->interrupt_parent; +else {pr_warn ("GSI: No registered irqchip, giving up\n" );return -EINVAL ; } - fwspec.fwnode = acpi_gsi_domain_id; fwspec.param[0 ] = gsi; fwspec.param[1 ] =acpi_gsi_get_irq_type (trigger, polarity); fwspec.param_count =2 ;
drivers/acpi/resource.c +59 -26
139 lines not on this page · raw message
include/acpi/acpi_bus.h +1 -0
@@ -353,6 +353,7 @@ struct acpi_device {int device_type;acpi_handle handle;/* no handle for fixed hardware */ struct fwnode_handle fwnode; +struct fwnode_handle *interrupt_parent;struct acpi_device *parent;struct list_head children;struct list_head node;
-- 1.9.1
PATCH v3 2/2 irqchip: qcom: Add IRQ combiner driver
In reply to Agustin Vega-FriasDriver for interrupt combiners in the Top-level Control and Status Registers (TCSR) hardware block in Qualcomm Technologies chips.
An interrupt combiner in this block combines a set of interrupts by OR'ing the individual interrupt signals into a summary interrupt signal routed to a parent interrupt controller, and provides read- only, 32-bit registers to query the status of individual interrupts. The status bit for IRQ n is bit (n % 32) within register (n / 32) of the given combiner. Thus, each combiner can be described as a set of register offsets and the number of IRQs managed.
--- drivers/irqchip/Kconfig | 8 + drivers/irqchip/Makefile | 1 + drivers/irqchip/qcom-irq-combiner.c | 344 ++++++++++++++++++++++++++++++++++++ 3 files changed, 353 insertions(+) create mode 100644 drivers/irqchip/qcom-irq-combiner.c
drivers/irqchip/Kconfig +8 -0
@@ -245,3 +245,11 @@ config IRQ_MXS config MVEBU_ODMI bool select GENERIC_MSI_IRQ_DOMAIN + +config QCOM_IRQ_COMBINER + bool "QCOM IRQ combiner support" + depends on ARCH_QCOM + select IRQ_DOMAIN + help + Say yes here to add support for the IRQ combiner devices embedded + in Qualcomm Technologies chips.
drivers/irqchip/Makefile +1 -0
@@ -65,3 +65,4 @@ obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o obj-$(CONFIG_IMX_GPCV2) += irq-imx-gpcv2.o obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o +obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.o
drivers/irqchip/qcom-irq-combiner.c new file +344 -0
344 lines not on this page · raw message
Signature · 3 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Adding linux-arm-kernel and linux-acpi
Quoted 411 lines · Agustin Vega-Frias
Driver for interrupt combiners in the Top-level Control and Status Registers (TCSR) hardware block in Qualcomm Technologies chips.
An interrupt combiner in this block combines a set of interrupts by OR'ing the individual interrupt signals into a summary interrupt signal routed to a parent interrupt controller, and provides read- only, 32-bit registers to query the status of individual interrupts. The status bit for IRQ n is bit (n % 32) within register (n / 32) of the given combiner. Thus, each combiner can be described as a set of register offsets and the number of IRQs managed.
Signed-off-by Agustin Vega-Frias <[email protected]>--- drivers/irqchip/Kconfig | 8 + drivers/irqchip/Makefile | 1 + drivers/irqchip/qcom-irq-combiner.c | 344 ++++++++++++++++++++++++++++++++++++ 3 files changed, 353 insertions(+) create mode 100644 drivers/irqchip/qcom-irq-combiner.cdrivers/irqchip/Kconfig +8
-0@@ -245,3 +245,11 @@ config IRQ_MXS config MVEBU_ODMI bool select GENERIC_MSI_IRQ_DOMAIN + +config QCOM_IRQ_COMBINER + bool "QCOM IRQ combiner support" + depends on ARCH_QCOM + select IRQ_DOMAIN + help + Say yes here to add support for the IRQ combiner devices embedded + in Qualcomm Technologies chips.drivers/irqchip/Makefile +1
-0@@ -65,3 +65,4 @@ obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o obj-$(CONFIG_IMX_GPCV2) += irq-imx-gpcv2.o obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o +obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.odrivers/irqchip/qcom-irq-combiner.c new file +3
-0@@ -0,0 +1,344 @@ +/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */drivers/irqchip/qcom-irq-combiner.c new file +8
-0+ +/* +* Driver for interrupt combiners in the Top-level Control and Status +* Registers (TCSR) hardware block in Qualcomm Technologies chips. +* An interrupt combiner in this block combines a set of interrupts by +* OR'ing the individual interrupt signals into a summary interrupt +* signal routed to a parent interrupt controller, and provides read- +* only, 32-bit registers to query the status of individual interrupts.
+ * The status bit for IRQ n is bit (n % 32) within register (n / 32)
+ * of the given combiner. Thus, each combiner can be described as a set
+ * of register offsets and the number of IRQs managed.
+ */drivers/irqchip/qcom-irq-combiner.c new file +92
-0+ +#include <linux/acpi.h> +#include <linux/err.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/irqdomain.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/platform_device.h> +#include <linux/property.h> +#include <linux/slab.h> + +#define REG_SIZE 32 + +struct combiner_reg { +void __iomem *addr; +unsigned long mask; +}; + +struct combiner { +struct irq_chip irq_chip; +struct irq_domain *domain; +int parent_irq; +u32 nirqs; +u32 nregs; +struct combiner_reg regs[0 ]; +}; + +static inline u32 irq_register (int irq) +{ +return irq /REG_SIZE ; +} + +static inline u32 irq_bit (int irq) +{ +return irq %REG_SIZE ; + +} + +static inline int irq_nr (u32 reg,u32 bit) +{ +return reg *REG_SIZE + bit; +} + +/* +* Handler for the cascaded IRQ. +*/ +static void combiner_handle_irq (struct irq_desc *desc) +{ +struct combiner *combiner =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc); +u32 reg; + +chained_irq_enter (chip, desc); + +for (reg =0 ; reg < combiner->nregs; reg++) { +int virq; +int hwirq; +u32 bit; +u32 status; + +if (combiner->regs[reg].mask ==0 ) +continue ; + + status =readl_relaxed (combiner->regs[reg].addr); + status &= combiner->regs[reg].mask; + +while (status) { + bit =__ffs (status); + status &= ~(1 << bit); + hwirq =irq_nr (reg, bit); + virq =irq_find_mapping (combiner->domain, hwirq); +if (virq >=0 ) +generic_handle_irq (virq); + + } + } + +chained_irq_exit (chip, desc); +} + +/* +* irqchip callbacks +*/ + +static void combiner_irq_chip_mask_irq (struct irq_data *data) +{ +struct combiner *combiner =irq_data_get_irq_chip_data (data); + struct combiner_reg *reg = combiner->regs +
irq_register(data->hwirq);drivers/irqchip/qcom-irq-combiner.c new file +8
-0+ +clear_bit (irq_bit (data->hwirq), ®->mask); +} + +static void combiner_irq_chip_unmask_irq (struct irq_data *data) +{ +struct combiner *combiner =irq_data_get_irq_chip_data (data); + struct combiner_reg *reg = combiner->regs +
irq_register(data->hwirq);drivers/irqchip/qcom-irq-combiner.c new file +23
-0+ +set_bit (irq_bit (data->hwirq), ®->mask); +} + +#ifdef CONFIG_SMP +static int combiner_irq_chip_set_affinity (struct irq_data *data, +const struct cpumask *mask,bool force) +{ +struct combiner *combiner =irq_data_get_irq_chip_data (data); +struct irq_data *pdata =irq_get_irq_data (combiner->parent_irq); + +if (pdata->chip && pdata->chip->irq_set_affinity) +return pdata->chip->irq_set_affinity (pdata, mask, force); +else +return -EINVAL ; +} +#endif + +/* +* domain callbacks +*/ + +static int combiner_irq_map(struct irq_domain *domain, unsigned intirq,
drivers/irqchip/qcom-irq-combiner.c new file +15
-0+ irq_hw_number_t hwirq) +{ +struct combiner *combiner = domain->host_data; + +if (hwirq >= combiner->nirqs) +return -EINVAL ; + +irq_set_chip_and_handler (irq, &combiner->irq_chip, handle_level_irq); +irq_set_chip_data (irq, combiner); +irq_set_parent (irq, combiner->parent_irq); +irq_set_noprobe (irq); +return 0 ; +} + +static void combiner_irq_unmap(struct irq_domain *domain, unsigned intirq)
drivers/irqchip/qcom-irq-combiner.c new file +26
-0+{ +irq_set_chip_and_handler (irq,NULL ,NULL ); +irq_set_chip_data (irq,NULL ); +irq_set_parent (irq,-1 ); +} + +static struct irq_domain_ops domain_ops = { + .map = combiner_irq_map, + .unmap = combiner_irq_unmap +}; + +/* +* Probing and initialization. +* +* Combiner devices reside inside the TCSR block so the resulting DSDT +* topology is: +* +* Device (TCS0) +* { +* Name (_HID, "QCOM80B0") // Qualcomm TCSR controller +* Name (_UID, 0) +* +* Method (_CRS, 0x0, Serialized) { +* Name (RBUF, ResourceTemplate () +* { +* Memory32Fixed (ReadWrite, 0x2E10000,
0x00001000)
+ * })
+ * Return (RBUF)
+ * }
+ *
+ * Device (QIC0)
+ * {
+ *Name(_HID,"QCOM80B1")// Qualcomm TCSR IRQ combiner
+ * ...
+ * } // end Device QIC0
+ * ...
+ * }
+ *
+ * Thus all combiner devices same the same memory mapping from the parent
+ * device.
+ */drivers/irqchip/qcom-irq-combiner.c new file +22
-0+ +static int __init combiner_probe (struct platform_device *pdev) +{ +struct platform_device *tcsr_pdev; +struct combiner *combiner; +void __iomem *tcsr_base; +size_t alloc_sz; +u32 nregs; +u32 nirqs; + + tcsr_pdev =to_platform_device (pdev->dev.parent); + tcsr_base =platform_get_drvdata (tcsr_pdev); +if (!tcsr_base) +return -ENODEV ; + +if (device_property_read_u32 (&pdev->dev,"qcom,combiner-nr-irqs" , + &nirqs)) { +dev_err (&pdev->dev,"Error reading number of IRQs\n" ); +return -EINVAL ; + } + + nregs = device_property_read_u32_array(&pdev->dev,"qcom,combiner-regs",
drivers/irqchip/qcom-irq-combiner.c new file +120
-1+ NULL, 0); +if (nregs <DIV_ROUND_UP (nirqs,REG_SIZE )) { +dev_err (&pdev->dev,"Error reading regs property\n" ); +return -EINVAL ; + } + + alloc_sz =sizeof (*combiner) +sizeof (struct combiner_reg ) * nregs; + combiner =devm_kzalloc (&pdev->dev, alloc_sz,GFP_KERNEL ); +if (combiner) { +int i; +u32 regs[nregs]; + +if (device_property_read_u32_array (&pdev->dev, +"qcom,combiner-regs" , + regs, nregs)) { +dev_err (&pdev->dev,"Error reading regs property\n" ); +return -EINVAL ; + } + + combiner->nirqs = nirqs; + combiner->nregs = nregs; +for (i =0 ; i < nregs; i++) { + combiner->regs[i].addr = tcsr_base + regs[i]; + combiner->regs[i].mask =0 ; + } + }else { +return -ENOMEM ; + } + + combiner->irq_chip.irq_mask = combiner_irq_chip_mask_irq; + combiner->irq_chip.irq_unmask = combiner_irq_chip_unmask_irq; +#ifdef CONFIG_SMP + combiner->irq_chip.irq_set_affinity = combiner_irq_chip_set_affinity; +#endif + + combiner->parent_irq =platform_get_irq (pdev,0 ); +if (combiner->parent_irq <=0 ) { +dev_err (&pdev->dev,"Error getting IRQ resource\n" ); +return -EINVAL ; + } + + combiner->domain =irq_domain_create_linear (pdev->dev.fwnode, nirqs, + &domain_ops, combiner); +if (!combiner->domain) +/* Errors printed by irq_domain_create_linear */ +return -ENODEV ; + +irq_set_chained_handler_and_data (combiner->parent_irq, + combiner_handle_irq, combiner); + +if (device_property_read_string (&pdev->dev,"qcom,combiner-name" , + &combiner->irq_chip.name) !=0 ) + combiner->irq_chip.name ="qcom-irq-combiner" ; + +dev_info (&pdev->dev,"Initialized with [p=%d,n=%d,r=%p]\n" , + combiner->parent_irq, nirqs, combiner->regs[0 ].addr); +return 0 ; +} + +static const struct acpi_device_id qcom_irq_combiner_acpi_match[] = { + {"QCOM80B1" , }, + { } +}; + +static struct platform_driver qcom_irq_combiner_probe = { + .driver = { + .name ="qcom-irq-combiner" , + .owner =THIS_MODULE , + .acpi_match_table =ACPI_PTR (qcom_irq_combiner_acpi_match), + }, + .probe = combiner_probe, +}; + +static int __init register_qcom_irq_combiner (void ) +{ +return platform_driver_register (&qcom_irq_combiner_probe); +} +arch_initcall (register_qcom_irq_combiner); + +static int __init tcsr_probe (struct platform_device *pdev) +{ +struct resource *mr; +void __iomem *tcsr_base; + + mr =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (mr ==NULL ) { +dev_err (&pdev->dev,"Error getting memory resource\n" ); +return -EINVAL ; + } + + tcsr_base =devm_ioremap_resource (&pdev->dev, mr); +if (IS_ERR (tcsr_base)) { +dev_err (&pdev->dev,"Error mapping memory resource\n" ); +return PTR_ERR (tcsr_base); + } + +dev_info (&pdev->dev,"Initialized TCSR block @%pa\n" , &mr->start); +platform_set_drvdata (pdev, tcsr_base); +return 0 ; +} + +static const struct acpi_device_id qcom_tcsr_acpi_match[] = { + {"QCOM80B0" , }, + { } +}; + +static struct platform_driver qcom_tcsr_probe = { + .driver = { + .name ="qcom-tcsr" , + .owner =THIS_MODULE , + .acpi_match_table =ACPI_PTR (qcom_tcsr_acpi_match), + }, + .probe = tcsr_probe, +}; + +static int __init register_qcom_tcsr (void ) +{ +return platform_driver_register (&qcom_tcsr_probe); +} +arch_initcall (register_qcom_tcsr); --Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
Signature · 4 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Quoted 176 lines · On Fri, 13 May 2016 12:16:43 -0400 Agustin Vega-Frias…
Driver for interrupt combiners in the Top-level Control and Status Registers (TCSR) hardware block in Qualcomm Technologies chips.
An interrupt combiner in this block combines a set of interrupts by OR'ing the individual interrupt signals into a summary interrupt signal routed to a parent interrupt controller, and provides read- only, 32-bit registers to query the status of individual interrupts. The status bit for IRQ n is bit (n % 32) within register (n / 32) of the given combiner. Thus, each combiner can be described as a set of register offsets and the number of IRQs managed.
Signed-off-by Agustin Vega-Frias <[email protected]>--- drivers/irqchip/Kconfig | 8 + drivers/irqchip/Makefile | 1 + drivers/irqchip/qcom-irq-combiner.c | 344 ++++++++++++++++++++++++++++++++++++ 3 files changed, 353 insertions(+) create mode 100644 drivers/irqchip/qcom-irq-combiner.cdrivers/irqchip/Kconfig +8
-0@@ -245,3 +245,11 @@ config IRQ_MXS config MVEBU_ODMI bool select GENERIC_MSI_IRQ_DOMAIN + +config QCOM_IRQ_COMBINER + bool "QCOM IRQ combiner support" + depends on ARCH_QCOM + select IRQ_DOMAIN + help + Say yes here to add support for the IRQ combiner devices embedded + in Qualcomm Technologies chips.drivers/irqchip/Makefile +1
-0@@ -65,3 +65,4 @@ obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o obj-$(CONFIG_IMX_GPCV2) += irq-imx-gpcv2.o obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o +obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.odrivers/irqchip/qcom-irq-combiner.c new file +126
-0@@ -0,0 +1,344 @@ +/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +/* +* Driver for interrupt combiners in the Top-level Control and Status +* Registers (TCSR) hardware block in Qualcomm Technologies chips. +* An interrupt combiner in this block combines a set of interrupts by +* OR'ing the individual interrupt signals into a summary interrupt +* signal routed to a parent interrupt controller, and provides read- +* only, 32-bit registers to query the status of individual interrupts. +* The status bit for IRQ n is bit (n % 32) within register (n / 32) +* of the given combiner. Thus, each combiner can be described as a set +* of register offsets and the number of IRQs managed. +*/ + +#include <linux/acpi.h> +#include <linux/err.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/irqdomain.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/platform_device.h> +#include <linux/property.h> +#include <linux/slab.h> + +#define REG_SIZE 32 + +struct combiner_reg { +void __iomem *addr; +unsigned long mask; +}; + +struct combiner { +struct irq_chip irq_chip; +struct irq_domain *domain; +int parent_irq; +u32 nirqs; +u32 nregs; +struct combiner_reg regs[0 ]; +}; + +static inline u32 irq_register (int irq) +{ +return irq /REG_SIZE ; +} + +static inline u32 irq_bit (int irq) +{ +return irq %REG_SIZE ; + +} + +static inline int irq_nr (u32 reg,u32 bit) +{ +return reg *REG_SIZE + bit; +} + +/* +* Handler for the cascaded IRQ. +*/ +static void combiner_handle_irq (struct irq_desc *desc) +{ +struct combiner *combiner =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc); +u32 reg; + +chained_irq_enter (chip, desc); + +for (reg =0 ; reg < combiner->nregs; reg++) { +int virq; +int hwirq; +u32 bit; +u32 status; + +if (combiner->regs[reg].mask ==0 ) +continue ; + + status =readl_relaxed (combiner->regs[reg].addr); + status &= combiner->regs[reg].mask; + +while (status) { + bit =__ffs (status); + status &= ~(1 << bit); + hwirq =irq_nr (reg, bit); + virq =irq_find_mapping (combiner->domain, hwirq); +if (virq >=0 ) +generic_handle_irq (virq); + + } + } + +chained_irq_exit (chip, desc); +} + +/* +* irqchip callbacks +*/ + +static void combiner_irq_chip_mask_irq (struct irq_data *data) +{ +struct combiner *combiner =irq_data_get_irq_chip_data (data); +struct combiner_reg *reg = combiner->regs +irq_register (data->hwirq); + +clear_bit (irq_bit (data->hwirq), ®->mask); +} + +static void combiner_irq_chip_unmask_irq (struct irq_data *data) +{ +struct combiner *combiner =irq_data_get_irq_chip_data (data); +struct combiner_reg *reg = combiner->regs +irq_register (data->hwirq); + +set_bit (irq_bit (data->hwirq), ®->mask); +}
drivers/irqchip/qcom-irq-combiner.c line 136
Quoted 10 lines
drivers/irqchip/qcom-irq-combiner.c new file +10
-0+ +#ifdef CONFIG_SMP +static int combiner_irq_chip_set_affinity (struct irq_data *data, +const struct cpumask *mask,bool force) +{ +struct combiner *combiner =irq_data_get_irq_chip_data (data); +struct irq_data *pdata =irq_get_irq_data (combiner->parent_irq); + +if (pdata->chip && pdata->chip->irq_set_affinity) +return pdata->chip->irq_set_affinity (pdata, mask, force);
So you're forcing the affinity of all the interrupts connected to this irqchip in one go? Sorry, but that's not the semantic of set_affinity. It you want to perform this, it is at the root irqchip that it has to be done.
Quoted 24 lines
drivers/irqchip/qcom-irq-combiner.c new file +24
-0+ else + return -EINVAL; +} +#endif + +/* +* domain callbacks +*/ + +static int combiner_irq_map (struct irq_domain *domain,unsigned int irq, +irq_hw_number_t hwirq) +{ +struct combiner *combiner = domain->host_data; + +if (hwirq >= combiner->nirqs) +return -EINVAL ; + +irq_set_chip_and_handler (irq, &combiner->irq_chip, handle_level_irq); +irq_set_chip_data (irq, combiner); +irq_set_parent (irq, combiner->parent_irq); +irq_set_noprobe (irq); +return 0 ; +} +
drivers/irqchip/qcom-irq-combiner.c line 170
Quoted 10 lines
drivers/irqchip/qcom-irq-combiner.c new file +10
-0+static void combiner_irq_unmap (struct irq_domain *domain,unsigned int irq) +{ +irq_set_chip_and_handler (irq,NULL ,NULL ); +irq_set_chip_data (irq,NULL ); +irq_set_parent (irq,-1 ); +} + +static struct irq_domain_ops domain_ops = { + .map = combiner_irq_map, + .unmap = combiner_irq_unmap
Once you've switched to the irq_fwspec abstraction, you'll need a .translate method as well.
Quoted 39 lines
drivers/irqchip/qcom-irq-combiner.c new file +39
-0+}; + +/* +* Probing and initialization. +* +* Combiner devices reside inside the TCSR block so the resulting DSDT +* topology is: +* +* Device (TCS0) +* { +* Name (_HID, "QCOM80B0") // Qualcomm TCSR controller +* Name (_UID, 0) +* +* Method (_CRS, 0x0, Serialized) { +* Name (RBUF, ResourceTemplate () +* { +* Memory32Fixed (ReadWrite, 0x2E10000, 0x00001000) +* }) +* Return (RBUF) +* } +* +* Device (QIC0) +* { +* Name(_HID,"QCOM80B1") // Qualcomm TCSR IRQ combiner +* ... +* } // end Device QIC0 +* ... +* } +* +* Thus all combiner devices same the same memory mapping from the parent +* device. +*/ + +static int __init combiner_probe (struct platform_device *pdev) +{ +struct platform_device *tcsr_pdev; +struct combiner *combiner; +void __iomem *tcsr_base; +size_t alloc_sz;
drivers/irqchip/qcom-irq-combiner.c line 219
Quoted 10 lines
drivers/irqchip/qcom-irq-combiner.c new file +10
-0+u32 nregs; +u32 nirqs; + + tcsr_pdev =to_platform_device (pdev->dev.parent); + tcsr_base =platform_get_drvdata (tcsr_pdev); +if (!tcsr_base) +return -ENODEV ; + +if (device_property_read_u32 (&pdev->dev,"qcom,combiner-nr-irqs" , + &nirqs)) {
Where are these bindings documented?
Quoted 73 lines
drivers/irqchip/qcom-irq-combiner.c new file +73
-0+dev_err (&pdev->dev,"Error reading number of IRQs\n" ); +return -EINVAL ; + } + + nregs =device_property_read_u32_array (&pdev->dev,"qcom,combiner-regs" , +NULL ,0 ); +if (nregs <DIV_ROUND_UP (nirqs,REG_SIZE )) { +dev_err (&pdev->dev,"Error reading regs property\n" ); +return -EINVAL ; + } + + alloc_sz =sizeof (*combiner) +sizeof (struct combiner_reg ) * nregs; + combiner =devm_kzalloc (&pdev->dev, alloc_sz,GFP_KERNEL ); +if (combiner) { +int i; +u32 regs[nregs]; + +if (device_property_read_u32_array (&pdev->dev, +"qcom,combiner-regs" , + regs, nregs)) { +dev_err (&pdev->dev,"Error reading regs property\n" ); +return -EINVAL ; + } + + combiner->nirqs = nirqs; + combiner->nregs = nregs; +for (i =0 ; i < nregs; i++) { + combiner->regs[i].addr = tcsr_base + regs[i]; + combiner->regs[i].mask =0 ; + } + }else { +return -ENOMEM ; + } + + combiner->irq_chip.irq_mask = combiner_irq_chip_mask_irq; + combiner->irq_chip.irq_unmask = combiner_irq_chip_unmask_irq; +#ifdef CONFIG_SMP + combiner->irq_chip.irq_set_affinity = combiner_irq_chip_set_affinity; +#endif + + combiner->parent_irq =platform_get_irq (pdev,0 ); +if (combiner->parent_irq <=0 ) { +dev_err (&pdev->dev,"Error getting IRQ resource\n" ); +return -EINVAL ; + } + + combiner->domain =irq_domain_create_linear (pdev->dev.fwnode, nirqs, + &domain_ops, combiner); +if (!combiner->domain) +/* Errors printed by irq_domain_create_linear */ +return -ENODEV ; + +irq_set_chained_handler_and_data (combiner->parent_irq, + combiner_handle_irq, combiner); + +if (device_property_read_string (&pdev->dev,"qcom,combiner-name" , + &combiner->irq_chip.name) !=0 ) + combiner->irq_chip.name ="qcom-irq-combiner" ; + +dev_info (&pdev->dev,"Initialized with [p=%d,n=%d,r=%p]\n" , + combiner->parent_irq, nirqs, combiner->regs[0 ].addr); +return 0 ; +} + +static const struct acpi_device_id qcom_irq_combiner_acpi_match[] = { + {"QCOM80B1" , }, + { } +}; + +static struct platform_driver qcom_irq_combiner_probe = { + .driver = { + .name ="qcom-irq-combiner" , + .owner =THIS_MODULE ,
drivers/irqchip/qcom-irq-combiner.c line 302
Quoted 10 lines
drivers/irqchip/qcom-irq-combiner.c new file +10
-0+ .acpi_match_table = ACPI_PTR(qcom_irq_combiner_acpi_match), + }, + .probe = combiner_probe, +}; + +static int __init register_qcom_irq_combiner (void ) +{ +return platform_driver_register (&qcom_irq_combiner_probe); +} +arch_initcall (register_qcom_irq_combiner);
That bloody ugly. We don't probe platform drivers from an arch_initcall. Yes, probing it later will result in dependency problems. You can either work around it by deferring the probe of other drivers when they fail to get their interrupt, or help designing a generic solution for this issue (mbigen is in the same boat).
Quoted 32 lines
drivers/irqchip/qcom-irq-combiner.c new file +32
-0+ +static int __init tcsr_probe (struct platform_device *pdev) +{ +struct resource *mr; +void __iomem *tcsr_base; + + mr =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (mr ==NULL ) { +dev_err (&pdev->dev,"Error getting memory resource\n" ); +return -EINVAL ; + } + + tcsr_base =devm_ioremap_resource (&pdev->dev, mr); +if (IS_ERR (tcsr_base)) { +dev_err (&pdev->dev,"Error mapping memory resource\n" ); +return PTR_ERR (tcsr_base); + } + +dev_info (&pdev->dev,"Initialized TCSR block @%pa\n" , &mr->start); +platform_set_drvdata (pdev, tcsr_base); +return 0 ; +} + +static const struct acpi_device_id qcom_tcsr_acpi_match[] = { + {"QCOM80B0" , }, + { } +}; + +static struct platform_driver qcom_tcsr_probe = { + .driver = { + .name ="qcom-tcsr" , + .owner =THIS_MODULE ,
drivers/irqchip/qcom-irq-combiner.c line 344
Quoted 10 lines
drivers/irqchip/qcom-irq-combiner.c new file +10
-0+ .acpi_match_table = ACPI_PTR(qcom_tcsr_acpi_match), + }, + .probe = tcsr_probe, +}; + +static int __init register_qcom_tcsr (void ) +{ +return platform_driver_register (&qcom_tcsr_probe); +} +arch_initcall (register_qcom_tcsr);
Same remark here. Also, if this irqchip is the only interesting thing in the TCSR, why is it a separate device? If there is more to it, make it a separate driver (a MFD or something similar...).
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny.
Adding linux-arm-kernel and linux-acpi
Quoted 42 lines · Agustin Vega-Frias
Add support for IRQ combiners in the Top-level Control and Status Registers (TCSR) hardware block in Qualcomm Technologies chips.
The first patch adds support for ResourceSource/IRQ domain mapping when using Extended IRQ Resources with a specific ResourceSource. The core ACPI resource management code has been changed to lookup the IRQ domain when an IRQ resource indicates a ResourceSource, and register the IRQ on that domain, instead of a GSI.
The second patch takes advantage of the new capabilities to implement the driver for the IRQ combiners.
Changes V1 -> V2:
* Remove use of GPIO library for the combiner
* Refactor to use fwnode/ResourceSource to IRQ domain mapping introduced in ACPI coreChanges V2 -> V3:
* Removed parsing of_PRSto find IRQs
* Removedacpi_irq_domain_createandacpi_irq_domain_removeAgustin Vega-Frias (2):
ACPI: Add support for ResourceSource/IRQ domain mapping
irqchip: qcom: Add IRQ combiner driverdrivers/acpi/Makefile | 1 + drivers/acpi/irqdomain.c | 108 +++++++++++ drivers/acpi/resource.c | 23 ++- drivers/irqchip/Kconfig | 8 + drivers/irqchip/Makefile | 1 + drivers/irqchip/qcom-irq-combiner.c | 344 ++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 + 7 files changed, 483 insertions(+), 8 deletions(-) create mode 100644 drivers/acpi/irqdomain.c create mode 100644 drivers/irqchip/qcom-irq-combiner.c--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
Signature · 4 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.