mei: revamp mei reset state machine

1. MEI_DEV_RESETTING device state spans only hardware reset flow
while starting dev state is saved into a local variable for further
reference, this let us to reduce big if statements in case we
are trying to avoid nested resets

2. During initializations if the reset ended in MEI_DEV_DISABLED device
state we bail out with -ENODEV

3. Remove redundant interrupts_enabled parameter as this
 can be deduced from the starting dev_state

4. mei_reset propagates error code to the caller

5. Add mei_restart function to wrap the pci resume

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>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 2a7277de7ca1..f0fbb5179f80 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -560,7 +560,7 @@ void mei_timer(struct work_struct *work)
                         if (--dev->init_clients_timer == 0) {
                                 dev_err(&dev->pdev->dev, "timer: init clients timeout hbm_state = %d.\n",
                                         dev->hbm_state);
-                                mei_reset(dev, 1);
+                                mei_reset(dev);
                                 goto out;
                         }
                 }
@@ -573,8 +573,8 @@ void mei_timer(struct work_struct *work)
         list_for_each_entry_safe(cl_pos, cl_next, &dev->file_list, link) {
                 if (cl_pos->timer_count) {
                         if (--cl_pos->timer_count == 0) {
-                                dev_err(&dev->pdev->dev, "reset: connect/disconnect timeout.\n");
-                                mei_reset(dev, 1);
+                                dev_err(&dev->pdev->dev, "timer: connect/disconnect timeout.\n");
+                                mei_reset(dev);
                                 goto out;
                         }
                 }
@@ -582,8 +582,8 @@ void mei_timer(struct work_struct *work)
 
         if (dev->iamthif_stall_timer) {
                 if (--dev->iamthif_stall_timer == 0) {
-                        dev_err(&dev->pdev->dev, "reset: amthif  hanged.\n");
-                        mei_reset(dev, 1);
+                        dev_err(&dev->pdev->dev, "timer: amthif  hanged.\n");
+                        mei_reset(dev);
                         dev->iamthif_msg_buf_size = 0;
                         dev->iamthif_msg_buf_index = 0;
                         dev->iamthif_canceled = false;
@@ -636,7 +636,8 @@ void mei_timer(struct work_struct *work)
                 }
         }
 out:
-        schedule_delayed_work(&dev->timer_work, 2 * HZ);
+        if (dev->dev_state != MEI_DEV_DISABLED)
+                schedule_delayed_work(&dev->timer_work, 2 * HZ);
         mutex_unlock(&dev->device_lock);
 }