From: Lubomir Rintel <lkundrak@v3.sk>
To: Olof Johansson <olof@lixom.net>
Cc: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>,
Marc Zyngier <maz@kernel.org>,
Kishon Vijay Abraham I <kishon@ti.com>,
Russell King <linux@armlinux.org.uk>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
Lubomir Rintel <lkundrak@v3.sk>
Subject: [PATCH 06/19] irqchip/mmp: add missing chained_irq_{enter,exit}()
Date: Fri, 9 Aug 2019 11:31:45 +0200 [thread overview]
Message-ID: <20190809093158.7969-7-lkundrak@v3.sk> (raw)
In-Reply-To: <20190809093158.7969-1-lkundrak@v3.sk>
The lack of chained_irq_exit() leaves the muxed interrupt masked on MMP3.
For reasons unknown this is not a problem on MMP2.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
drivers/irqchip/irq-mmp.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c
index af9cba4a51c2e..cd8d2253f56d1 100644
--- a/drivers/irqchip/irq-mmp.c
+++ b/drivers/irqchip/irq-mmp.c
@@ -13,6 +13,7 @@
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/irqchip.h>
+#include <linux/irqchip/chained_irq.h>
#include <linux/irqdomain.h>
#include <linux/io.h>
#include <linux/ioport.h>
@@ -132,11 +133,14 @@ struct irq_chip icu_irq_chip = {
static void icu_mux_irq_demux(struct irq_desc *desc)
{
unsigned int irq = irq_desc_get_irq(desc);
+ struct irq_chip *chip = irq_get_chip(irq);
struct irq_domain *domain;
struct icu_chip_data *data;
int i;
unsigned long mask, status, n;
+ chained_irq_enter(chip, desc);
+
for (i = 1; i < max_icu_nr; i++) {
if (irq == icu_data[i].cascade_irq) {
domain = icu_data[i].domain;
@@ -146,7 +150,7 @@ static void icu_mux_irq_demux(struct irq_desc *desc)
}
if (i >= max_icu_nr) {
pr_err("Spurious irq %d in MMP INTC\n", irq);
- return;
+ goto out;
}
mask = readl_relaxed(data->reg_mask);
@@ -158,6 +162,9 @@ static void icu_mux_irq_demux(struct irq_desc *desc)
generic_handle_irq(icu_data[i].virq_base + n);
}
}
+
+out:
+ chained_irq_exit(chip, desc);
}
static int mmp_irq_domain_map(struct irq_domain *d, unsigned int irq,
--
2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: Lubomir Rintel <lkundrak@v3.sk>
To: Olof Johansson <olof@lixom.net>
Cc: Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, Jason Cooper <jason@lakedaemon.net>,
Stephen Boyd <sboyd@kernel.org>, Marc Zyngier <maz@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Russell King <linux@armlinux.org.uk>,
Kishon Vijay Abraham I <kishon@ti.com>,
Lubomir Rintel <lkundrak@v3.sk>, Rob Herring <robh+dt@kernel.org>,
linux-arm-kernel@lists.infradead.org,
Thomas Gleixner <tglx@linutronix.de>,
linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 06/19] irqchip/mmp: add missing chained_irq_{enter,exit}()
Date: Fri, 9 Aug 2019 11:31:45 +0200 [thread overview]
Message-ID: <20190809093158.7969-7-lkundrak@v3.sk> (raw)
In-Reply-To: <20190809093158.7969-1-lkundrak@v3.sk>
The lack of chained_irq_exit() leaves the muxed interrupt masked on MMP3.
For reasons unknown this is not a problem on MMP2.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
drivers/irqchip/irq-mmp.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c
index af9cba4a51c2e..cd8d2253f56d1 100644
--- a/drivers/irqchip/irq-mmp.c
+++ b/drivers/irqchip/irq-mmp.c
@@ -13,6 +13,7 @@
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/irqchip.h>
+#include <linux/irqchip/chained_irq.h>
#include <linux/irqdomain.h>
#include <linux/io.h>
#include <linux/ioport.h>
@@ -132,11 +133,14 @@ struct irq_chip icu_irq_chip = {
static void icu_mux_irq_demux(struct irq_desc *desc)
{
unsigned int irq = irq_desc_get_irq(desc);
+ struct irq_chip *chip = irq_get_chip(irq);
struct irq_domain *domain;
struct icu_chip_data *data;
int i;
unsigned long mask, status, n;
+ chained_irq_enter(chip, desc);
+
for (i = 1; i < max_icu_nr; i++) {
if (irq == icu_data[i].cascade_irq) {
domain = icu_data[i].domain;
@@ -146,7 +150,7 @@ static void icu_mux_irq_demux(struct irq_desc *desc)
}
if (i >= max_icu_nr) {
pr_err("Spurious irq %d in MMP INTC\n", irq);
- return;
+ goto out;
}
mask = readl_relaxed(data->reg_mask);
@@ -158,6 +162,9 @@ static void icu_mux_irq_demux(struct irq_desc *desc)
generic_handle_irq(icu_data[i].virq_base + n);
}
}
+
+out:
+ chained_irq_exit(chip, desc);
}
static int mmp_irq_domain_map(struct irq_domain *d, unsigned int irq,
--
2.21.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-08-09 9:33 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 9:31 [PATCH 00/19] Initial support for Marvell MMP3 SoC Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 9:31 ` [PATCH 01/19] dt-bindings: arm: cpu: Add Marvell MMP3 SMP enable method Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-12 18:57 ` Rob Herring
2019-08-12 18:57 ` Rob Herring
2019-08-12 18:57 ` Rob Herring
2019-08-09 9:31 ` [PATCH 02/19] dt-bindings: arm: mrvl: Document MMP3 compatible string Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-21 21:03 ` Rob Herring
2019-08-21 21:03 ` Rob Herring
2019-08-22 8:12 ` Lubomir Rintel
2019-08-22 8:12 ` Lubomir Rintel
2019-08-22 12:42 ` Rob Herring
2019-08-22 12:42 ` Rob Herring
2019-08-22 12:42 ` Rob Herring
2019-08-09 9:31 ` [PATCH 03/19] dt-bindings: mrvl,intc: Add a MMP3 interrupt controller Lubomir Rintel
2019-08-09 9:31 ` [PATCH 03/19] dt-bindings: mrvl, intc: " Lubomir Rintel
2019-08-21 21:11 ` [PATCH 03/19] dt-bindings: mrvl,intc: " Rob Herring
2019-08-21 21:11 ` Rob Herring
2019-08-09 9:31 ` [PATCH 04/19] dt-bindings: phy-mmp3-usb: Add bindings Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-21 21:13 ` Rob Herring
2019-08-21 21:13 ` Rob Herring
2019-08-09 9:31 ` [PATCH 05/19] irqchip/mmp: do not use of_address_to_resource() to get mux regs Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 12:12 ` Marc Zyngier
2019-08-09 12:12 ` Marc Zyngier
2019-08-16 18:41 ` Lubomir Rintel
2019-08-16 18:41 ` Lubomir Rintel
2019-08-17 18:17 ` Marc Zyngier
2019-08-17 18:17 ` Marc Zyngier
2019-08-17 18:17 ` Marc Zyngier
2019-08-09 9:31 ` Lubomir Rintel [this message]
2019-08-09 9:31 ` [PATCH 06/19] irqchip/mmp: add missing chained_irq_{enter,exit}() Lubomir Rintel
2019-08-09 10:56 ` Marc Zyngier
2019-08-09 10:56 ` [PATCH 06/19] irqchip/mmp: add missing chained_irq_{enter, exit}() Marc Zyngier
2019-08-09 9:31 ` [PATCH 07/19] irqchip/mmp: mask off interrupts from other cores Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 12:18 ` Marc Zyngier
2019-08-09 12:18 ` Marc Zyngier
2019-08-16 18:15 ` Lubomir Rintel
2019-08-16 18:15 ` Lubomir Rintel
2019-08-16 18:15 ` Lubomir Rintel
2019-08-09 9:31 ` [PATCH 08/19] irqchip/mmp: coexist with GIC root IRQ controller Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 9:31 ` [PATCH 09/19] ARM: l2c: add definition for FWA in PL310 aux register Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 9:31 ` [PATCH 10/19] ARM: mmp: don't select CACHE_TAUROS2 on all ARCH_MMP Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 9:31 ` [PATCH 11/19] ARM: mmp: map the PGU as well Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 9:31 ` [PATCH 12/19] ARM: mmp: DT: convert timer driver to use TIMER_OF_DECLARE Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 9:31 ` [PATCH 13/19] ARM: mmp: define MMP_CHIPID by the means of CIU_REG() Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 9:31 ` [PATCH 14/19] ARM: mmp: add support for MMP3 SoC Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-16 18:06 ` Stephen Boyd
2019-08-16 18:06 ` Stephen Boyd
2019-08-16 18:06 ` Stephen Boyd
2019-08-09 9:31 ` [PATCH 15/19] ARM: mmp: add SMP support Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-16 18:11 ` Florian Fainelli
2019-08-16 18:11 ` Florian Fainelli
2019-08-09 9:31 ` [PATCH 16/19] ARM: mmp: move cputype.h to include/linux/soc/ Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 9:31 ` [PATCH 17/19] ARM: mmp: remove MMP3 USB PHY registers from regs-usb.h Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 9:31 ` [PATCH 18/19] phy: phy-mmp3-usb: add a new driver Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
2019-08-09 9:31 ` [PATCH 19/19] ARM: dts: mmp3: Add MMP3 SoC dts file Lubomir Rintel
2019-08-09 9:31 ` Lubomir Rintel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190809093158.7969-7-lkundrak@v3.sk \
--to=lkundrak@v3.sk \
--cc=devicetree@vger.kernel.org \
--cc=jason@lakedaemon.net \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=mturquette@baylibre.com \
--cc=olof@lixom.net \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.