You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
1.8 KiB
Diff
68 lines
1.8 KiB
Diff
From de4356da2cd1a1857513047997d81143cb95a4e1 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
|
|
Date: Thu, 24 Mar 2016 14:24:21 +0100
|
|
Subject: [PATCH 2/3] serial: imx: let irq handler return IRQ_NONE if no event
|
|
was handled
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This gives the irq core a chance to disable the serial interrupt in case
|
|
an event isn't cleared in the handler.
|
|
|
|
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
|
|
Signed-off-by: Petr Štetiar <ynezz@true.cz>
|
|
---
|
|
drivers/tty/serial/imx.c | 17 +++++++++++++----
|
|
1 file changed, 13 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/tty/serial/imx.c
|
|
+++ b/drivers/tty/serial/imx.c
|
|
@@ -753,6 +753,7 @@ static irqreturn_t imx_int(int irq, void
|
|
struct imx_port *sport = dev_id;
|
|
unsigned int sts;
|
|
unsigned int sts2;
|
|
+ irqreturn_t ret = IRQ_NONE;
|
|
|
|
sts = readl(sport->port.membase + USR1);
|
|
sts2 = readl(sport->port.membase + USR2);
|
|
@@ -762,26 +763,34 @@ static irqreturn_t imx_int(int irq, void
|
|
imx_dma_rxint(sport);
|
|
else
|
|
imx_rxint(irq, dev_id);
|
|
+ ret = IRQ_HANDLED;
|
|
}
|
|
|
|
if ((sts & USR1_TRDY &&
|
|
readl(sport->port.membase + UCR1) & UCR1_TXMPTYEN) ||
|
|
(sts2 & USR2_TXDC &&
|
|
- readl(sport->port.membase + UCR4) & UCR4_TCEN))
|
|
+ readl(sport->port.membase + UCR4) & UCR4_TCEN)) {
|
|
imx_txint(irq, dev_id);
|
|
+ ret = IRQ_HANDLED;
|
|
+ }
|
|
|
|
- if (sts & USR1_RTSD)
|
|
+ if (sts & USR1_RTSD) {
|
|
imx_rtsint(irq, dev_id);
|
|
+ ret = IRQ_HANDLED;
|
|
+ }
|
|
|
|
- if (sts & USR1_AWAKE)
|
|
+ if (sts & USR1_AWAKE) {
|
|
writel(USR1_AWAKE, sport->port.membase + USR1);
|
|
+ ret = IRQ_HANDLED;
|
|
+ }
|
|
|
|
if (sts2 & USR2_ORE) {
|
|
sport->port.icount.overrun++;
|
|
writel(USR2_ORE, sport->port.membase + USR2);
|
|
+ ret = IRQ_HANDLED;
|
|
}
|
|
|
|
- return IRQ_HANDLED;
|
|
+ return ret;
|
|
}
|
|
|
|
/*
|