lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 024/530] can: kvaser_usb_leaf: Fix TX queue out of sync after restart
    Date
    From: Anssi Hannula <anssi.hannula@bitwise.fi>

    commit 455561fb618fde40558776b5b8435f9420f335db upstream.

    The TX queue seems to be implicitly flushed by the hardware during
    bus-off or bus-off recovery, but the driver does not reset the TX
    bookkeeping.

    Despite not resetting TX bookkeeping the driver still re-enables TX
    queue unconditionally, leading to "cannot find free context" /
    NETDEV_TX_BUSY errors if the TX queue was full at bus-off time.

    Fix that by resetting TX bookkeeping on CAN restart.

    Tested with 0bfd:0124 Kvaser Mini PCI Express 2xHS FW 4.18.778.

    Cc: stable@vger.kernel.org
    Fixes: 080f40a6fa28 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices")
    Tested-by: Jimmy Assarsson <extja@kvaser.com>
    Signed-off-by: Anssi Hannula <anssi.hannula@bitwise.fi>
    Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
    Link: https://lore.kernel.org/all/20221010150829.199676-4-extja@kvaser.com
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 2 ++
    drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 2 +-
    drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 2 ++
    3 files changed, 5 insertions(+), 1 deletion(-)

    --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h
    +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h
    @@ -178,6 +178,8 @@ struct kvaser_usb_dev_cfg {
    extern const struct kvaser_usb_dev_ops kvaser_usb_hydra_dev_ops;
    extern const struct kvaser_usb_dev_ops kvaser_usb_leaf_dev_ops;

    +void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv);
    +
    int kvaser_usb_recv_cmd(const struct kvaser_usb *dev, void *cmd, int len,
    int *actual_len);

    --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
    +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
    @@ -480,7 +480,7 @@ static void kvaser_usb_reset_tx_urb_cont
    /* This method might sleep. Do not call it in the atomic context
    * of URB completions.
    */
    -static void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv)
    +void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv)
    {
    usb_kill_anchored_urbs(&priv->tx_submitted);
    kvaser_usb_reset_tx_urb_contexts(priv);
    --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
    +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
    @@ -1430,6 +1430,8 @@ static int kvaser_usb_leaf_set_mode(stru

    switch (mode) {
    case CAN_MODE_START:
    + kvaser_usb_unlink_tx_urbs(priv);
    +
    err = kvaser_usb_leaf_simple_cmd_async(priv, CMD_START_CHIP);
    if (err)
    return err;

    \
     
     \ /
      Last update: 2022-10-24 21:55    [W:4.087 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site