lkml.org 
[lkml]   [2021]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 34/95] can: rcar_can: fix suspend/resume
    Date
    From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

    commit f7c05c3987dcfde9a4e8c2d533db013fabebca0d upstream.

    If the driver was not opened, rcar_can_suspend() should not call
    clk_disable() because the clock was not enabled.

    Fixes: fd1159318e55 ("can: add Renesas R-Car CAN driver")
    Link: https://lore.kernel.org/all/20210924075556.223685-1-yoshihiro.shimoda.uh@renesas.com
    Cc: stable@vger.kernel.org
    Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
    Tested-by: Ayumi Nakamichi <ayumi.nakamichi.kf@renesas.com>
    Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
    Tested-by: Biju Das <biju.das.jz@bp.renesas.com>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/can/rcar/rcar_can.c | 20 ++++++++++++--------
    1 file changed, 12 insertions(+), 8 deletions(-)

    --- a/drivers/net/can/rcar/rcar_can.c
    +++ b/drivers/net/can/rcar/rcar_can.c
    @@ -846,10 +846,12 @@ static int __maybe_unused rcar_can_suspe
    struct rcar_can_priv *priv = netdev_priv(ndev);
    u16 ctlr;

    - if (netif_running(ndev)) {
    - netif_stop_queue(ndev);
    - netif_device_detach(ndev);
    - }
    + if (!netif_running(ndev))
    + return 0;
    +
    + netif_stop_queue(ndev);
    + netif_device_detach(ndev);
    +
    ctlr = readw(&priv->regs->ctlr);
    ctlr |= RCAR_CAN_CTLR_CANM_HALT;
    writew(ctlr, &priv->regs->ctlr);
    @@ -868,6 +870,9 @@ static int __maybe_unused rcar_can_resum
    u16 ctlr;
    int err;

    + if (!netif_running(ndev))
    + return 0;
    +
    err = clk_enable(priv->clk);
    if (err) {
    netdev_err(ndev, "clk_enable() failed, error %d\n", err);
    @@ -881,10 +886,9 @@ static int __maybe_unused rcar_can_resum
    writew(ctlr, &priv->regs->ctlr);
    priv->can.state = CAN_STATE_ERROR_ACTIVE;

    - if (netif_running(ndev)) {
    - netif_device_attach(ndev);
    - netif_start_queue(ndev);
    - }
    + netif_device_attach(ndev);
    + netif_start_queue(ndev);
    +
    return 0;
    }


    \
     
     \ /
      Last update: 2021-10-25 21:40    [W:4.131 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site