ibmvnic: Reset the CRQ queue during driver reset

When a driver reset operation occurs there is not a need to release
the CRQ resources and re-allocate them. Instead a reset of the CRQ
will suffice.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 760352f7f98d870fd43380a4bccef468a28fc03b..b9b0c693ce0119f7936a87c4c13f41fc7aa02562 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1260,7 +1260,6 @@ static int do_reset(struct ibmvnic_adapter *adapter,
 
                release_resources(adapter);
                release_sub_crqs(adapter);
-               release_crq_queue(adapter);
 
                rc = ibmvnic_init(adapter);
                if (rc)
@@ -3517,7 +3516,14 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
        unsigned long timeout = msecs_to_jiffies(30000);
        int rc;
 
-       rc = init_crq_queue(adapter);
+       if (adapter->resetting) {
+               rc = ibmvnic_reset_crq(adapter);
+               if (!rc)
+                       rc = vio_enable_interrupts(adapter->vdev);
+       } else {
+               rc = init_crq_queue(adapter);
+       }
+
        if (rc) {
                dev_err(dev, "Couldn't initialize crq. rc=%d\n", rc);
                return rc;