ibmvnic: Non-fatal error handling

Handle non-fatal error conditions. The process to do this when
resetting the driver is to just do __ibmvnic_close followed by
__ibmvnic_open.

Signed-off-by: John Allen <jallen@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 0f705e68755fbc917a44d8ff253044ecf0690142..def867aaa42284f57620c80fcba1b388e5697b29 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1225,37 +1225,41 @@ static int do_reset(struct ibmvnic_adapter *adapter,
        if (rc)
                return rc;
 
-       /* remove the closed state so when we call open it appears
-        * we are coming from the probed state.
-        */
-       adapter->state = VNIC_PROBED;
+       if (adapter->reset_reason != VNIC_RESET_NON_FATAL) {
+               /* remove the closed state so when we call open it appears
+                * we are coming from the probed state.
+                */
+               adapter->state = VNIC_PROBED;
 
-       release_resources(adapter);
-       release_sub_crqs(adapter);
-       release_crq_queue(adapter);
+               release_resources(adapter);
+               release_sub_crqs(adapter);
+               release_crq_queue(adapter);
 
-       rc = ibmvnic_init(adapter);
-       if (rc)
-               return 0;
+               rc = ibmvnic_init(adapter);
+               if (rc)
+                       return 0;
 
-       /* If the adapter was in PROBE state prior to the reset, exit here. */
-       if (reset_state == VNIC_PROBED)
-               return 0;
+               /* If the adapter was in PROBE state prior to the reset,
+                * exit here.
+                */
+               if (reset_state == VNIC_PROBED)
+                       return 0;
 
-       rc = ibmvnic_login(netdev);
-       if (rc) {
-               adapter->state = VNIC_PROBED;
-               return 0;
-       }
+               rc = ibmvnic_login(netdev);
+               if (rc) {
+                       adapter->state = VNIC_PROBED;
+                       return 0;
+               }
 
-       rtnl_lock();
-       rc = init_resources(adapter);
-       rtnl_unlock();
-       if (rc)
-               return rc;
+               rtnl_lock();
+               rc = init_resources(adapter);
+               rtnl_unlock();
+               if (rc)
+                       return rc;
 
-       if (reset_state == VNIC_CLOSED)
-               return 0;
+               if (reset_state == VNIC_CLOSED)
+                       return 0;
+       }
 
        rc = __ibmvnic_open(netdev);
        if (rc) {
@@ -2763,6 +2767,8 @@ static void handle_error_indication(union ibmvnic_crq *crq,
 
        if (crq->error_indication.flags & IBMVNIC_FATAL_ERROR)
                ibmvnic_reset(adapter, VNIC_RESET_FATAL);
+       else
+               ibmvnic_reset(adapter, VNIC_RESET_NON_FATAL);
 }
 
 static void handle_change_mac_rsp(union ibmvnic_crq *crq,

diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h
index fa6ac4e4a16e68822a0154f34759fc8107cac7d6..7e2300e64a47e0044872f79af4c9e889147cdb48 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.h
+++ b/drivers/net/ethernet/ibm/ibmvnic.h
@@ -925,6 +925,7 @@ enum vnic_state {VNIC_PROBING = 1,
 enum ibmvnic_reset_reason {VNIC_RESET_FAILOVER = 1,
                           VNIC_RESET_MOBILITY,
                           VNIC_RESET_FATAL,
+                          VNIC_RESET_NON_FATAL,
                           VNIC_RESET_TIMEOUT};
 
 struct ibmvnic_rwi {