leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ibmvnic: Non-fatal error handling

Browse Source 
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>
This commit is contained in:
John Allen
2017-05-26 10:30:37 -04:00
committed by David S. Miller
parent 10f7621588
commit 8cb31cfc94
2 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/net/ethernet/ibm/ibmvnic.c
View File

@@ -1225,38 +1225,42 @@ static int do_reset(struct ibmvnic_adapter *adapter,
if (rc) if (rc)
return rc; return rc;
/* remove the closed state so when we call open it appears if (adapter->reset_reason != VNIC_RESET_NON_FATAL) {
* we are coming from the probed state. /* 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);
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;
rc = ibmvnic_login(netdev);
if (rc) {
adapter->state = VNIC_PROBED; adapter->state = VNIC_PROBED;
return 0;
release_resources(adapter);
release_sub_crqs(adapter);
release_crq_queue(adapter);
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;
rc = ibmvnic_login(netdev);
if (rc) {
adapter->state = VNIC_PROBED;
return 0;
}
rtnl_lock();
rc = init_resources(adapter);
rtnl_unlock();
if (rc)
return rc;
if (reset_state == VNIC_CLOSED)
return 0;
} }
rtnl_lock();
rc = init_resources(adapter);
rtnl_unlock();
if (rc)
return rc;
if (reset_state == VNIC_CLOSED)
return 0;
rc = __ibmvnic_open(netdev); rc = __ibmvnic_open(netdev);
if (rc) { if (rc) {
if (list_empty(&adapter->rwi_list)) if (list_empty(&adapter->rwi_list))
@@ -2763,6 +2767,8 @@ static void handle_error_indication(union ibmvnic_crq *crq,
if (crq->error_indication.flags & IBMVNIC_FATAL_ERROR) if (crq->error_indication.flags & IBMVNIC_FATAL_ERROR)
ibmvnic_reset(adapter, VNIC_RESET_FATAL); ibmvnic_reset(adapter, VNIC_RESET_FATAL);
else
ibmvnic_reset(adapter, VNIC_RESET_NON_FATAL);
} }
static void handle_change_mac_rsp(union ibmvnic_crq *crq, static void handle_change_mac_rsp(union ibmvnic_crq *crq,

1
drivers/net/ethernet/ibm/ibmvnic.h
View File

@@ -925,6 +925,7 @@ enum vnic_state {VNIC_PROBING = 1,
enum ibmvnic_reset_reason {VNIC_RESET_FAILOVER = 1, enum ibmvnic_reset_reason {VNIC_RESET_FAILOVER = 1,
VNIC_RESET_MOBILITY, VNIC_RESET_MOBILITY,
VNIC_RESET_FATAL, VNIC_RESET_FATAL,
VNIC_RESET_NON_FATAL,
VNIC_RESET_TIMEOUT}; VNIC_RESET_TIMEOUT};
struct ibmvnic_rwi { struct ibmvnic_rwi {