lkml.org 
[lkml]   [2013]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/75] serial/mxs-auart: fix race condition in interrupt handler
    Date
    3.5.7.19 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>

    commit d970d7fe65adff5efe75b4a73c4ffc9be57089f7 upstream.

    The handler needs to ack the pending events before actually handling them.
    Otherwise a new event might come in after it it considered non-pending or
    handled and is acked then without being handled. So this event is only
    noticed when the next interrupt happens.

    Without this patch an i.MX28 based machine running an rt-patched kernel
    regularly hangs during boot.

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/tty/serial/mxs-auart.c | 17 +++++++++--------
    1 file changed, 9 insertions(+), 8 deletions(-)

    diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
    index ec56d83..4313f49 100644
    --- a/drivers/tty/serial/mxs-auart.c
    +++ b/drivers/tty/serial/mxs-auart.c
    @@ -376,11 +376,18 @@ static void mxs_auart_settermios(struct uart_port *u,

    static irqreturn_t mxs_auart_irq_handle(int irq, void *context)
    {
    - u32 istatus, istat;
    + u32 istat;
    struct mxs_auart_port *s = context;
    u32 stat = readl(s->port.membase + AUART_STAT);

    - istatus = istat = readl(s->port.membase + AUART_INTR);
    + istat = readl(s->port.membase + AUART_INTR);
    +
    + /* ack irq */
    + writel(istat & (AUART_INTR_RTIS
    + | AUART_INTR_TXIS
    + | AUART_INTR_RXIS
    + | AUART_INTR_CTSMIS),
    + s->port.membase + AUART_INTR_CLR);

    if (istat & AUART_INTR_CTSMIS) {
    uart_handle_cts_change(&s->port, stat & AUART_STAT_CTS);
    @@ -399,12 +406,6 @@ static irqreturn_t mxs_auart_irq_handle(int irq, void *context)
    istat &= ~AUART_INTR_TXIS;
    }

    - writel(istatus & (AUART_INTR_RTIS
    - | AUART_INTR_TXIS
    - | AUART_INTR_RXIS
    - | AUART_INTR_CTSMIS),
    - s->port.membase + AUART_INTR_CLR);
    -
    return IRQ_HANDLED;
    }

    --
    1.8.3.2
    --
    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/

    \
     
     \ /
      Last update: 2013-08-14 13:01    [W:4.227 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site