target/linux/imx6/patches-4.4/112-serial-imx-let-irq-handler-return-IRQ_NONE-if-no-eve.patch

   1 From de4356da2cd1a1857513047997d81143cb95a4e1 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
   3 Date: Thu, 24 Mar 2016 14:24:21 +0100
   4 Subject: [PATCH 2/3] serial: imx: let irq handler return IRQ_NONE if no event
   5  was handled
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 This gives the irq core a chance to disable the serial interrupt in case
  11 an event isn't cleared in the handler.
  12
  13 Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  14 Signed-off-by: Petr Štetiar <ynezz@true.cz>
  15 ---
  16  drivers/tty/serial/imx.c | 17 +++++++++++++----
  17  1 file changed, 13 insertions(+), 4 deletions(-)
  18
  19 diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
  20 index bfc4555..5ced61e 100644
  21 --- a/drivers/tty/serial/imx.c
  22 +++ b/drivers/tty/serial/imx.c
  23 @@ -734,6 +734,7 @@ static irqreturn_t imx_int(int irq, void *dev_id)
  24         struct imx_port *sport = dev_id;
  25         unsigned int sts;
  26         unsigned int sts2;
  27 +       irqreturn_t ret = IRQ_NONE;
  28
  29         sts = readl(sport->port.membase + USR1);
  30         sts2 = readl(sport->port.membase + USR2);
  31 @@ -743,26 +744,34 @@ static irqreturn_t imx_int(int irq, void *dev_id)
  32                         imx_dma_rxint(sport);
  33                 else
  34                         imx_rxint(irq, dev_id);
  35 +               ret = IRQ_HANDLED;
  36         }
  37
  38         if ((sts & USR1_TRDY &&
  39              readl(sport->port.membase + UCR1) & UCR1_TXMPTYEN) ||
  40             (sts2 & USR2_TXDC &&
  41 -            readl(sport->port.membase + UCR4) & UCR4_TCEN))
  42 +            readl(sport->port.membase + UCR4) & UCR4_TCEN)) {
  43                 imx_txint(irq, dev_id);
  44 +               ret = IRQ_HANDLED;
  45 +       }
  46
  47 -       if (sts & USR1_RTSD)
  48 +       if (sts & USR1_RTSD) {
  49                 imx_rtsint(irq, dev_id);
  50 +               ret = IRQ_HANDLED;
  51 +       }
  52
  53 -       if (sts & USR1_AWAKE)
  54 +       if (sts & USR1_AWAKE) {
  55                 writel(USR1_AWAKE, sport->port.membase + USR1);
  56 +               ret = IRQ_HANDLED;
  57 +       }
  58
  59         if (sts2 & USR2_ORE) {
  60                 sport->port.icount.overrun++;
  61                 writel(USR2_ORE, sport->port.membase + USR2);
  62 +               ret = IRQ_HANDLED;
  63         }
  64
  65 -       return IRQ_HANDLED;
  66 +       return ret;
  67  }
  68
  69  /*
  70 --
  71 1.9.1
  72