xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ibmvnic: no reset timeout for 5 seconds after reset

Browse Source 
Reset timeout is going off right after adapter reset. This patch ensures
that timeout is scheduled if it has been 5 seconds since the last reset.
5 seconds is the default watchdog timeout.

Fixes: ed651a1087 ("ibmvnic: Updated reset handling")
Signed-off-by: Dany Madden <drt@linux.ibm.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Dany Madden
2020-11-25 18:04:31 -06:00
committed by Jakub Kicinski
parent c98d9cc417
commit a86d5c682b
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2252,6 +2252,7 @@ static void __ibmvnic_reset(struct work_struct *work)
rc = do_reset(adapter, rwi, reset_state); rc = do_reset(adapter, rwi, reset_state);
} }
kfree(rwi); kfree(rwi);
adapter->last_reset_time = jiffies;
if (rc) if (rc)
netdev_dbg(adapter->netdev, "Reset failed, rc=%d\n", rc); netdev_dbg(adapter->netdev, "Reset failed, rc=%d\n", rc);
@@ -2355,7 +2356,13 @@ static void ibmvnic_tx_timeout(struct net_device *dev, unsigned int txqueue)
"Adapter is resetting, skip timeout reset\n"); "Adapter is resetting, skip timeout reset\n");
return; return;
} }
/* No queuing up reset until at least 5 seconds (default watchdog val)
* after last reset
*/
if (time_before(jiffies, (adapter->last_reset_time + dev->watchdog_timeo))) {
netdev_dbg(dev, "Not yet time to tx timeout.\n");
return;
}
ibmvnic_reset(adapter, VNIC_RESET_TIMEOUT); ibmvnic_reset(adapter, VNIC_RESET_TIMEOUT);
} }
@@ -5282,7 +5289,7 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
adapter->state = VNIC_PROBED; adapter->state = VNIC_PROBED;
adapter->wait_for_reset = false; adapter->wait_for_reset = false;
adapter->last_reset_time = jiffies;
return 0; return 0;
ibmvnic_register_fail: ibmvnic_register_fail:

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

@@ -1087,6 +1087,8 @@ struct ibmvnic_adapter {
unsigned long resetting; unsigned long resetting;
bool napi_enabled, from_passive_init; bool napi_enabled, from_passive_init;
bool login_pending; bool login_pending;
/* last device reset time */
unsigned long last_reset_time;
bool failover_pending; bool failover_pending;
bool force_reset_recovery; bool force_reset_recovery;