irqchip: qcom: Add IRQ combiner driver
Subsystems (4)
v8 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 patch prevents the ACPI core from attempting to map IRQ resources with a valid ResourceSource as GSIs.
The second patch fixes IRQ probe deferral by allowing platform_device IRQ resources to be re-initialized if the ACPI core failed to find the IRQ domain during ACPI bus scan.
Both changes described above are conditional on the ACPI_GENERIC_GSI config.
The third patch takes advantage of the new capabilities to implement the driver for the IRQ combiners.
Tested on top of v4.9-rc7.
Changes V7 -> V8:
* Reorder patches to allow all new code to be under drivers/acpi/irq.c.
* Change acpi_irq_get implementation to be more similar to of_irq_get to improve maintainability.
Changes V6 -> V7:
* Consolidate changes for ResourceSource/IRQ domain mapping to the same source file implementing the generic GSI support, making it conditional on CONFIG_ACPI_GENERIC_GSI.
* Eliminate some code duplication by implementing acpi_register_gsi in terms of the new acpi_register_irq API.
Changes V5 -> V6:
* Drop probe table and on-demand probing based on resource_source
* Add patch to fix probe deferral
* Change back combiner driver to use the platform_device/platform_driver APIs
Agustin Vega-Frias (3):
ACPI: Add support for ResourceSource/IRQ domain mapping
ACPI: Retry IRQ conversion if it failed previously
irqchip: qcom: Add IRQ combiner driver
drivers/acpi/Makefile | 2 +- drivers/acpi/gsi.c | 98 ----------- drivers/acpi/irq.c | 315 +++++++++++++++++++++++++++++++++ drivers/acpi/resource.c | 29 ++-- drivers/base/platform.c | 9 +- drivers/irqchip/Kconfig | 8 + drivers/irqchip/Makefile | 1 + drivers/irqchip/qcom-irq-combiner.c | 337 ++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 28 +++ 9 files changed, 714 insertions(+), 113 deletions(-) delete mode 100644 drivers/acpi/gsi.c create mode 100644 drivers/acpi/irq.c create mode 100644 drivers/irqchip/qcom-irq-combiner.c
--
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v8 1/3 ACPI: Add support for ResourceSource/IRQ domain mapping
When an Extended IRQ Resource contains a valid ResourceSource use it to map the IRQ on the domain associated with the ACPI device referenced.
With this in place an irqchip driver can create its domain using irq_domain_create_linear and pass the device fwnode to create the domain mapping. When dependent devices are probed these changes allow the ACPI core find the domain and map the IRQ.
---
drivers/acpi/Makefile | 2 +-
drivers/acpi/{gsi.c => irq.c} | 99 +++++++++++++++++++++++++++++++++++++------
drivers/acpi/resource.c | 29 +++++++------
include/linux/acpi.h | 19 +++++++++
4 files changed, 122 insertions(+), 27 deletions(-)
rename drivers/acpi/{gsi.c => irq.c} (52%)drivers/acpi/Makefile +1 -1
@@ -55,7 +55,7 @@ acpi-$(CONFIG_DEBUG_FS) += debugfs.o 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-$(CONFIG_ACPI_GENERIC_GSI) += irq.o acpi-$(CONFIG_ACPI_WATCHDOG) += acpi_watchdog.o # These are (potentially) separate modules
drivers/acpi/irq.c renamed from drivers/acpi/gsi.c +86 -13
128 lines not on this page · raw message
drivers/acpi/resource.c +16 -13
@@ -374,21 +374,22 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity) }EXPORT_SYMBOL_GPL (acpi_dev_get_irq_type); -static void acpi_dev_irqresource_disabled (struct resource *res,u32 gsi) +static void acpi_dev_irqresource_disabled (struct resource *res,u32 hwirq) { - res->start = gsi; - res->end = gsi; + res->start = hwirq; + res->end = hwirq; 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 hwirq, +struct fwnode_handle *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 && !valid_IRQ (hwirq)) { +acpi_dev_irqresource_disabled (res, hwirq);return ; }
@@ -402,25 +403,25 @@ 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 (hwirq, &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, - t ?"level" :"edge" , p ?"low" :"high" ); +pr_warn ("ACPI: IRQ %d override to %s, %s\n" , hwirq, + t ?"level" :"edge" , p ?"low" :"high" ); triggering = trig; polarity = pol; } } res->flags =acpi_dev_irq_flags (triggering, polarity, shareable); - irq =acpi_register_gsi (NULL , gsi, triggering, polarity); + irq =acpi_register_irq (source, hwirq, triggering, polarity);if (irq >=0 ) { res->start = irq; res->end = irq; }else { -acpi_dev_irqresource_disabled (res, gsi); +acpi_dev_irqresource_disabled (res, hwirq); } }
@@ -448,6 +449,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 fwnode_handle *src;switch (ares->type) {case ACPI_RESOURCE_TYPE_IRQ :
@@ -460,7 +462,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],NULL , irq->triggering, irq->polarity, irq->sharable, true);break ;
@@ -470,7 +472,8 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,acpi_dev_irqresource_disabled (res,0 );return false; } -acpi_dev_get_irqresource (res, ext_irq->interrupts[index], + src =acpi_get_irq_source_fwhandle (&ext_irq->resource_source); +acpi_dev_get_irqresource (res, ext_irq->interrupts[index], src, ext_irq->triggering, ext_irq->polarity, ext_irq->sharable, false);break ;
include/linux/acpi.h +19 -0
@@ -321,6 +321,25 @@ void acpi_set_irq_model(enum acpi_irq_model_id model,*/ void acpi_unregister_gsi (u32 gsi); +#ifdef CONFIG_ACPI_GENERIC_GSI +struct fwnode_handle * +acpi_get_irq_source_fwhandle (const struct acpi_resource_source *source); +int acpi_register_irq (struct fwnode_handle *source,u32 hwirq,int trigger, +int polarity); +void acpi_unregister_irq (struct fwnode_handle *source,u32 hwirq); +#else +#define acpi_get_irq_source_fwhandle (source) (NULL) +static inline int acpi_register_irq (struct fwnode_handle *source,u32 hwirq, +int trigger,int polarity) +{ +return acpi_register_gsi (NULL , hwirq, trigger, polarity); +} +static inline void acpi_unregister_irq (struct fwnode_handle *source,u32 hwirq) +{ +acpi_unregister_gsi (hwirq); +} +#endif +struct pci_dev ;int acpi_pci_irq_enable (struct pci_dev *dev);
Signature · 2 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v8 2/3 ACPI: Retry IRQ conversion if it failed previously
In reply to Agustin Vega-FriasThis allows probe deferral to work properly when a dependent device fails to get a valid IRQ because the IRQ domain was not registered at the time the resources were added to the platform_device.
--- drivers/acpi/irq.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++ drivers/base/platform.c | 9 ++- include/linux/acpi.h | 9 +++ 3 files changed, 161 insertions(+), 1 deletion(-)
drivers/acpi/irq.c +144 -0
@@ -158,6 +158,150 @@ void acpi_unregister_gsi(u32 gsi)EXPORT_SYMBOL_GPL (acpi_unregister_gsi);/** +* Context for the resource walk used to lookup IRQ resources. +*/ +struct acpi_irq_parse_one_ctx { +int rc; +unsigned int index; +unsigned long *res_flags; +struct irq_fwspec *fwspec; +}; + +/** +* acpi_irq_parse_one_match - Handle a matching IRQ resource +*/ +static inline void acpi_irq_parse_one_match (struct fwnode_handle *fwnode, +u32 hwirq,u8 triggering, +u8 polarity,u8 shareable, +struct acpi_irq_parse_one_ctx *ctx) +{ + ctx->rc =0 ; + *ctx->res_flags =acpi_dev_irq_flags (triggering, polarity, shareable); + ctx->fwspec->fwnode = fwnode; + ctx->fwspec->param[0 ] = hwirq; + ctx->fwspec->param[1 ] =acpi_dev_get_irq_type (triggering, polarity); + ctx->fwspec->param_count =2 ; +} + +/** +* acpi_irq_parse_one_cb - Handle the given resource +* @ares: resource to handle +* @context: context for the walk, contains the lookup index and references +* to the flags and fwspec where the result is returned +* +* This is called by acpi_walk_resources passing each resource returned by +* the _CRS method. We only inspect IRQ resources. Since IRQ resources +* might contain multiple interrupts we check if the index is within this +* one's interrupt array, otherwise we subtract the current resource IRQ +* count from the lookup index to prepare for the next resource. +* Once a match is found we call acpi_irq_parse_one_match to populate +* the result and end the walk by returning AE_CTRL_TERMINATE. +* +* Return AE_OK if the walk should continue, AE_CTRL_TERMINATE if a matching +* IRQ resource was found. +*/ +static acpi_status acpi_irq_parse_one_cb (struct acpi_resource *ares, +void *context) +{ +struct acpi_irq_parse_one_ctx *ctx = context; +struct acpi_resource_irq *irq; +struct acpi_resource_extended_irq *eirq; +struct fwnode_handle *fwnode; + +switch (ares->type) { +case ACPI_RESOURCE_TYPE_IRQ : + irq = &ares->data.irq; +if (ctx->index >= irq->interrupt_count) { + ctx->index -= irq->interrupt_count; +return AE_OK ; + } + fwnode = acpi_gsi_domain_id; +acpi_irq_parse_one_match (fwnode, irq->interrupts[ctx->index], + irq->triggering, irq->polarity, + irq->sharable, ctx); +return AE_CTRL_TERMINATE ; +case ACPI_RESOURCE_TYPE_EXTENDED_IRQ : + eirq = &ares->data.extended_irq; +if (ctx->index >= eirq->interrupt_count) { + ctx->index -= eirq->interrupt_count; +return AE_OK ; + } + fwnode =acpi_get_irq_source_fwhandle (&eirq->resource_source); +acpi_irq_parse_one_match (fwnode, eirq->interrupts[ctx->index], + eirq->triggering, eirq->polarity, + eirq->sharable, ctx); +return AE_CTRL_TERMINATE ; + } + +return AE_OK ; +} + +/** +* acpi_irq_parse_one - Resolve an interrupt for a device +* @handle: the device whose interrupt is to be resolved +* @index: index of the interrupt to resolve +* @fwspec: structure irq_fwspec filled by this function +* @flags: resource flags filled by this function +* +* This function resolves an interrupt for a device by walking its CRS resources +* to find the appropriate ACPI IRQ resource and populating the given structure +* which can be used to retrieve a Linux IRQ number. +* +* Returns the result stored in ctx.rc by the callback, or -EINVAL if the given +* index is out of range. +*/ +static int acpi_irq_parse_one (acpi_handle handle,unsigned int index, +struct irq_fwspec *fwspec,unsigned long *flags) +{ +struct acpi_irq_parse_one_ctx ctx = { -EINVAL , index, flags, fwspec }; +acpi_status status; + + status =acpi_walk_resources (handle,METHOD_NAME__CRS , + acpi_irq_parse_one_cb, &ctx); +if (ACPI_FAILURE (status)) +return -EINVAL ; +return ctx.rc; +} + +/** +* acpi_irq_get - Look for the ACPI IRQ resource with the given index and +* use it to initialize the given Linux IRQ resource. +* @handle ACPI device handle +* @index ACPI IRQ resource index to lookup +* @res Linux IRQ resource to initialize +* +* Return: 0 on success +* -EINVAL if an error occurs +* -EPROBE_DEFER if the IRQ lookup/conversion failed +*/ +int acpi_irq_get (acpi_handle handle,unsigned int index,struct resource *res) +{ +int rc; +struct irq_fwspec fwspec; +struct irq_domain *domain; +unsigned long flags; + + rc =acpi_irq_parse_one (handle, index, &fwspec, &flags); +if (rc) +return rc; + + domain =irq_find_matching_fwnode (fwspec.fwnode,DOMAIN_BUS_ANY ); +if (!domain) +return -EPROBE_DEFER ; + + rc =irq_create_fwspec_mapping (&fwspec); +if (rc <=0 ) +return -EINVAL ; + + res->start = rc; + res->end = rc; + res->flags = flags; + +return 0 ; +} +EXPORT_SYMBOL_GPL (acpi_irq_get); + +/** * acpi_set_irq_model - Setup the GSI irqdomain information * @model: the value assigned to acpi_irq_model * @fwnode: the irq_domain identifier for mapping and looking up
drivers/base/platform.c +8 -1
@@ -102,6 +102,14 @@ int platform_get_irq(struct platform_device *dev, unsigned int num) } r =platform_get_resource (dev,IORESOURCE_IRQ , num); +if (r && r->flags &IORESOURCE_DISABLED &&ACPI_COMPANION (&dev->dev)) { +int ret; + + ret =acpi_irq_get (ACPI_HANDLE (&dev->dev), num, r); +if (ret) +return ret; + } +/* * The resources may pass trigger flags to the irqs that need * to be set up. It so happens that the trigger flags for
@@ -1450,4 +1458,3 @@ void __init early_platform_cleanup(void)memset (&pd->dev.devres_head,0 ,sizeof (pd->dev.devres_head)); } } -
include/linux/acpi.h +9 -0
@@ -327,6 +327,7 @@ struct fwnode_handle *int acpi_register_irq (struct fwnode_handle *source,u32 hwirq,int trigger,int polarity);void acpi_unregister_irq (struct fwnode_handle *source,u32 hwirq); +int acpi_irq_get (acpi_handle handle,unsigned int index,struct resource *res);#else #define acpi_get_irq_source_fwhandle (source) (NULL) static inline int acpi_register_irq(struct fwnode_handle *source, u32 hwirq,
@@ -785,6 +786,14 @@ static inline int acpi_reconfig_notifier_unregister(struct notifier_block *nb)#endif /* !CONFIG_ACPI */ +#ifndef CONFIG_ACPI_GENERIC_GSI +static inline int acpi_irq_get (acpi_handle handle,unsigned int index, +struct resource *res) +{ +return -EINVAL ; +} +#endif /* CONFIG_ACPI_GENERIC_GSI */ +#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC int acpi_ioapic_add (acpi_handle root);#else
Signature · 2 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v8 3/3 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 | 337 ++++++++++++++++++++++++++++++++++++ 3 files changed, 346 insertions(+) create mode 100644 drivers/irqchip/qcom-irq-combiner.c
drivers/irqchip/Kconfig +8 -0
@@ -279,3 +279,11 @@ config EZNPS_GIC config STM32_EXTI bool select 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
@@ -74,3 +74,4 @@ obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o +obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.o
drivers/irqchip/qcom-irq-combiner.c new file +337 -0
337 lines not on this page · raw message
Signature · 2 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Hi Agustin,
Quoted 173 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 | 337 ++++++++++++++++++++++++++++++++++++ 3 files changed, 346 insertions(+) create mode 100644 drivers/irqchip/qcom-irq-combiner.cdrivers/irqchip/Kconfig +8
-0@@ -279,3 +279,11 @@ config EZNPS_GIC config STM32_EXTI bool select 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@@ -74,3 +74,4 @@ obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o +obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.odrivers/irqchip/qcom-irq-combiner.c new file +123
-0@@ -0,0 +1,337 @@ +/* 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/irqchip/chained_irq.h> +#include <linux/irqdomain.h> +#include <linux/platform_device.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); +} + +/* +* irq_domain_ops callbacks +*/ + +static int combiner_irq_map(struct irq_domain *domain, unsigned int irq,
drivers/irqchip/qcom-irq-combiner.c line 133
Quoted 10 lines
drivers/irqchip/qcom-irq-combiner.c new file +10
-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);
Do you really need this irq_set_parent? This only makes sense if you're resending edge interrupts, and you seem to be level only.
drivers/irqchip/qcom-irq-combiner.c line 142
Quoted 9 lines
drivers/irqchip/qcom-irq-combiner.c new file +9
-0+irq_set_noprobe (irq); +return 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 );
All of this should probably be replaced with a call to irq_domain_reset_irq_data().
drivers/irqchip/qcom-irq-combiner.c line 145
Quoted 3 lines
drivers/irqchip/qcom-irq-combiner.c new file +3
-0+} + +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
Is there any case where this is not valid?
drivers/irqchip/qcom-irq-combiner.c line 154
Quoted 9 lines
drivers/irqchip/qcom-irq-combiner.c new file +9
-0+static int combiner_irq_translate (struct irq_domain *d,struct irq_fwspec *fws, +unsigned long *hwirq,unsigned int *type) +{ +if (is_acpi_node (fws->fwnode)) { +if (fws->param_count !=2 ) +return -EINVAL ; + + *hwirq = fws->param[0 ]; + *type = fws->param[1 ];
Given that you're only handling level interrupts, shouldn't you abort if detecting an edge interrupt?
Quoted 106 lines
drivers/irqchip/qcom-irq-combiner.c new file +106
-0+ return 0; + } + +return -EINVAL ; +} +#endif + +static const struct irq_domain_ops domain_ops = { + .map = combiner_irq_map, + .unmap = combiner_irq_unmap, +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY + .translate = combiner_irq_translate +#endif +}; + +/* +* Device probing +*/ + +#ifdef CONFIG_ACPI + +static acpi_status count_registers_cb (struct acpi_resource *ares,void *context) +{ +int *count = context; + +if (ares->type ==ACPI_RESOURCE_TYPE_GENERIC_REGISTER ) + ++(*count); +return AE_OK ; +} + +static int count_registers (struct platform_device *pdev) +{ +struct acpi_device *adev =ACPI_COMPANION (&pdev->dev); +acpi_status status; +int count =0 ; + +if (!acpi_has_method (adev->handle,METHOD_NAME__CRS )) +return -EINVAL ; + + status =acpi_walk_resources (adev->handle,METHOD_NAME__CRS , + count_registers_cb, &count); +if (ACPI_FAILURE (status)) +return -EINVAL ; +return count; +} + +struct get_registers_context { +struct device *dev; +struct combiner *combiner; +int err; +}; + +static acpi_status get_registers_cb (struct acpi_resource *ares,void *context) +{ +struct get_registers_context *ctx = context; +struct acpi_resource_generic_register *reg; +phys_addr_t paddr; +void __iomem *vaddr; + +if (ares->type !=ACPI_RESOURCE_TYPE_GENERIC_REGISTER ) +return AE_OK ; + + reg = &ares->data.generic_reg; + paddr = reg->address; +if ((reg->space_id !=ACPI_SPACE_MEM ) || + (reg->bit_offset !=0 ) || + (reg->bit_width >REG_SIZE )) { +dev_err (ctx->dev,"Bad register resource @%pa\n" , &paddr); + ctx->err = -EINVAL ; +return AE_ERROR ; + } + + vaddr =devm_ioremap (ctx->dev, reg->address,REG_SIZE ); +if (IS_ERR (vaddr)) { +dev_err (ctx->dev,"Can't map register @%pa\n" , &paddr); + ctx->err =PTR_ERR (vaddr); +return AE_ERROR ; + } + + ctx->combiner->regs[ctx->combiner->nregs].addr = vaddr; + ctx->combiner->nirqs += reg->bit_width; + ctx->combiner->nregs++; +return AE_OK ; +} + +static int get_registers (struct platform_device *pdev,struct combiner *comb) +{ +struct acpi_device *adev =ACPI_COMPANION (&pdev->dev); +acpi_status status; +struct get_registers_context ctx; + +if (!acpi_has_method (adev->handle,METHOD_NAME__CRS )) +return -EINVAL ; + + ctx.dev = &pdev->dev; + ctx.combiner = comb; + ctx.err =0 ; + + status =acpi_walk_resources (adev->handle,METHOD_NAME__CRS , + get_registers_cb, &ctx); +if (ACPI_FAILURE (status)) +return ctx.err; +return 0 ; +} + +#else /* !CONFIG_ACPI */
drivers/irqchip/qcom-irq-combiner.c line 270
Quoted 10 lines
drivers/irqchip/qcom-irq-combiner.c new file +10
-0+ +static int count_registers (struct platform_device *pdev) +{ +return -EINVAL ; +} + +static int get_registers (struct platform_device *pdev,struct combiner *comb) +{ +return -EINVAL ; +}
So this driver is obviously ACPI only. Can't you just get rid of these, of the #ifdef CONFIG_ACPI, and simply make it depend on ACPI?
Quoted 19 lines
drivers/irqchip/qcom-irq-combiner.c new file +19
-0+ +#endif + +static int __init combiner_probe (struct platform_device *pdev) +{ +struct combiner *combiner; +size_t alloc_sz; +u32 nregs; +int err; + + nregs =count_registers (pdev); +if (nregs <=0 ) { +dev_err (&pdev->dev,"Error reading register resources\n" ); +return -EINVAL ; + } + + alloc_sz =sizeof (*combiner) +sizeof (struct combiner_reg ) * nregs; + combiner =devm_kzalloc (&pdev->dev, alloc_sz,GFP_KERNEL ); +if (!combiner)
drivers/irqchip/qcom-irq-combiner.c line 299
Quoted 10 lines
drivers/irqchip/qcom-irq-combiner.c new file +10
-0+return -ENOMEM ; + + err =get_registers (pdev, combiner); +if (err <0 ) +return err; + + combiner->parent_irq =platform_get_irq (pdev,0 ); +if (combiner->parent_irq <=0 ) { +dev_err (&pdev->dev,"Error getting IRQ resource\n" ); +return -EINVAL ;
Can you ever get in a situation where it'd be more sensible to return -EPROBE_DEFER? I'm thinking of a case where you'd have this irq chip cascaded into another one, which is not present yet?
drivers/irqchip/qcom-irq-combiner.c line 303
Quoted 4 lines
drivers/irqchip/qcom-irq-combiner.c new file +4
-0+ } + + combiner->domain =irq_domain_create_linear ( + pdev->dev.fwnode, combiner->nirqs, &domain_ops, combiner);
On a single line, please. Do no listen to the checkpatch police that will tell you otherwise. It really hurt my eyes to see this opening bracket and *nothing* after that.
drivers/irqchip/qcom-irq-combiner.c line 312
Quoted 9 lines
drivers/irqchip/qcom-irq-combiner.c new file +9
-0+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); + combiner->irq_chip.irq_mask = combiner_irq_chip_mask_irq; + combiner->irq_chip.irq_unmask = combiner_irq_chip_unmask_irq; + combiner->irq_chip.name = pdev->name;
Arghh. Please don't do that. Once you've called irq_set_chained_*, the interrupt is live, and can be requested. Unlikely, but still. In general, feeding uninitialized data to a function is pretty bad.
Also, do you really need to show pdev->name in /proc/cpuinfo? Just make the irq_chip structure static, outside of combiner, and have "QCOM80B1" (or something of your liking) as the name once and for all.
Quoted 16 lines
drivers/irqchip/qcom-irq-combiner.c new file +15
-0+ +dev_info (&pdev->dev,"Initialized with [p=%d,n=%d,r=%p]\n" , + combiner->parent_irq, combiner->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 337
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); +} +device_initcall (register_qcom_irq_combiner);
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Re: [PATCH V8 1/3] ACPI: Add support for ResourceSource/IRQ domain mapping
In reply to Agustin Vega-FriasHi Agustin,
please CC me for next version.
Quoted 13 lines · Agustin Vega-Frias
When an Extended IRQ Resource contains a valid ResourceSource use it to map the IRQ on the domain associated with the ACPI device referenced.
With this in place an irqchip driver can create its domain using
irq_domain_create_linearand pass the device fwnode to create the domain mapping. When dependent devices are probed these changes allow the ACPI core find the domain and map the IRQ.Signed-off-by Agustin Vega-Frias <[email protected]>--- drivers/acpi/Makefile | 2 +- drivers/acpi/{gsi.c => irq.c} | 99 +++++++++++++++++++++++++++++++++++++------
[...]
drivers/acpi/resource.c unsigned int acpi_dev_get_irq_type(int triggering, int polarity) · line 391
Quoted 11 lines
drivers/acpi/resource.c +3
-3-static void acpi_dev_get_irqresource (struct resource *res,u32 gsi, +static void acpi_dev_get_irqresource (struct resource *res,u32 hwirq, +struct fwnode_handle *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 && !valid_IRQ (hwirq)) {
If you make source a struct acpi_resource_source pointer it could be:
if (source || !valid_IRQ(hwirq))
Actually we would not even need to pass the pointer, if we detect an acpi_resource_source dependency we can just disable the resource (without even looking-up the fwnode_handle, see below), it is a design choice we have to make.
Quoted 53 lines
drivers/acpi/resource.c +8
-6+acpi_dev_irqresource_disabled (res, hwirq);return ; }@@ -402,25 +403,25 @@ 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 (hwirq, &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, - t ?"level" :"edge" , p ?"low" :"high" ); +pr_warn ("ACPI: IRQ %d override to %s, %s\n" , hwirq, + t ?"level" :"edge" , p ?"low" :"high" ); triggering = trig; polarity = pol; } } res->flags =acpi_dev_irq_flags (triggering, polarity, shareable); - irq =acpi_register_gsi (NULL , gsi, triggering, polarity); + irq =acpi_register_irq (source, hwirq, triggering, polarity);if (irq >=0 ) { res->start = irq; res->end = irq; }else { -acpi_dev_irqresource_disabled (res, gsi); +acpi_dev_irqresource_disabled (res, hwirq); } }@@ -448,6 +449,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 fwnode_handle *src;switch (ares->type) {case ACPI_RESOURCE_TYPE_IRQ :@@ -460,7 +462,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],NULL , irq->triggering, irq->polarity, irq->sharable, true);break ;
drivers/acpi/resource.c bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, · line 475
Quoted 5 lines
drivers/acpi/resource.c +1
-1@@ -470,7 +472,8 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,acpi_dev_irqresource_disabled (res,0 );return false; } - acpi_dev_get_irqresource(res, ext_irq->interrupts[index], + src =acpi_get_irq_source_fwhandle (&ext_irq->resource_source);
I think the only pending question on my side for this series is whether we still carry out the domain look-up here (as you are doing now), or, if we detect a resource_source dependency, we just disable the resource and leave the deferred probing mechanism to deal with it, this will completely decouple the current resource parsing from the deferred probe mechanism that you are introducing; basically this is equivalent to saying "if the IRQ resource has a dependency let's resolve it at acpi_irq_get() time, not now".
I am fine either way, I just think that leaving the domain look-up in the middle of the IRQ resource parsing is not really clean-cut.
Thanks,
Lorenzo
Quoted 42 lines
drivers/acpi/resource.c +1
-0+acpi_dev_get_irqresource (res, ext_irq->interrupts[index], src, ext_irq->triggering, ext_irq->polarity, ext_irq->sharable, false);break ;include/linux/acpi.h +19
-0@@ -321,6 +321,25 @@ void acpi_set_irq_model(enum acpi_irq_model_id model,*/ void acpi_unregister_gsi (u32 gsi); +#ifdef CONFIG_ACPI_GENERIC_GSI +struct fwnode_handle * +acpi_get_irq_source_fwhandle (const struct acpi_resource_source *source); +int acpi_register_irq (struct fwnode_handle *source,u32 hwirq,int trigger, +int polarity); +void acpi_unregister_irq (struct fwnode_handle *source,u32 hwirq); +#else +#define acpi_get_irq_source_fwhandle (source) (NULL) +static inline int acpi_register_irq (struct fwnode_handle *source,u32 hwirq, +int trigger,int polarity) +{ +return acpi_register_gsi (NULL , hwirq, trigger, polarity); +} +static inline void acpi_unregister_irq (struct fwnode_handle *source,u32 hwirq) +{ +acpi_unregister_gsi (hwirq); +} +#endif +struct pci_dev ;int acpi_pci_irq_enable (struct pci_dev *dev);Signature · 7 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V8 1/3] ACPI: Add support for ResourceSource/IRQ domain mapping
Hi Lorenzo,
Quoted 107 lines · Lorenzo Pieralisi
Hi Agustin,
please CC me for next version.
Quoted 14 lines · Agustin Vega-Frias
When an Extended IRQ Resource contains a valid ResourceSource use it to map the IRQ on the domain associated with the ACPI device referenced.
With this in place an irqchip driver can create its domain using
irq_domain_create_linearand pass the device fwnode to create the domain mapping. When dependent devices are probed these changes allow the ACPI core find the domain and map the IRQ.Signed-off-by Agustin Vega-Frias <[email protected]>--- drivers/acpi/Makefile | 2 +- drivers/acpi/{gsi.c => irq.c} | 99+++++++++++++++++++++++++++++++++++++------
[...]
drivers/acpi/resource.c unsigned int acpi_dev_get_irq_type(int triggering, int polarity) · line 391
Quoted 11 lines
drivers/acpi/resource.c +3
-3-static void acpi_dev_get_irqresource (struct resource *res,u32 gsi, +static void acpi_dev_get_irqresource (struct resource *res,u32 hwirq, +struct fwnode_handle *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 && !valid_IRQ (hwirq)) {If you make source a struct
acpi_resource_sourcepointer it could be:if (source || !valid_IRQ(hwirq))
Actually we would not even need to pass the pointer, if we detect an
acpi_resource_sourcedependency we can just disable the resource (without even looking-up thefwnode_handle, see below), it is a design choice we have to make.Quoted 56 lines
drivers/acpi/resource.c +7
-5+acpi_dev_irqresource_disabled (res, hwirq);return ; }@@ -402,25 +403,25 @@ 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 (hwirq, &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, - t ?"level" :"edge" , p ?"low" :"high" ); +pr_warn ("ACPI: IRQ %d override to %s, %s\n" , hwirq, + t ?"level" :"edge" , p ?"low" :"high" ); triggering = trig; polarity = pol; } } res->flags =acpi_dev_irq_flags (triggering, polarity, shareable); - irq =acpi_register_gsi (NULL , gsi, triggering, polarity); + irq =acpi_register_irq (source, hwirq, triggering, polarity);if (irq >=0 ) { res->start = irq; res->end = irq; }else { -acpi_dev_irqresource_disabled (res, gsi); +acpi_dev_irqresource_disabled (res, hwirq); } }@@ -448,6 +449,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 fwnode_handle *src;switch (ares->type) {drivers/acpi/resource.c +1
-1case ACPI_RESOURCE_TYPE_IRQ :@@ -460,7 +462,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],NULL , irq->triggering, irq->polarity, irq->sharable, true);drivers/acpi/resource.c +0
-0break ;drivers/acpi/resource.c bool acpi_dev_resource_interrupt(struct · line 476
Quoted 6 lines
drivers/acpi/resource.c +1
-1@@ -470,7 +472,8 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, acpi_dev_irqresource_disabled(res, 0);return false; } - acpi_dev_get_irqresource(res, ext_irq->interrupts[index], + src =acpi_get_irq_source_fwhandle (&ext_irq->resource_source);I think the only pending question on my side for this series is whether
Quoted 9 lines
we still carry out the domain look-up here (as you are doing now), or, if we detect a
resource_sourcedependency, we just disable the resource and leave the deferred probing mechanism to deal with it, this will completely decouple the current resource parsing from the deferred probe
mechanism that you are introducing; basically this is equivalent to saying "if the IRQ resource has a dependency let's resolve it atacpi_irq_get()time, not now".
I'm also torn about this so I am going to leave most of this code as it was originally and just ensure we don't attempt the mapping when we have a resource source.
I other words bus scan only maps GSIs and other IRQs are mapped via acpi_irq_get().
Thanks,
Agustin
Quoted 56 lines
I am fine either way, I just think that leaving the domain look-up in the middle of the IRQ resource parsing is not really clean-cut.
Thanks,
LorenzoQuoted 50 lines
drivers/acpi/resource.c +1
-0+acpi_dev_get_irqresource (res, ext_irq->interrupts[index], src, ext_irq->triggering, ext_irq->polarity, ext_irq->sharable, false);(quoted diff) +0
-0break;include/linux/acpi.h +9
-0@@ -321,6 +321,25 @@ void acpi_set_irq_model(enum acpi_irq_model_idmodel, */ void acpi_unregister_gsi (u32 gsi); +#ifdef CONFIG_ACPI_GENERIC_GSI +struct fwnode_handle * +acpi_get_irq_source_fwhandle (const struct acpi_resource_source *source); +int acpi_register_irq (struct fwnode_handle *source,u32 hwirq,int trigger, +int polarity); +void acpi_unregister_irq (struct fwnode_handle *source,u32 hwirq); +#else +#define acpi_get_irq_source_fwhandle (source) (NULL) +static inline int acpi_register_irq(struct fwnode_handle *source, u32hwirq,
include/linux/acpi.h +5
-0+ int trigger, int polarity) +{ +return acpi_register_gsi (NULL , hwirq, trigger, polarity); +} +static inline void acpi_unregister_irq(struct fwnode_handle *source,u32 hwirq)
include/linux/acpi.h +5
-1+{ +acpi_unregister_gsi (hwirq); +} +#endif +struct pci_dev ;int acpi_pci_irq_enable (struct pci_dev *dev); --Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 4 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Quoted 192 lines · Marc Zyngier
Hi Agustin,
Quoted 189 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 | 337 ++++++++++++++++++++++++++++++++++++ 3 files changed, 346 insertions(+) create mode 100644 drivers/irqchip/qcom-irq-combiner.cdrivers/irqchip/Kconfig +8
-0@@ -279,3 +279,11 @@ config EZNPS_GIC config STM32_EXTI bool select 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@@ -74,3 +74,4 @@ obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o +obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.odrivers/irqchip/qcom-irq-combiner.c new file +1
-0@@ -0,0 +1,337 @@ +/* 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 +5
-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 +83
-0+ +#include <linux/acpi.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/irqdomain.h> +#include <linux/platform_device.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 +9
-0+ +set_bit (irq_bit (data->hwirq), ®->mask); +} + +/* +* irq_domain_ops callbacks +*/ + +static int combiner_irq_map(struct irq_domain *domain, unsigned intirq,
drivers/irqchip/qcom-irq-combiner.c new file +6
-0+ irq_hw_number_t hwirq) +{ +struct combiner *combiner = domain->host_data; + +if (hwirq >= combiner->nirqs) +return -EINVAL ;
Quoted 8 lines
drivers/irqchip/qcom-irq-combiner.c line 133
Quoted 5 lines
drivers/irqchip/qcom-irq-combiner.c new file +2
-0+ + irq_set_chip_and_handler(irq, &combiner->irq_chip,
handle_level_irq);drivers/irqchip/qcom-irq-combiner.c new file +2
-0+irq_set_chip_data (irq, combiner); +irq_set_parent (irq, combiner->parent_irq);Do you really need this
irq_set_parent? This only makes sense if you're resending edge interrupts, and you seem to be level only.
OK, I'll take a look.
Quoted 14 lines
drivers/irqchip/qcom-irq-combiner.c line 142
Quoted 11 lines
drivers/irqchip/qcom-irq-combiner.c new file +5
-0+irq_set_noprobe (irq); +return 0 ; +} + +static void combiner_irq_unmap(struct irq_domain *domain, unsignedint irq)
drivers/irqchip/qcom-irq-combiner.c new file +4
-0+{ +irq_set_chip_and_handler (irq,NULL ,NULL ); +irq_set_chip_data (irq,NULL ); +irq_set_parent (irq,-1 );All of this should probably be replaced with a call to
irq_domain_reset_irq_data().
Will do.
Quoted 6 lines
drivers/irqchip/qcom-irq-combiner.c line 145
Quoted 4 lines
drivers/irqchip/qcom-irq-combiner.c new file +3
-0+} + +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY Is there any case where this is not valid?
What do you mean? Are you asking why is this under a preprocessor conditional? If so I did it to be on the safe side since translate in struct irq_domain_ops under that conditional.
Quoted 15 lines
drivers/irqchip/qcom-irq-combiner.c line 154
Quoted 11 lines
+static int combiner_irq_translate(struct
irq_domain*d, structirq_fwspec*fws,drivers/irqchip/qcom-irq-combiner.c new file +8
-0+ unsigned long *hwirq, unsigned int *type) +{ +if (is_acpi_node (fws->fwnode)) { +if (fws->param_count !=2 ) +return -EINVAL ; + + *hwirq = fws->param[0 ]; + *type = fws->param[1 ];Given that you're only handling level interrupts, shouldn't you abort if
detecting an edge interrupt?
I'll add the check.
Quoted 116 lines
Quoted 116 lines
drivers/irqchip/qcom-irq-combiner.c new file +22
-0+ return 0; + } + +return -EINVAL ; +} +#endif + +static const struct irq_domain_ops domain_ops = { + .map = combiner_irq_map, + .unmap = combiner_irq_unmap, +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY + .translate = combiner_irq_translate +#endif +}; + +/* +* Device probing +*/ + +#ifdef CONFIG_ACPI + +static acpi_status count_registers_cb(struct acpi_resource *ares,void *context)
drivers/irqchip/qcom-irq-combiner.c new file +31
-0+{ +int *count = context; + +if (ares->type ==ACPI_RESOURCE_TYPE_GENERIC_REGISTER ) + ++(*count); +return AE_OK ; +} + +static int count_registers (struct platform_device *pdev) +{ +struct acpi_device *adev =ACPI_COMPANION (&pdev->dev); +acpi_status status; +int count =0 ; + +if (!acpi_has_method (adev->handle,METHOD_NAME__CRS )) +return -EINVAL ; + + status =acpi_walk_resources (adev->handle,METHOD_NAME__CRS , + count_registers_cb, &count); +if (ACPI_FAILURE (status)) +return -EINVAL ; +return count; +} + +struct get_registers_context { +struct device *dev; +struct combiner *combiner; +int err; +}; + +static acpi_status get_registers_cb(struct acpi_resource *ares, void*context)
drivers/irqchip/qcom-irq-combiner.c new file +33
-0+{ +struct get_registers_context *ctx = context; +struct acpi_resource_generic_register *reg; +phys_addr_t paddr; +void __iomem *vaddr; + +if (ares->type !=ACPI_RESOURCE_TYPE_GENERIC_REGISTER ) +return AE_OK ; + + reg = &ares->data.generic_reg; + paddr = reg->address; +if ((reg->space_id !=ACPI_SPACE_MEM ) || + (reg->bit_offset !=0 ) || + (reg->bit_width >REG_SIZE )) { +dev_err (ctx->dev,"Bad register resource @%pa\n" , &paddr); + ctx->err = -EINVAL ; +return AE_ERROR ; + } + + vaddr =devm_ioremap (ctx->dev, reg->address,REG_SIZE ); +if (IS_ERR (vaddr)) { +dev_err (ctx->dev,"Can't map register @%pa\n" , &paddr); + ctx->err =PTR_ERR (vaddr); +return AE_ERROR ; + } + + ctx->combiner->regs[ctx->combiner->nregs].addr = vaddr; + ctx->combiner->nirqs += reg->bit_width; + ctx->combiner->nregs++; +return AE_OK ; +} + +static int get_registers(struct platform_device *pdev, structcombiner *comb)
drivers/irqchip/qcom-irq-combiner.c new file +26
-0+{ +struct acpi_device *adev =ACPI_COMPANION (&pdev->dev); +acpi_status status; +struct get_registers_context ctx; + +if (!acpi_has_method (adev->handle,METHOD_NAME__CRS )) +return -EINVAL ; + + ctx.dev = &pdev->dev; + ctx.combiner = comb; + ctx.err =0 ; + + status =acpi_walk_resources (adev->handle,METHOD_NAME__CRS , + get_registers_cb, &ctx); +if (ACPI_FAILURE (status)) +return ctx.err; +return 0 ; +} + +#else /* !CONFIG_ACPI */ + +static int count_registers (struct platform_device *pdev) +{ +return -EINVAL ; +} +
Quoted 8 lines
drivers/irqchip/qcom-irq-combiner.c line 136
Quoted 5 lines
+static int
get_registers(struct platform_device *pdev, struct combiner *comb)drivers/irqchip/qcom-irq-combiner.c new file +3
-0+{ +return -EINVAL ; +}So this driver is obviously ACPI only. Can't you just get rid of these, of the #ifdef
CONFIG_ACPI, and simply make it depend on ACPI?
Good point, will do.
Quoted 26 lines
Quoted 26 lines
drivers/irqchip/qcom-irq-combiner.c new file +25
-0+ +#endif + +static int __init combiner_probe (struct platform_device *pdev) +{ +struct combiner *combiner; +size_t alloc_sz; +u32 nregs; +int err; + + nregs =count_registers (pdev); +if (nregs <=0 ) { +dev_err (&pdev->dev,"Error reading register resources\n" ); +return -EINVAL ; + } + + alloc_sz =sizeof (*combiner) +sizeof (struct combiner_reg ) * nregs; + combiner =devm_kzalloc (&pdev->dev, alloc_sz,GFP_KERNEL ); +if (!combiner) +return -ENOMEM ; + + err =get_registers (pdev, combiner); +if (err <0 ) +return err; +
Quoted 8 lines
drivers/irqchip/qcom-irq-combiner.c line 299
Quoted 4 lines
drivers/irqchip/qcom-irq-combiner.c new file +4
-0+ combiner->parent_irq =platform_get_irq (pdev,0 ); +if (combiner->parent_irq <=0 ) { +dev_err (&pdev->dev,"Error getting IRQ resource\n" ); +return -EINVAL ;Can you ever get in a situation where it'd be more sensible to return -EPROBE_DEFER? I'm thinking of a case where you'd have this irq chip cascaded into another one, which is not present yet?
Not in the current architecture, but I agree it would accommodate other use cases. I will change it to return -EPROBE_DEFER.
Quoted 9 lines
drivers/irqchip/qcom-irq-combiner.c line 303
Quoted 5 lines
drivers/irqchip/qcom-irq-combiner.c new file +4
-0+ } + + combiner->domain =irq_domain_create_linear ( + pdev->dev.fwnode, combiner->nirqs, &domain_ops, combiner);On a single line, please. Do no listen to the checkpatch police that will tell you otherwise. It really hurt my eyes to see this opening bracket and *nothing* after that.
Will do.
Quoted 15 lines
drivers/irqchip/qcom-irq-combiner.c line 312
Quoted 10 lines
drivers/irqchip/qcom-irq-combiner.c new file +9
-0+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); + combiner->irq_chip.irq_mask = combiner_irq_chip_mask_irq; + combiner->irq_chip.irq_unmask = combiner_irq_chip_unmask_irq; + combiner->irq_chip.name = pdev->name;Arghh. Please don't do that. Once you've called irq_set_chained_*, the interrupt is live, and can be requested. Unlikely, but still. In general, feeding uninitialized data to a function is pretty bad.
Quoted 3 lines
Also, do you really need to show
pdev->namein/proc/cpuinfo? Just make theirq_chipstructure static, outside of combiner, and have "QCOM80B1" (or something of your liking) as the name once and for all.
I'll look at this.
Thanks for the detailed feedback.
Agustin.
Quoted 33 lines
Quoted 17 lines
drivers/irqchip/qcom-irq-combiner.c new file +15
-0+ +dev_info (&pdev->dev,"Initialized with [p=%d,n=%d,r=%p]\n" , + combiner->parent_irq, combiner->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 337
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); +} +device_initcall (register_qcom_irq_combiner);Thanks,
M.--
Jazz is not dead. It just smells funny...
Signature · 4 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Quoted 228 lines · Agustin Vega-Frias
Quoted 192 lines · Marc Zyngier
Hi Agustin,
Quoted 189 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 | 337 ++++++++++++++++++++++++++++++++++++ 3 files changed, 346 insertions(+) create mode 100644 drivers/irqchip/qcom-irq-combiner.cdrivers/irqchip/Kconfig +8
-0@@ -279,3 +279,11 @@ config EZNPS_GIC config STM32_EXTI bool select 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@@ -74,3 +74,4 @@ obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o +obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.odrivers/irqchip/qcom-irq-combiner.c new file +1
-0@@ -0,0 +1,337 @@ +/* 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 +5
-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 +83
-0+ +#include <linux/acpi.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/irqdomain.h> +#include <linux/platform_device.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 +9
-0+ +set_bit (irq_bit (data->hwirq), ®->mask); +} + +/* +* irq_domain_ops callbacks +*/ + +static int combiner_irq_map(struct irq_domain *domain, unsigned intirq,
drivers/irqchip/qcom-irq-combiner.c new file +6
-0+ irq_hw_number_t hwirq) +{ +struct combiner *combiner = domain->host_data; + +if (hwirq >= combiner->nirqs) +return -EINVAL ;Quoted 8 lines
drivers/irqchip/qcom-irq-combiner.c line 133
Quoted 5 lines
drivers/irqchip/qcom-irq-combiner.c new file +2
-0+ + irq_set_chip_and_handler(irq, &combiner->irq_chip,
handle_level_irq);drivers/irqchip/qcom-irq-combiner.c new file +2
-0+irq_set_chip_data (irq, combiner); +irq_set_parent (irq, combiner->parent_irq);Do you really need this
irq_set_parent? This only makes sense if you're resending edge interrupts, and you seem to be level only.OK, I'll take a look.
Quoted 14 lines
drivers/irqchip/qcom-irq-combiner.c line 142
Quoted 11 lines
drivers/irqchip/qcom-irq-combiner.c new file +5
-0+irq_set_noprobe (irq); +return 0 ; +} + +static void combiner_irq_unmap(struct irq_domain *domain, unsignedint irq)
drivers/irqchip/qcom-irq-combiner.c new file +4
-0+{ +irq_set_chip_and_handler (irq,NULL ,NULL ); +irq_set_chip_data (irq,NULL ); +irq_set_parent (irq,-1 );All of this should probably be replaced with a call to
irq_domain_reset_irq_data().Will do.
Quoted 6 lines
drivers/irqchip/qcom-irq-combiner.c line 145
Quoted 4 lines
drivers/irqchip/qcom-irq-combiner.c new file +3
-0+} + +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY Is there any case where this is not valid?
Quoted 3 lines
What do you mean? Are you asking why is this under a preprocessor conditional? If so I did it to be on the safe side since translate in struct
irq_domain_opsunder that conditional.
Since this code can only work when CONFIG_IRQ_DOMAIN_HIERARCHY is selected, you might as well make the KConfig entry select (or depend on
- I'm always confused about which one should be used when) this configuration symbol, and make the code more readable.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Quoted 11 lines · Agustin Vega-Frias
Quoted 8 lines · Marc Zyngier
drivers/irqchip/qcom-irq-combiner.c line 303
Quoted 4 lines
drivers/irqchip/qcom-irq-combiner.c new file +4
-0+ } + + combiner->domain =irq_domain_create_linear ( + pdev->dev.fwnode, combiner->nirqs, &domain_ops, combiner);On a single line, please. Do no listen to the checkpatch police that will tell you otherwise. It really hurt my eyes to see this opening bracket and *nothing* after that.
Will do.
It seems generally preferred to have at least one argument on the same line as the function being called.
So, here are some options:
Maximally fill the lines to 80 columns with the value being set and function call while aligning to open parenthesis
combiner->domain = irq_domain_create_linear(pdev->dev.fwnode, combiner->nirqs, &domain_ops, combiner);
Use a separate line for the function call:
combiner->domain = irq_domain_create_linear(pdev->dev.fwnode, combiner->nirqs, &domain_ops, combiner);
Or just ignore the 80 column limit wherever you deem appropriate.
No single style is universal, use what you think best.
Anyway, long identifiers (24 chars here) make staying within the "strongly preferred" 80 column limit produce quite silly looking code.
Quoted 16 lines · Joe Perches
Quoted 11 lines · Agustin Vega-Frias
Quoted 8 lines · Marc Zyngier
drivers/irqchip/qcom-irq-combiner.c line 303
Quoted 4 lines
drivers/irqchip/qcom-irq-combiner.c new file +4
-0+ } + + combiner->domain =irq_domain_create_linear ( + pdev->dev.fwnode, combiner->nirqs, &domain_ops, combiner);On a single line, please. Do no listen to the checkpatch police that will tell you otherwise. It really hurt my eyes to see this opening bracket and *nothing* after that.
Will do.
It seems generally preferred to have at least one argument on the same line as the function being called.
Quoted 8 lines
So, here are some options:
Maximally fill the lines to 80 columns with the value being set and function call while aligning to open parenthesis
combiner->domain = irq_domain_create_linear(pdev->dev.fwnode, combiner->nirqs, &domain_ops, combiner);
I can live with something like this.
Quoted 5 lines
Use a separate line for the function call:
combiner->domain = irq_domain_create_linear(pdev->dev.fwnode, combiner->nirqs, &domain_ops, combiner);
But I find this one pretty horrid.
Quoted 1 line
Or just ignore the 80 column limit wherever you deem appropriate.
Which is my usual advise. I consider the 80 column rule a good way of limiting the complexity of code (if the nesting pushes you too far on the right of the screen, you're doing something wrong), but not for simple statements such as this one.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...