Commit 315a383a authored Jul 17, 2013 by Tomas Winkler Committed by Greg Kroah-Hartman Jul 23, 2013

mei: me: fix reset state machine



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>

parent 9310f61a

drivers/misc/mei/hw-me.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -483,7 +483,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);