From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02C9EC6FA83 for ; Sat, 3 Sep 2022 18:25:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233213AbiICSZt (ORCPT ); Sat, 3 Sep 2022 14:25:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233224AbiICSZr (ORCPT ); Sat, 3 Sep 2022 14:25:47 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F45341D3A for ; Sat, 3 Sep 2022 11:25:45 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id z25so7714086lfr.2 for ; Sat, 03 Sep 2022 11:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kvaser.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=FtYEyGAJaRB0x8ImnvWnEBF8IOBBq297Mde/T1RSt3w=; b=aB9FmxIK6o2ysewr84GWl+pyPyYCLkDYNpXn5eziKPtCHd5N8bBLNqVuOZ4VcPevnP PKGphpfSXF45SYTuPz6AJ/c6AjR4IwQEv2JIueKfnu+lTK4FBqP1AMFR1GT6E7lUU1ad 7lhPIEUHut2umww4d3sqBGELjV/tu+8R8zmDlS8WUcF15jiElgBRcGC3gG44aj7dBIMi byd5rk2JZUswMBFfbt3A0j3WbWgJDXR10MV+PVw9RIflntGD/s5e2vuKuJyqql5P4IZ2 pElCkFE99+sYV8NzlDGc+n8zriCQWrwybUfqP8/wfwNNU28lRknqxYA4OPtub6Lq/UCl l5TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=FtYEyGAJaRB0x8ImnvWnEBF8IOBBq297Mde/T1RSt3w=; b=dhKSjIRcEicqw0iX/4N1zSZItaUYYzO2EnbRcB2V3BmKjDapa3b9XuHX/BjmQ0GpbW 4iBUaJ1hJhtjl1znpEUj1luFJmm/08UAc50D9XCsTiKDNRXGNFiXb7Ab3IRmeJAuDBmt i9XxQ14cIxlTAPk0xsbmFPLMltmLc2Ka93K9KEx82UeIdVtGn2YBkB4mNDE194B0QNTg LD3zRhN4fMetGkTcie90Fz28SB/kIOyNP2/Bz+GnAqzRPunK+kqqZ58X8bkQ+lKhemb1 xxIGLbH5kq3WUJZEaUb+zttVR4r6hgw6qbKNE8e7PCV7PcLhazqVt/X7CoZFKOL6mWvu ys0Q== X-Gm-Message-State: ACgBeo3UwXYWd/L5qOmvnXc9gegQstvOvPKnbcWqbD8RKuJmi1xos54P QcRnmT2n9tENx8yjvTfeoc7frTz/vt4DFj5f X-Google-Smtp-Source: AA6agR4gK/BdhHrVmt67eijB8NQ51Jvr/jmZtRXHXl7oWNnaua/CjOD8BvjP/6WFuGWn63EMSk0uWQ== X-Received: by 2002:a05:6512:3f02:b0:494:5c72:6a8b with SMTP id y2-20020a0565123f0200b004945c726a8bmr12091837lfa.313.1662229544892; Sat, 03 Sep 2022 11:25:44 -0700 (PDT) Received: from f6a14fef6d45.. (h-155-4-68-234.A785.priv.bahnhof.se. [155.4.68.234]) by smtp.gmail.com with ESMTPSA id u18-20020ac24c32000000b00492f6ddba59sm658330lfq.75.2022.09.03.11.25.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Sep 2022 11:25:44 -0700 (PDT) From: Jimmy Assarsson To: linux-can@vger.kernel.org, Marc Kleine-Budde , Anssi Hannula Cc: Jimmy Assarsson , stable@vger.kernel.org, Jimmy Assarsson Subject: [PATCH v4 08/15] can: kvaser_usb_leaf: Fix TX queue out of sync after restart Date: Sat, 3 Sep 2022 20:25:52 +0200 Message-Id: <20220903182559.189-8-extja@kvaser.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220903182559.189-1-extja@kvaser.com> References: <20220903182559.189-1-extja@kvaser.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-can@vger.kernel.org From: Anssi Hannula 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 Signed-off-by: Anssi Hannula Signed-off-by: Jimmy Assarsson --- Changes in v4: - No changes Changes in v3: - Rebased on 1d5eeda23f36 ("can: kvaser_usb: advertise timestamping capabilities and add ioctl support") - Add stable to CC - Add S-o-b Changes in v2: - Rebased on b3b6df2c56d8 ("can: kvaser_usb: kvaser_usb_leaf: fix bittiming limits") - Removed explicit queue flush. 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(-) diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h index 841da29cef93..f6c0938027ec 100644 --- 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); diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c index c2bce6773adc..e91648ed7386 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c @@ -477,7 +477,7 @@ static void kvaser_usb_reset_tx_urb_contexts(struct kvaser_usb_net_priv *priv) /* 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); diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c index b4acd9427967..48b8a0f0b362 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -1663,6 +1663,8 @@ static int kvaser_usb_leaf_set_mode(struct net_device *netdev, 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; -- 2.37.3