diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2014-01-14 23:10:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-07 15:09:35 -0800 |
| commit | 7d93e58d5374aef9cd895a7bb1a8903ffdb7c4b4 (patch) | |
| tree | 95a0de52db3c458df48cb8690de6ed4ae7090648 /drivers/misc/mei/hw-me.c | |
| parent | 92ab513072e73d74fee78062c9935f119339e4de (diff) | |
| download | linux-7d93e58d5374aef9cd895a7bb1a8903ffdb7c4b4.tar.gz linux-7d93e58d5374aef9cd895a7bb1a8903ffdb7c4b4.tar.xz | |
mei: allow multiple retries if the hw reset has failed
In some rare case mei hw reset may take long time to settle.
Instead of blocking resume flow we span another driver reset flow in
separate work context
This allows as to shorten hw reset timeout to something more acceptable
by DPM_WATCHDOG_TIMEOUT
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/hw-me.c')
| -rw-r--r-- | drivers/misc/mei/hw-me.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index 6f656c053b14..54286f304939 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -240,7 +240,7 @@ static int mei_me_hw_ready_wait(struct mei_device *dev) mutex_unlock(&dev->device_lock); err = wait_event_interruptible_timeout(dev->wait_hw_ready, dev->recvd_hw_ready, - mei_secs_to_jiffies(MEI_INTEROP_TIMEOUT)); + mei_secs_to_jiffies(MEI_HW_READY_TIMEOUT)); mutex_lock(&dev->device_lock); if (!err && !dev->recvd_hw_ready) { if (!err) |