cxgb4: avoid stall while shutting down the adapter

do not wait for completion while deleting the filters
when the adapter is shutting down because we may not get
the response as interrupts will be disabled.

Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index ea72d2d2e1b4093d4dcce2a50d995719952dff01..c4e997fdff642fc958de81ff23356cc2fedd53ce 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -549,6 +549,7 @@ enum {                                 /* adapter flags */
        MASTER_PF          = (1 << 7),
        FW_OFLD_CONN       = (1 << 9),
        ROOT_NO_RELAXED_ORDERING = (1 << 10),
+       SHUTTING_DOWN      = (1 << 11),
 };
 
 enum {

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
index 45b5853ca2f1a8184d322bdbac8868ff088f2c98..97ead2c66751b4735499feab8af65ee0f6d1ccf8 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
@@ -191,7 +191,8 @@ static int del_filter_wr(struct adapter *adapter, int fidx)
                return -ENOMEM;
 
        fwr = __skb_put(skb, len);
-       t4_mk_filtdelwr(f->tid, fwr, adapter->sge.fw_evtq.abs_id);
+       t4_mk_filtdelwr(f->tid, fwr, (adapter->flags & SHUTTING_DOWN) ? -1
+                       : adapter->sge.fw_evtq.abs_id);
 
        /* Mark the filter as "pending" and ship off the Filter Work Request.
         * When we get the Work Request Reply we'll clear the pending status.
@@ -636,6 +637,10 @@ int cxgb4_del_filter(struct net_device *dev, int filter_id)
        struct filter_ctx ctx;
        int ret;
 
+       /* If we are shutting down the adapter do not wait for completion */
+       if (netdev2adap(dev)->flags & SHUTTING_DOWN)
+               return __cxgb4_del_filter(dev, filter_id, NULL);
+
        init_completion(&ctx.completion);
 
        ret = __cxgb4_del_filter(dev, filter_id, &ctx);

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 92d9d795d8747ced447d8597733adcaa9b4fc84c..5fe81a4e26a64b928981001d9e9c79b8f53682fd 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -5254,6 +5254,8 @@ static void remove_one(struct pci_dev *pdev)
                return;
        }
 
+       adapter->flags |= SHUTTING_DOWN;
+
        if (adapter->pf == 4) {
                int i;
 
@@ -5339,6 +5341,8 @@ static void shutdown_one(struct pci_dev *pdev)
                return;
        }
 
+       adapter->flags |= SHUTTING_DOWN;
+
        if (adapter->pf == 4) {
                int i;