@@ -1911,6 +1911,26 @@ static int ibmvnic_set_mac(struct net_device *netdev, void *p)
1911
1911
return rc ;
1912
1912
}
1913
1913
1914
+ static const char * reset_reason_to_string (enum ibmvnic_reset_reason reason )
1915
+ {
1916
+ switch (reason ) {
1917
+ case VNIC_RESET_FAILOVER :
1918
+ return "FAILOVER" ;
1919
+ case VNIC_RESET_MOBILITY :
1920
+ return "MOBILITY" ;
1921
+ case VNIC_RESET_FATAL :
1922
+ return "FATAL" ;
1923
+ case VNIC_RESET_NON_FATAL :
1924
+ return "NON_FATAL" ;
1925
+ case VNIC_RESET_TIMEOUT :
1926
+ return "TIMEOUT" ;
1927
+ case VNIC_RESET_CHANGE_PARAM :
1928
+ return "CHANGE_PARAM" ;
1929
+ default :
1930
+ return "UNKNOWN" ;
1931
+ }
1932
+ }
1933
+
1914
1934
/*
1915
1935
* do_reset returns zero if we are able to keep processing reset events, or
1916
1936
* non-zero if we hit a fatal error and must halt.
@@ -1924,9 +1944,9 @@ static int do_reset(struct ibmvnic_adapter *adapter,
1924
1944
int i , rc ;
1925
1945
1926
1946
netdev_dbg (adapter -> netdev ,
1927
- "[S:%d FOP:%d] Reset reason %d , reset_state %d\n" ,
1947
+ "[S:%d FOP:%d] Reset reason: %s , reset_state %d\n" ,
1928
1948
adapter -> state , adapter -> failover_pending ,
1929
- rwi -> reset_reason , reset_state );
1949
+ reset_reason_to_string ( rwi -> reset_reason ) , reset_state );
1930
1950
1931
1951
adapter -> reset_reason = rwi -> reset_reason ;
1932
1952
/* requestor of VNIC_RESET_CHANGE_PARAM already has the rtnl lock */
@@ -2139,8 +2159,8 @@ static int do_hard_reset(struct ibmvnic_adapter *adapter,
2139
2159
struct net_device * netdev = adapter -> netdev ;
2140
2160
int rc ;
2141
2161
2142
- netdev_dbg (adapter -> netdev , "Hard resetting driver (%d )\n" ,
2143
- rwi -> reset_reason );
2162
+ netdev_dbg (adapter -> netdev , "Hard resetting driver (%s )\n" ,
2163
+ reset_reason_to_string ( rwi -> reset_reason ) );
2144
2164
2145
2165
/* read the state and check (again) after getting rtnl */
2146
2166
reset_state = adapter -> state ;
@@ -2363,8 +2383,8 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter,
2363
2383
list_for_each (entry , & adapter -> rwi_list ) {
2364
2384
tmp = list_entry (entry , struct ibmvnic_rwi , list );
2365
2385
if (tmp -> reset_reason == reason ) {
2366
- netdev_dbg (netdev , "Skipping matching reset, reason=%d \n" ,
2367
- reason );
2386
+ netdev_dbg (netdev , "Skipping matching reset, reason=%s \n" ,
2387
+ reset_reason_to_string ( reason ) );
2368
2388
ret = EBUSY ;
2369
2389
goto err ;
2370
2390
}
@@ -2384,7 +2404,8 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter,
2384
2404
}
2385
2405
rwi -> reset_reason = reason ;
2386
2406
list_add_tail (& rwi -> list , & adapter -> rwi_list );
2387
- netdev_dbg (adapter -> netdev , "Scheduling reset (reason %d)\n" , reason );
2407
+ netdev_dbg (adapter -> netdev , "Scheduling reset (reason %s)\n" ,
2408
+ reset_reason_to_string (reason ));
2388
2409
schedule_work (& adapter -> ibmvnic_reset );
2389
2410
2390
2411
ret = 0 ;
0 commit comments