| Message ID | 20220127060222.453371-1-Raju.Rangoju@amd.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7674b7b559b683478c3832527c59bceb169e701d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net:amd-xgbe: ensure to reset the tx_timer_active flag | expand |
On 1/27/22 00:02, Raju Rangoju wrote: > 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> > --- > drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c > index 492ac383f16d..4949ba69c097 100644 > --- 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_prv_data *pdata) > if (!channel->tx_ring) > break; > > + /* Deactivate the Tx timer */ > del_timer_sync(&channel->tx_timer); > + channel->tx_timer_active = 0; > } > } >
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 27 Jan 2022 11:32:22 +0530 you wrote: > 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> > > [...] Here is the summary with links: - [net] net:amd-xgbe: ensure to reset the tx_timer_active flag https://git.kernel.org/netdev/net/c/7674b7b559b6 You are awesome, thank you!
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index 492ac383f16d..4949ba69c097 100644 --- 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_prv_data *pdata) if (!channel->tx_ring) break; + /* Deactivate the Tx timer */ del_timer_sync(&channel->tx_timer); + channel->tx_timer_active = 0; } }
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> --- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 ++ 1 file changed, 2 insertions(+)