diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2013-07-17 15:13:15 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-29 09:47:40 -0700 |
| commit | 7dae89cb15ebdc7e286b884cd79f3a4b94fcdff4 (patch) | |
| tree | 936092fe5b71e6f8295bfdd07107d0fa7a5b1fe3 | |
| parent | 061cc2478cdacc2de2e3dd0cdfdd9bfcc5be5d93 (diff) | |
| download | kernel-common-7dae89cb15ebdc7e286b884cd79f3a4b94fcdff4.tar.gz kernel-common-7dae89cb15ebdc7e286b884cd79f3a4b94fcdff4.tar.bz2 kernel-common-7dae89cb15ebdc7e286b884cd79f3a4b94fcdff4.zip | |
mei: me: fix reset state machine
commit 315a383ad7dbd484fafb93ef08038e3dbafbb7a8 upstream.
ME HW ready bit is down after hw reset was asserted or on error.
Only on error we need to enter the reset flow, additional reset
need to be prevented when reset was triggered during
initialization , power up/down or a reset is already in progress
Tested-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/misc/mei/hw-me.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index 822170f00348..03108591c139 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -482,7 +482,9 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id) /* check if ME wants a reset */ if (!mei_hw_is_ready(dev) && dev->dev_state != MEI_DEV_RESETTING && - dev->dev_state != MEI_DEV_INITIALIZING) { + dev->dev_state != MEI_DEV_INITIALIZING && + dev->dev_state != MEI_DEV_POWER_DOWN && + dev->dev_state != MEI_DEV_POWER_UP) { dev_dbg(&dev->pdev->dev, "FW not ready.\n"); mei_reset(dev, 1); mutex_unlock(&dev->device_lock); |