cxgb4vf: Enter debugging mode if FW is inaccessible

If we are not able to reach firmware, enter debugging mode that will
help us to get adapter logs.

Signed-off-by: Arjun Vynipadath <arjun@chelsio.com>
Signed-off-by: Vishal Kulkarni <vishal@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
index 26f48a14d2f90794167662fda001a4cfac0fb649..86cf68fcecebabc9ecca87222d86b09ef198bbd5 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
@@ -411,6 +411,7 @@ enum { /* adapter flags */
        USING_MSIX         = (1UL << 2),
        QUEUES_BOUND       = (1UL << 3),
        ROOT_NO_RELAXED_ORDERING = (1UL << 4),
+       FW_OK              = (1UL << 5),
 };
 
 /*

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index bcd38ea674ae6445f6235e5c5fd3c6e5d23c3f88..2c56bd8109317985f85a1d4bb8472ac75134055e 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -844,6 +844,13 @@ static int cxgb4vf_open(struct net_device *dev)
        struct port_info *pi = netdev_priv(dev);
        struct adapter *adapter = pi->adapter;
 
+       /*
+        * If we don't have a connection to the firmware there's nothing we
+        * can do.
+        */
+       if (!(adapter->flags & FW_OK))
+               return -ENXIO;
+
        /*
         * If this is the first interface that we're opening on the "adapter",
         * bring the "adapter" up now.
@@ -2720,6 +2727,7 @@ static int adap_init0(struct adapter *adapter)
         */
        size_nports_qsets(adapter);
 
+       adapter->flags |= FW_OK;
        return 0;
 }
 
@@ -3084,7 +3092,9 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
 
        err = adap_init0(adapter);
        if (err)
-               goto err_unmap_bar;
+               dev_err(&pdev->dev,
+                       "Adapter initialization failed, error %d. Continuing in debug mode\n",
+                       err);
 
        /* Initialize hash mac addr list */
        INIT_LIST_HEAD(&adapter->mac_hlist);
@@ -3109,13 +3119,6 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
                        break;
                port_id = ffs(pmask) - 1;
                pmask &= ~(1 << port_id);
-               viid = t4vf_alloc_vi(adapter, port_id);
-               if (viid < 0) {
-                       dev_err(&pdev->dev, "cannot allocate VI for port %d:"
-                               " err=%d\n", port_id, viid);
-                       err = viid;
-                       goto err_free_dev;
-               }
 
                /*
                 * Allocate our network device and stitch things together.
@@ -3123,7 +3126,6 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
                netdev = alloc_etherdev_mq(sizeof(struct port_info),
                                           MAX_PORT_QSETS);
                if (netdev == NULL) {
-                       t4vf_free_vi(adapter, viid);
                        err = -ENOMEM;
                        goto err_free_dev;
                }
@@ -3133,7 +3135,6 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
                pi->adapter = adapter;
                pi->pidx = pidx;
                pi->port_id = port_id;
-               pi->viid = viid;
 
                /*
                 * Initialize the starting state of our "port" and register
@@ -3159,6 +3160,23 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
                netdev->ethtool_ops = &cxgb4vf_ethtool_ops;
                netdev->dev_port = pi->port_id;
 
+               /*
+                * If we haven't been able to contact the firmware, there's
+                * nothing else we can do for this "port" ...
+                */
+               if (!(adapter->flags & FW_OK))
+                       continue;
+
+               viid = t4vf_alloc_vi(adapter, port_id);
+               if (viid < 0) {
+                       dev_err(&pdev->dev,
+                               "cannot allocate VI for port %d: err=%d\n",
+                               port_id, viid);
+                       err = viid;
+                       goto err_free_dev;
+               }
+               pi->viid = viid;
+
                /*
                 * Initialize the hardware/software state for the port.
                 */
@@ -3302,13 +3320,13 @@ err_free_dev:
                if (netdev == NULL)
                        continue;
                pi = netdev_priv(netdev);
-               t4vf_free_vi(adapter, pi->viid);
+               if (pi->viid)
+                       t4vf_free_vi(adapter, pi->viid);
                if (test_bit(pidx, &adapter->registered_device_map))
                        unregister_netdev(netdev);
                free_netdev(netdev);
        }
 
-err_unmap_bar:
        if (!is_t4(adapter->params.chip))
                iounmap(adapter->bar2);
 
@@ -3381,7 +3399,8 @@ static void cxgb4vf_pci_remove(struct pci_dev *pdev)
                                continue;
 
                        pi = netdev_priv(netdev);
-                       t4vf_free_vi(adapter, pi->viid);
+                       if (pi->viid)
+                               t4vf_free_vi(adapter, pi->viid);
                        free_netdev(netdev);
                }
                iounmap(adapter->regs);