Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1207509 > unrolled thread
| Started by | Grygorii Strashko <grygorii.strashko@ti.com> |
|---|---|
| First post | 2015-08-14 14:30 +0200 |
| Last post | 2015-08-20 01:30 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v3 0/6] genirq: irqdomain_hierarchy: fixes Grygorii Strashko <grygorii.strashko@ti.com> - 2015-08-14 14:30 +0200
[PATCH v3 6/6] irqchip: crossbar: fix set_wake functionality Grygorii Strashko <grygorii.strashko@ti.com> - 2015-08-14 14:30 +0200
[tip:irq/urgent] irqchip/crossbar: Restore set_wake functionality tip-bot for Grygorii Strashko <tipbot@zytor.com> - 2015-08-20 01:30 +0200
| From | Grygorii Strashko <grygorii.strashko@ti.com> |
|---|---|
| Date | 2015-08-14 14:30 +0200 |
| Subject | [PATCH v3 0/6] genirq: irqdomain_hierarchy: fixes |
| Message-ID | <pXmhs-1Xw-9@gated-at.bofh.it> |
Hi All, I've had able to identify and reproduce four issues related to switching on using IRQ domain hierarchy on TI OMAP DRA7 (dra7-evm). Most of them were discovered during testing of Suspend to RAM and IRQ wakeup functionality. In my opinion, most of these issue could also affect on other ARM SoC if they are using IRQ domain hierarchy. In case of TI OMAP DRA7 the following IRQ hierarchy is defined: ARM GIC <- OMAP wakeupgen <- TI CBAR Issue 1 - patch 1: IRQ re-triggering is not working if IRQ domain hierarchy used in combination with ARM GIC and irq_chip_retrigger_hierarchy() is used by child IRQ domain. Issue 2 - patches 2-4: ARM GIC IRQ triggering type is not configured properly when IRQ is routed through IRQ domain hierarchy and system started using DT. As result, system will start using default ARM GIC configuration, ignore DT IRQ triggering configuration, and value of desc->irq_data.state_use_accessors = 0. / # cat /proc/interrupts -- before 230: 0 0 CBAR 30 Edge -00000000 48051000.gpio 263: 0 0 CBAR 116 Edge -00000000 48053000.gpio 296: 246 0 CBAR 67 Edge -00000000 OMAP UART0 311: 341 0 CBAR 51 Edge -00000000 48070000.i2c 312: 3 0 CBAR 52 Edge -00000000 48072000.i2c 313: 0 0 CBAR 56 Edge -00000000 48060000.i2c 314: 255 0 CBAR 78 Edge -00000000 mmc0 315: 40 0 CBAR 81 Edge -00000000 mmc1 316: 13 0 CBAR 91 Edge -00000000 mmc2 320: 0 0 CBAR 49 Edge -00000000 4a140000.sata 324: 0 0 CBAR 1 Edge -00000000 48078000.elm 325: 0 0 CBAR 15 Edge -00000000 gpmc 333: 0 0 CBAR 335 Edge -00000000 48484000.ethernet 334: 0 0 CBAR 336 Edge -00000000 48484000.ethernet 415: 0 0 pcf857x 2 Edge -00000000 btnUser1 416: 0 0 pcf857x 3 Edge -00000000 btnUser2 445: 0 0 pinctrl 992 Edge -00010000 4806a000.seria / # cat /proc/interrupts -- after 230: 0 0 CBAR 30 Level -00002004 48051000.gpio 263: 0 0 CBAR 116 Level -00002004 48053000.gpio 296: 567 0 CBAR 67 Level -00002004 OMAP UART0 311: 363 0 CBAR 51 Level -00002004 48070000.i2c 312: 3 0 CBAR 52 Level -00002004 48072000.i2c 313: 0 0 CBAR 56 Level -00002004 48060000.i2c 314: 197 0 CBAR 78 Level -00002004 mmc0 315: 40 0 CBAR 81 Level -00002004 mmc1 316: 13 0 CBAR 91 Level -00002004 mmc2 320: 0 0 CBAR 49 Level -00002004 4a140000.sata 324: 0 0 CBAR 1 Level -00002004 48078000.elm 325: 0 0 CBAR 15 Level -00002004 gpmc 333: 0 0 CBAR 335 Level -00002004 48484000.ethernet 334: 0 0 CBAR 336 Level -00002004 48484000.ethernet 415: 0 0 pcf857x 2 Edge -00000000 btnUser1 416: 4 2 pcf857x 3 Edge -00000000 btnUser2 445: 0 0 pinctrl 992 Edge -00010000 4806a000.serial -xxxxxxxx are current values of desc->irq_data.state_use_accessors Issue 3 - patch 5: ARM GIC IRQs are not masked during suspend even if they are not wakeup source. This issue related to IRQCHIP MASK ON SUSPEND flag usage and, honestly, it's not clear how this flag has to be processed in case of IRQ domain hierarchy - previously there was one IRQ chip per IRQ desc and if it has IRQCHIP MASK ON SUSPEND flag set we had to mask IRQ. But now there are up to three (DRA7) IRQ chip per IRQ desc, and all of them could have different IRQCHIP MASK ON SUSPEND flag's configuration. Here, to fix an issue, I've just added IRQCHIP MASK ON SUSPEND flag to TI Crossbar which is the last IRQ domain in hierarchy. Issue 4 - patch 6: On TI dra7-evm, when irq_set_irq_type() is called for IRQ which belongs to IRQ domain hierarchy the .irq_set_wake() callback will be executed for TI Crossbar IRQ chip. The TI Crossbar doesn't provides any facility to configure the wakeup sources, but it implements .irq_set_wake() callback as: .irq_set_wake = irq_chip_set_wake_parent As result, the irq_chip_set_wake_parent() will try to execute .irq_set_wake() callback for parent IRQ domain, which is TI OMAP wakeupgen, but TI OMAP wakeupgen has IRQCHIP_SKIP_SET_WAKE flag set and do not implement .irq_set_wake() callback. Thus, irq_chip_set_wake_parent() will fail with -ENOSYS, but it shouldn't. IRQ domain hierarchy code was merged in 4.1, so it seems these patches are material for stable 4.1+. Tested on: TI OMAP DRA7, dra7-evm Series based on: Linux 4.2-rc6 Changes in v3: - copy-past issue fixed in patch 'genirq: introduce irq_chip_set_type_parent() helper' - dropped patch 'genirq: fix irqchip_set_wake_parent if IRQCHIP_SKIP_SET_WAKE' - added patch 'irqchip: crossbar: fix set_wake functionality' Changes in v2: - initial patch has been split on three; - added three more patches. Links: v2: https://lkml.org/lkml/2015/8/12/759 v1: https://lkml.org/lkml/2015/8/11/179 Cc: Sudeep Holla <sudeep.holla@arm.com> Cc: Jiang Liu <jiang.liu@linux.intel.com> Grygorii Strashko (6): genirq: fix irq_chip_retrigger_hierarchy genirq: introduce irq_chip_set_type_parent() helper irqchip: crossbar: fix arm gic irq type configuration ARM: OMAP: wakeupgen: fix arm gic irq type configuration irqchip: crossbar: fix irq masking at suspend irqchip: crossbar: fix set_wake functionality arch/arm/mach-omap2/omap-wakeupgen.c | 1 + drivers/irqchip/irq-crossbar.c | 4 +++- include/linux/irq.h | 1 + kernel/irq/chip.c | 19 ++++++++++++++++++- 4 files changed, 23 insertions(+), 2 deletions(-) -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Grygorii Strashko <grygorii.strashko@ti.com> |
|---|---|
| Date | 2015-08-14 14:30 +0200 |
| Subject | [PATCH v3 6/6] irqchip: crossbar: fix set_wake functionality |
| Message-ID | <pXmhs-1Xw-23@gated-at.bofh.it> |
| In reply to | #1207509 |
The TI crossbar doesn't provides any facility to configure the wakeup
sources, but it implements .irq_set_wake() callback:
.irq_set_wake = irq_chip_set_wake_parent
As result, the irq_chip_set_wake_parent() will try to execute
.irq_set_wake() callback for parent IRQ domain, which is TI OMAP wakeupgen,
but TI OMAP wakeupgen has IRQCHIP_SKIP_SET_WAKE flag set and do not
implement .irq_set_wake() callback. Thus, irq_chip_set_wake_parent() will
fail with -ENOSYS.
In case of TI OMAP DRA7 the issue reproduced with following
configuration:
ARM GIC<-OMAP wakeupgen<-TI CBAR<-GPIO<-GPIO pcf857x<-gpio_key
gpio_key is wakeup source
Failure is reproduced during suspend/resume to RAM:
suspend:
- gpio_keys_suspend
+ enable_irq_wake
+ pcf857x_irq_set_wake
+ omap_gpio_wake_enable
+ TI CBAR irq_chip_set_wake_parent
+ OMAP wakeupgen has no .irq_set_wake() and
-ENOSYS will be returned
resume:
- gpio_keys_resume
+ disable_irq_wake
+ irq_set_irq_wake
+ WARN(1, "Unbalanced IRQ %d wake disable\n", irq);
Hence, fix it by adding IRQCHIP_SKIP_SET_WAKE flag to TI Crossbar and
drop .irq_set_wake() at the same time.
Cc: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
drivers/irqchip/irq-crossbar.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c
index f5a72cc..c12bb93 100644
--- a/drivers/irqchip/irq-crossbar.c
+++ b/drivers/irqchip/irq-crossbar.c
@@ -68,9 +68,9 @@ static struct irq_chip crossbar_chip = {
.irq_mask = irq_chip_mask_parent,
.irq_unmask = irq_chip_unmask_parent,
.irq_retrigger = irq_chip_retrigger_hierarchy,
- .irq_set_wake = irq_chip_set_wake_parent,
.irq_set_type = irq_chip_set_type_parent,
- .flags = IRQCHIP_MASK_ON_SUSPEND,
+ .flags = IRQCHIP_MASK_ON_SUSPEND |
+ IRQCHIP_SKIP_SET_WAKE,
#ifdef CONFIG_SMP
.irq_set_affinity = irq_chip_set_affinity_parent,
#endif
--
2.5.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | tip-bot for Grygorii Strashko <tipbot@zytor.com> |
|---|---|
| Date | 2015-08-20 01:30 +0200 |
| Subject | [tip:irq/urgent] irqchip/crossbar: Restore set_wake functionality |
| Message-ID | <pZkXU-3Qu-5@gated-at.bofh.it> |
| In reply to | #1207510 |
Commit-ID: 8200fe4347870d4ad6475048bcdf3e7c106c5268
Gitweb: http://git.kernel.org/tip/8200fe4347870d4ad6475048bcdf3e7c106c5268
Author: Grygorii Strashko <grygorii.strashko@ti.com>
AuthorDate: Fri, 14 Aug 2015 15:20:30 +0300
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 20 Aug 2015 00:25:26 +0200
irqchip/crossbar: Restore set_wake functionality
The TI crossbar irqchip doesn't provides any facility to configure the
wakeup sources, but the conversion to hierarchical irqdomains set the
irq_set_wake callback to irq_chip_set_wake_parent. The parent chip
(OMAP wakeupgen) has no irq_set_wake function either so the call will
fail with -ENOSYS. As a result the irq_set_wake() call in the resume
path will trigger an 'Unbalanced wake disable' warning.
Before the conversion the GIC irqchip was the top level irqchip and
correctly flagged with IRQCHIP_SKIP_SET_WAKE.
Restore the correct behaviour by removing the irq_set_type callback
from the crossbar irqchip and set the IRQCHIP_SKIP_SET_WAKE flag which
lets the irq_set_irq_wake() call from the driver succeed.
[ tglx: Massaged changelog ]
Fixes: 783d31863fb8 ('irqchip: crossbar: Convert dra7 crossbar...')
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: <linux@arm.linux.org.uk>
Cc: <nsekhar@ti.com>
Cc: <jason@lakedaemon.net>
Cc: <balbi@ti.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: <tony@atomide.com>
Cc: <marc.zyngier@arm.com>
Cc: stable@vger.kernel.org # 4.1
Link: http://lkml.kernel.org/r/1439554830-19502-7-git-send-email-grygorii.strashko@ti.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
drivers/irqchip/irq-crossbar.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c
index f5a72cc..c12bb93 100644
--- a/drivers/irqchip/irq-crossbar.c
+++ b/drivers/irqchip/irq-crossbar.c
@@ -68,9 +68,9 @@ static struct irq_chip crossbar_chip = {
.irq_mask = irq_chip_mask_parent,
.irq_unmask = irq_chip_unmask_parent,
.irq_retrigger = irq_chip_retrigger_hierarchy,
- .irq_set_wake = irq_chip_set_wake_parent,
.irq_set_type = irq_chip_set_type_parent,
- .flags = IRQCHIP_MASK_ON_SUSPEND,
+ .flags = IRQCHIP_MASK_ON_SUSPEND |
+ IRQCHIP_SKIP_SET_WAKE,
#ifdef CONFIG_SMP
.irq_set_affinity = irq_chip_set_affinity_parent,
#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web