From: "Daniel Golle" <daniel@makrotopia.org>
To: linux-oxnas@groups.io, mans0n@gorani.run
Subject: Re: [linux-oxnas] [PATCH v2] irqchip/versatile-fpga: Handle chained IRQs properly
Date: Thu, 19 Mar 2020 22:56:27 +0000 [thread overview]
Message-ID: <20200319225627.GA1337@makrotopia.org> (raw)
In-Reply-To: <20200319023448.1479701-1-mans0n@gorani.run>
Hi Sungbo,
I've imported your patch to openwrt master and will backport for
Linux 4.14 to also have it in the 19.07 release branch.
Thanks for your efforts and congratulations to your first upstream fix!
Once the OpenWrt buildbot[1] gets to it, we'll have snapshot images[2]
including the fix.
[1]: http://buildbot.openwrt.org/master/images/builders/oxnas%2Fox820
[2]: http://downloads.openwrt.org/snapshots/targets/oxnas/ox820/
On Thu, Mar 19, 2020 at 11:34:48AM +0900, Sungbo Eo wrote:
> Enclose the chained handler with chained_irq_{enter,exit}(), so that the
> muxed interrupts get properly acked.
>
> This patch also fixes a reboot bug on OX820 SoC, where the jiffies timer
> interrupt is never acked. The kernel waits a clock tick forever in
> calibrate_delay_converge(), which leads to a boot hang.
>
> Fixes: c41b16f8c9d9 ("ARM: integrator/versatile: consolidate FPGA IRQ handling code")
> Signed-off-by: Sungbo Eo <mans0n@gorani.run>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> ---
> v2: moved readl below chained_irq_enter()
> added Fixes tag
>
> drivers/irqchip/irq-versatile-fpga.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c
> index 928858dada75..70e2cfff8175 100644
> --- a/drivers/irqchip/irq-versatile-fpga.c
> +++ b/drivers/irqchip/irq-versatile-fpga.c
> @@ -6,6 +6,7 @@
> #include <linux/irq.h>
> #include <linux/io.h>
> #include <linux/irqchip.h>
> +#include <linux/irqchip/chained_irq.h>
> #include <linux/irqchip/versatile-fpga.h>
> #include <linux/irqdomain.h>
> #include <linux/module.h>
> @@ -68,12 +69,16 @@ static void fpga_irq_unmask(struct irq_data *d)
>
> static void fpga_irq_handle(struct irq_desc *desc)
> {
> + struct irq_chip *chip = irq_desc_get_chip(desc);
> struct fpga_irq_data *f = irq_desc_get_handler_data(desc);
> - u32 status = readl(f->base + IRQ_STATUS);
> + u32 status;
> +
> + chained_irq_enter(chip, desc);
>
> + status = readl(f->base + IRQ_STATUS);
> if (status == 0) {
> do_bad_IRQ(desc);
> - return;
> + goto out;
> }
>
> do {
> @@ -82,6 +87,9 @@ static void fpga_irq_handle(struct irq_desc *desc)
> status &= ~(1 << irq);
> generic_handle_irq(irq_find_mapping(f->domain, irq));
> } while (status);
> +
> +out:
> + chained_irq_exit(chip, desc);
> }
>
> /*
> --
> 2.25.1
>
>
>
>
prev parent reply other threads:[~2020-03-19 22:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-18 17:09 [PATCH] irqchip/versatile-fpga: Handle chained IRQs properly Sungbo Eo
2020-03-18 17:48 ` Marc Zyngier
2020-03-18 18:20 ` Sungbo Eo
2020-03-18 19:11 ` Marc Zyngier
2020-03-19 2:34 ` [PATCH v2] " Sungbo Eo
2020-03-19 8:44 ` Marc Zyngier
2020-03-19 22:56 ` Daniel Golle [this message]
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=20200319225627.GA1337@makrotopia.org \
--to=daniel@makrotopia.org \
--cc=linux-oxnas@groups.io \
--cc=mans0n@gorani.run \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).