octeontx2-pf: Disable packet I/O for graceful exit

[ Upstream commit c926252205c424c4842dbdbe02f8e3296f623204 ]

At the stage of enabling packet I/O in otx2_open, If mailbox
timeout occurs then interface ends up in down state where as
hardware packet I/O is enabled. Hence disable packet I/O also
before bailing out.

Fixes: 1ea0166da050 ("octeontx2-pf: Fix the device state on error")
Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com>
Signed-off-by: Sai Krishna <saikrishnag@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
index ab291c2c30144618732c522c6043447534783f73..a987ae9d6a2853302365bf5053351fbb7a453195 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
@@ -1761,13 +1761,22 @@ int otx2_open(struct net_device *netdev)
                otx2_dmacflt_reinstall_flows(pf);
 
        err = otx2_rxtx_enable(pf, true);
-       if (err)
+       /* If a mbox communication error happens at this point then interface
+        * will end up in a state such that it is in down state but hardware
+        * mcam entries are enabled to receive the packets. Hence disable the
+        * packet I/O.
+        */
+       if (err == EIO)
+               goto err_disable_rxtx;
+       else if (err)
                goto err_tx_stop_queues;
 
        otx2_do_set_rx_mode(pf);
 
        return 0;
 
+err_disable_rxtx:
+       otx2_rxtx_enable(pf, false);
 err_tx_stop_queues:
        netif_tx_stop_all_queues(netdev);
        netif_carrier_off(netdev);