Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp2602085pxb; Thu, 10 Feb 2022 01:02:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJyy0kpXbwCrmG1++WgFdocHh7QjY9LtbcQSeyE/dA+hAZBFcUqY9tK2QREMX/mJ2TvjaMYT X-Received: by 2002:a17:90a:341:: with SMTP id 1mr1127453pjf.144.1644483763528; Thu, 10 Feb 2022 01:02:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644483763; cv=none; d=google.com; s=arc-20160816; b=KtEXBE+HvjDIn8eW/0xVthqeD69httWIVvfSa/pWjteoGyY7TfAbNsRkOZcTizkZ0A uVA0wyvb+SfJyi+/TSsdWq7AcZ8CNrh5RvGYXiT1QZB3+hdv2fUSgMQ+6KuLDOgZ6BT2 /8iRwpIqjycxyoru8AXoiQyvccVILGP59B6iDEWsG4CvLax/BO4gPV97bkLE2sXtCci2 qgKro41MLFkdLm8iiwRQ8p8FKugDRrn7xtJc1e11g7sl7Yym7YQ86ibZdxagExPJyGjC BKTO9FYK2wb5gdAVgRYe2ZizztBHDulsM6deExG/ezR6kAeTD/JNTqgyq4tfcAdrXzER Z0mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=RFeKrrfO4DwhrsoZpoOSeHrGOKpbMVLyji7ABJRLtK0=; b=uKOZAQkXVx3FyH82iRXaXks4hYK0gCJvB8e26fHTEiVLxNJPueErr4vu9xG7OQs/RD l+tcB0Rfhm231nLECsAqcQi4jN/3ydoJBuCE+cOmLpcgu5I7gPv6tcDzCtXUzm3R///0 cMf1uZWX9OMd1gwMdcyowbCiwqOzsKw5XcL9L/fApwcDBfHQ3fPayVEEH/CQAE+006pL Cj5qUMnUrIvZx374h5OvxYb6qPqvPZnjxkvRstJ5PBECNfodlXtb1rFqGeQxOlGFrfPC mRQA2L1ZT5UEuqObNxoYFixW19qRGy3czCl7u3llfo+qBQRhc3lHoXV9OSmm6qTRHBof I4Fg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g186si17758277pgc.790.2022.02.10.01.02.23; Thu, 10 Feb 2022 01:02:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237923AbiBJIrj (ORCPT + 99 others); Thu, 10 Feb 2022 03:47:39 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:46062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237870AbiBJIrh (ORCPT ); Thu, 10 Feb 2022 03:47:37 -0500 X-Greylist: delayed 2116 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 10 Feb 2022 00:47:35 PST Received: from plekste.mt.lv (bute.mt.lv [IPv6:2a02:610:7501:2000::195]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B0DD10B2; Thu, 10 Feb 2022 00:47:34 -0800 (PST) Received: from [2a02:610:7501:feff:1ccf:41ff:fe50:18b9] (helo=localhost.localdomain) by plekste.mt.lv with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nI4Yi-0005NK-8N; Thu, 10 Feb 2022 10:12:08 +0200 From: Gatis Peisenieks To: chris.snook@gmail.com, davem@davemloft.net, kuba@kernel.org, hkallweit1@gmail.com, jesse.brandeburg@intel.com, dchickles@marvell.com, tully@mikrotik.com, antons@mikrotik.com, eric.dumazet@gmail.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Gatis Peisenieks Subject: [PATCH net] atl1c: fix tx timeout after link flap on Mikrotik 10/25G NIC Date: Thu, 10 Feb 2022 10:12:01 +0200 Message-Id: <20220210081201.4184834-1-gatis@mikrotik.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If NIC had packets in tx queue at the moment link down event happened, it could result in tx timeout when link got back up. Since device has more than one tx queue we need to reset them accordingly. Signed-off-by: Gatis Peisenieks --- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index da595242bc13..f50604f3e541 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c @@ -900,7 +900,7 @@ static void atl1c_clean_tx_ring(struct atl1c_adapter *adapter, atl1c_clean_buffer(pdev, buffer_info); } - netdev_reset_queue(adapter->netdev); + netdev_tx_reset_queue(netdev_get_tx_queue(adapter->netdev, queue)); /* Zero out Tx-buffers */ memset(tpd_ring->desc, 0, sizeof(struct atl1c_tpd_desc) * -- 2.31.1