lkml.org 
[lkml]   [2014]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 126/149] can: flexcan: fix shutdown: first disable chip, then all interrupts
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

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

    From: Marc Kleine-Budde <mkl@pengutronix.de>

    commit 5be93bdda64e85450598c6e97f79fb8f6acf30e0 upstream.

    When shutting down the CAN interface (ifconfig canX down) during high CAN bus
    loads, the CAN core might hang and freeze the whole CPU.

    This patch fixes the shutdown sequence by first disabling the CAN core then
    disabling all interrupts.

    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/can/flexcan.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/drivers/net/can/flexcan.c
    +++ b/drivers/net/can/flexcan.c
    @@ -824,14 +824,16 @@ static void flexcan_chip_stop(struct net
    struct flexcan_regs __iomem *regs = priv->base;
    u32 reg;

    - /* Disable all interrupts */
    - flexcan_write(0, &regs->imask1);
    -
    /* Disable + halt module */
    reg = flexcan_read(&regs->mcr);
    reg |= FLEXCAN_MCR_MDIS | FLEXCAN_MCR_HALT;
    flexcan_write(reg, &regs->mcr);

    + /* Disable all interrupts */
    + flexcan_write(0, &regs->imask1);
    + flexcan_write(priv->reg_ctrl_default & ~FLEXCAN_CTRL_ERR_ALL,
    + &regs->ctrl);
    +
    if (priv->reg_xceiver)
    regulator_disable(priv->reg_xceiver);
    priv->can.state = CAN_STATE_STOPPED;



    \
     
     \ /
      Last update: 2014-03-21 03:01    [W:3.410 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site