ibmvnic: driver initialization for kdump/kexec

When booting into the kdump/kexec kernel, pHyp and vios
are not prepared for the initialization crq request and
a failover transport event is generated. This is not
handled correctly.

At this point in initialization the driver is still in
the 'probing' state and cannot handle a full reset of the
driver as is normally done for a failover transport event.

To correct this we catch driver resets while still in the
'probing' state and return EAGAIN. This results in the
driver tearing down the main crq and calling ibmvnic_init()
again.

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 9923b9fa0c74cfb21b306119bf933c012b828444..722daf55d75710c315c6361361d62a6268176b81 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1454,6 +1454,12 @@ static void ibmvnic_reset(struct ibmvnic_adapter *adapter,
                return;
        }
 
+       if (adapter->state == VNIC_PROBING) {
+               netdev_warn(netdev, "Adapter reset during probe\n");
+               adapter->init_done_rc = EAGAIN;
+               return;
+       }
+
        mutex_lock(&adapter->rwi_lock);
 
        list_for_each(entry, &adapter->rwi_list) {
@@ -3649,12 +3655,18 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
        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;
@@ -3723,11 +3735,13 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
        mutex_init(&adapter->rwi_lock);
        adapter->resetting = false;
 
-       rc = ibmvnic_init(adapter);
-       if (rc) {
-               free_netdev(netdev);
-               return rc;
-       }
+       do {
+               rc = ibmvnic_init(adapter);
+               if (rc != EAGAIN) {
+                       free_netdev(netdev);
+                       return rc;
+               }
+       } while (rc == EAGAIN);
 
        netdev->mtu = adapter->req_mtu - ETH_HLEN;