be2net: fix be_close() to ensure all events are ack'ed

In be_close(), be_eq_clean() must be called after all RX/TX/MCC queues
have been cleaned to ensure that any events caused while cleaning up
completions are notified/acked. Not clearing all events can cause
upredictable behaviour when RX rings are re-created in the subsequent
be_open().

Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 17 insertions, 9 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index f2875aa47661..8a250c38fb82 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -298,7 +298,12 @@ void be_async_mcc_enable(struct be_adapter *adapter)
 
 void be_async_mcc_disable(struct be_adapter *adapter)
 {
+        spin_lock_bh(&adapter->mcc_cq_lock);
+
         adapter->mcc_obj.rearm_cq = false;
+        be_cq_notify(adapter, adapter->mcc_obj.cq.id, false, 0);
+
+        spin_unlock_bh(&adapter->mcc_cq_lock);
 }
 
 int be_process_mcc(struct be_adapter *adapter)
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index f95612b907ae..bf50e73c1ec7 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2398,13 +2398,22 @@ static int be_close(struct net_device *netdev)
 
         be_roce_dev_close(adapter);
 
-        be_async_mcc_disable(adapter);
-
         if (!lancer_chip(adapter))
                 be_intr_set(adapter, false);
 
-        for_all_evt_queues(adapter, eqo, i) {
+        for_all_evt_queues(adapter, eqo, i)
                 napi_disable(&eqo->napi);
+
+        be_async_mcc_disable(adapter);
+
+        /* Wait for all pending tx completions to arrive so that
+         * all tx skbs are freed.
+         */
+        be_tx_compl_clean(adapter);
+
+        be_rx_qs_destroy(adapter);
+
+        for_all_evt_queues(adapter, eqo, i) {
                 if (msix_enabled(adapter))
                         synchronize_irq(be_msix_vec_get(adapter, eqo));
                 else
@@ -2414,12 +2423,6 @@ static int be_close(struct net_device *netdev)
 
         be_irq_unregister(adapter);
 
-        /* Wait for all pending tx completions to arrive so that
-         * all tx skbs are freed.
-         */
-        be_tx_compl_clean(adapter);
-
-        be_rx_qs_destroy(adapter);
         return 0;
 }