Skip to content

Commit caee7bf

Browse files
Lijun Pandavem330
authored andcommitted
ibmvnic: print reset reason as a string
The reset reason can be added or deleted over different versions of the source code. Print a string instead of a number. Signed-off-by: Lijun Pan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c82eaa4 commit caee7bf

File tree

1 file changed

+28
-7
lines changed

1 file changed

+28
-7
lines changed

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,6 +1911,26 @@ static int ibmvnic_set_mac(struct net_device *netdev, void *p)
19111911
return rc;
19121912
}
19131913

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+
19141934
/*
19151935
* do_reset returns zero if we are able to keep processing reset events, or
19161936
* non-zero if we hit a fatal error and must halt.
@@ -1924,9 +1944,9 @@ static int do_reset(struct ibmvnic_adapter *adapter,
19241944
int i, rc;
19251945

19261946
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",
19281948
adapter->state, adapter->failover_pending,
1929-
rwi->reset_reason, reset_state);
1949+
reset_reason_to_string(rwi->reset_reason), reset_state);
19301950

19311951
adapter->reset_reason = rwi->reset_reason;
19321952
/* requestor of VNIC_RESET_CHANGE_PARAM already has the rtnl lock */
@@ -2139,8 +2159,8 @@ static int do_hard_reset(struct ibmvnic_adapter *adapter,
21392159
struct net_device *netdev = adapter->netdev;
21402160
int rc;
21412161

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));
21442164

21452165
/* read the state and check (again) after getting rtnl */
21462166
reset_state = adapter->state;
@@ -2363,8 +2383,8 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter,
23632383
list_for_each(entry, &adapter->rwi_list) {
23642384
tmp = list_entry(entry, struct ibmvnic_rwi, list);
23652385
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));
23682388
ret = EBUSY;
23692389
goto err;
23702390
}
@@ -2384,7 +2404,8 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter,
23842404
}
23852405
rwi->reset_reason = reason;
23862406
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));
23882409
schedule_work(&adapter->ibmvnic_reset);
23892410

23902411
ret = 0;

0 commit comments

Comments
 (0)