From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Sudheesh Mavila <sudheesh.mavila@amd.com>,
Raju Rangoju <Raju.Rangoju@amd.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH 5.4 05/10] net: amd-xgbe: ensure to reset the tx_timer_active flag
Date: Fri, 4 Feb 2022 10:20:18 +0100 [thread overview]
Message-ID: <20220204091912.501626346@linuxfoundation.org> (raw)
In-Reply-To: <20220204091912.329106021@linuxfoundation.org>
From: Raju Rangoju <Raju.Rangoju@amd.com>
commit 7674b7b559b683478c3832527c59bceb169e701d upstream.
Ensure to reset the tx_timer_active flag in xgbe_stop(),
otherwise a port restart may result in tx timeout due to
uncleared flag.
Fixes: c635eaacbf77 ("amd-xgbe: Remove Tx coalescing")
Co-developed-by: Sudheesh Mavila <sudheesh.mavila@amd.com>
Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com>
Signed-off-by: Raju Rangoju <Raju.Rangoju@amd.com>
Acked-by: Tom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/r/20220127060222.453371-1-Raju.Rangoju@amd.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -721,7 +721,9 @@ static void xgbe_stop_timers(struct xgbe
if (!channel->tx_ring)
break;
+ /* Deactivate the Tx timer */
del_timer_sync(&channel->tx_timer);
+ channel->tx_timer_active = 0;
}
}
next prev parent reply other threads:[~2022-02-04 9:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-04 9:20 [PATCH 5.4 00/10] 5.4.177-rc1 review Greg Kroah-Hartman
2022-02-04 9:20 ` [PATCH 5.4 01/10] PCI: pciehp: Fix infinite loop in IRQ handler upon power fault Greg Kroah-Hartman
2022-02-04 9:20 ` [PATCH 5.4 02/10] psi: Fix uaf issue when psi trigger is destroyed while being polled Greg Kroah-Hartman
2022-02-04 9:20 ` [PATCH 5.4 03/10] cgroup-v1: Require capabilities to set release_agent Greg Kroah-Hartman
2022-02-04 9:20 ` [PATCH 5.4 04/10] ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback Greg Kroah-Hartman
2022-02-04 9:20 ` Greg Kroah-Hartman [this message]
2022-02-04 9:20 ` [PATCH 5.4 06/10] net: amd-xgbe: Fix skb data length underflow Greg Kroah-Hartman
2022-02-04 9:20 ` [PATCH 5.4 07/10] net: sched: fix use-after-free in tc_new_tfilter() Greg Kroah-Hartman
2022-02-04 9:20 ` [PATCH 5.4 08/10] rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink() Greg Kroah-Hartman
2022-02-04 9:20 ` [PATCH 5.4 09/10] cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask() Greg Kroah-Hartman
2022-02-04 9:20 ` [PATCH 5.4 10/10] af_packet: fix data-race in packet_setsockopt / packet_setsockopt Greg Kroah-Hartman
2022-02-04 15:19 ` [PATCH 5.4 00/10] 5.4.177-rc1 review Jon Hunter
2022-02-04 15:36 ` Slade Watkins
2022-02-04 17:13 ` Florian Fainelli
2022-02-04 20:33 ` Shuah Khan
2022-02-04 21:08 ` Guenter Roeck
2022-02-05 7:20 ` Naresh Kamboju
2022-02-05 14:28 ` Sudip Mukherjee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220204091912.501626346@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=Raju.Rangoju@amd.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=sudheesh.mavila@amd.com \
--cc=thomas.lendacky@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.