summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHariprasad Kelam <hkelam@marvell.com>2020-09-30 21:39:14 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-14 11:55:55 +0200
commit5cfc870ede16e7c3d5ee0b82b9eb7badcbdf12e7 (patch)
treeba250918d9ada41e0741a5e4328a5d303d1be6a8
parent7778b88602289d26c8ec61f01abea34f2504c283 (diff)
downloadlinux-stable-5cfc870ede16e7c3d5ee0b82b9eb7badcbdf12e7.tar.gz
linux-stable-5cfc870ede16e7c3d5ee0b82b9eb7badcbdf12e7.tar.bz2
linux-stable-5cfc870ede16e7c3d5ee0b82b9eb7badcbdf12e7.zip
octeontx2-pf: Fix the device state on error
[ Upstream commit 1ea0166da0509e987caa42c30a6a71f2c6ca1875 ] Currently in otx2_open on failure of nix_lf_start transmit queues are not stopped which are already started in link_event. Since the tx queues are not stopped network stack still try's to send the packets leading to driver crash while access the device resources. Fixes: 50fe6c02e ("octeontx2-pf: Register and handle link notifications") Signed-off-by: Hariprasad Kelam <hkelam@marvell.com> Signed-off-by: Geetha sowjanya <gakula@marvell.com> Signed-off-by: Sunil Goutham <sgoutham@marvell.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
index 75a8c407e815..5d620a39ea80 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
@@ -1560,10 +1560,13 @@ int otx2_open(struct net_device *netdev)
err = otx2_rxtx_enable(pf, true);
if (err)
- goto err_free_cints;
+ goto err_tx_stop_queues;
return 0;
+err_tx_stop_queues:
+ netif_tx_stop_all_queues(netdev);
+ netif_carrier_off(netdev);
err_free_cints:
otx2_free_cints(pf, qidx);
vec = pci_irq_vector(pf->pdev,