ibmvnic: Create separate initialization routine for resets

[linux.git] / drivers / net / ethernet / ibm / ibmvnic.c

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index f1f744ebb14ebd79dd2c389fc7ab68ac993463df..f26e1f893441c27328b77c48c04580d77c1867dc 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -116,6 +116,7 @@ static void send_cap_queries(struct ibmvnic_adapter *adapter);
 static int init_sub_crqs(struct ibmvnic_adapter *);
 static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter);
 static int ibmvnic_init(struct ibmvnic_adapter *);
+static int ibmvnic_reset_init(struct ibmvnic_adapter *);
 static void release_crq_queue(struct ibmvnic_adapter *);
 static int __ibmvnic_set_mac(struct net_device *netdev, struct sockaddr *p);
 static int init_crq_queue(struct ibmvnic_adapter *adapter);
@@ -929,6 +930,10 @@ static int set_link_state(struct ibmvnic_adapter *adapter, u8 link_state)
                        /* Partuial success, delay and re-send */
                        mdelay(1000);
                        resend = true;
+               } else if (adapter->init_done_rc) {
+                       netdev_warn(netdev, "Unable to set link state, rc=%d\n",
+                                   adapter->init_done_rc);
+                       return adapter->init_done_rc;
                }
        } while (resend);
 
@@ -1803,7 +1808,7 @@ static int do_reset(struct ibmvnic_adapter *adapter,
                        return rc;
                }
 
-               rc = ibmvnic_init(adapter);
+               rc = ibmvnic_reset_init(adapter);
                if (rc)
                        return IBMVNIC_INIT_FAILED;
 
@@ -4567,7 +4572,7 @@ static int init_crq_queue(struct ibmvnic_adapter *adapter)
        return retrc;
 }
 
-static int ibmvnic_init(struct ibmvnic_adapter *adapter)
+static int ibmvnic_reset_init(struct ibmvnic_adapter *adapter)
 {
        struct device *dev = &adapter->vdev->dev;
        unsigned long timeout = msecs_to_jiffies(30000);
@@ -4626,6 +4631,49 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
        return rc;
 }
 
+static int ibmvnic_init(struct ibmvnic_adapter *adapter)
+{
+       struct device *dev = &adapter->vdev->dev;
+       unsigned long timeout = msecs_to_jiffies(30000);
+       int rc;
+
+       adapter->from_passive_init = false;
+
+       init_completion(&adapter->init_done);
+       adapter->init_done_rc = 0;
+       ibmvnic_send_crq_init(adapter);
+       if (!wait_for_completion_timeout(&adapter->init_done, timeout)) {
+               dev_err(dev, "Initialization sequence timed out\n");
+               return -1;
+       }
+
+       if (adapter->init_done_rc) {
+               release_crq_queue(adapter);
+               return adapter->init_done_rc;
+       }
+
+       if (adapter->from_passive_init) {
+               adapter->state = VNIC_OPEN;
+               adapter->from_passive_init = false;
+               return -1;
+       }
+
+       rc = init_sub_crqs(adapter);
+       if (rc) {
+               dev_err(dev, "Initialization of sub crqs failed\n");
+               release_crq_queue(adapter);
+               return rc;
+       }
+
+       rc = init_sub_crq_irqs(adapter);
+       if (rc) {
+               dev_err(dev, "Failed to initialize sub crq irqs\n");
+               release_crq_queue(adapter);
+       }
+
+       return rc;
+}
+
 static struct device_attribute dev_attr_failover;
 
 static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)