cnic, bnx2: Check iSCSI support early in bnx2_init_one()

commit 7625eb2f2fff7bfae41d3119b472c20b48874895 upstream.

Based on earlier patch from Neil Horman <nhorman@tuxdriver.com>

If iSCSI is not supported on a bnx2 device, bnx2_cnic_probe() will
return NULL and the cnic device will not be visible to bnx2i.  This
will prevent bnx2i from registering and then unregistering during
cnic_start() and cause the warning message:

bnx2 0003:01:00.1: eth1: Failed waiting for ULP up call to complete

Signed-off-by: Michael Chan <mchan@broadcom.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 9 insertions, 10 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 57d3293c65b..74580bb175f 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -416,6 +416,9 @@ struct cnic_eth_dev *bnx2_cnic_probe(struct net_device *dev)
         struct bnx2 *bp = netdev_priv(dev);
         struct cnic_eth_dev *cp = &bp->cnic_eth_dev;
 
+        if (!cp->max_iscsi_conn)
+                return NULL;
+
         cp->drv_owner = THIS_MODULE;
         cp->chip_id = bp->chip_id;
         cp->pdev = bp->pdev;
@@ -8177,6 +8180,10 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         bp->timer.data = (unsigned long) bp;
         bp->timer.function = bnx2_timer;
 
+#ifdef BCM_CNIC
+        bp->cnic_eth_dev.max_iscsi_conn =
+                bnx2_reg_rd_ind(bp, BNX2_FW_MAX_ISCSI_CONN);
+#endif
         pci_save_state(pdev);
 
         return 0;
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 6c544b3411f..363c7f36890 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -4225,14 +4225,6 @@ static void cnic_enable_bnx2_int(struct cnic_dev *dev)
                 BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | cp->last_status_idx);
 }
 
-static void cnic_get_bnx2_iscsi_info(struct cnic_dev *dev)
-{
-        u32 max_conn;
-
-        max_conn = cnic_reg_rd_ind(dev, BNX2_FW_MAX_ISCSI_CONN);
-        dev->max_iscsi_conn = max_conn;
-}
-
 static void cnic_disable_bnx2_int_sync(struct cnic_dev *dev)
 {
         struct cnic_local *cp = dev->cnic_priv;
@@ -4557,8 +4549,6 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
                 return err;
         }
 
-        cnic_get_bnx2_iscsi_info(dev);
-
         return 0;
 }
 
@@ -5224,6 +5214,8 @@ static struct cnic_dev *init_bnx2_cnic(struct net_device *dev)
         cdev->pcidev = pdev;
         cp->chip_id = ethdev->chip_id;
 
+        cdev->max_iscsi_conn = ethdev->max_iscsi_conn;
+
         cp->cnic_ops = &cnic_bnx2_ops;
         cp->start_hw = cnic_start_bnx2_hw;
         cp->stop_hw = cnic_stop_bnx2_hw;