mei: revamp hbm state machine

1. Rename init_clients_state to hbm_state and use
MEI_HBM_ prefix for HBM states

2. Remove recvd_msg and use hbm state for synchronizing
hbm protocol has successful start.
We can wake up the hbm event from start response handler
and remove the hack from the interrupt thread

3. mei_hbm_start_wait function encapsulate start completion
waiting

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 19 deletions

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 4e102ad7ebc0..59159e05446c 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -80,8 +80,6 @@ EXPORT_SYMBOL_GPL(mei_device_init);
  */
 int mei_start(struct mei_device *dev)
 {
-        int ret = 0;
-
         mutex_lock(&dev->device_lock);
 
         /* acknowledge interrupt and stop interupts */
@@ -89,29 +87,15 @@ int mei_start(struct mei_device *dev)
 
         mei_hw_config(dev);
 
-        dev->recvd_msg = false;
         dev_dbg(&dev->pdev->dev, "reset in start the mei device.\n");
 
         mei_reset(dev, 1);
 
-        /* wait for ME to turn on ME_RDY */
-        if (!dev->recvd_msg) {
-                mutex_unlock(&dev->device_lock);
-                ret = wait_event_interruptible_timeout(dev->wait_recvd_msg,
-                        dev->recvd_msg,
-                        mei_secs_to_jiffies(MEI_INTEROP_TIMEOUT));
-                mutex_lock(&dev->device_lock);
-        }
-
-        if (ret <= 0 && !dev->recvd_msg) {
-                dev->dev_state = MEI_DEV_DISABLED;
-                dev_dbg(&dev->pdev->dev,
-                        "wait_event_interruptible_timeout failed"
-                        "on wait for ME to turn on ME_RDY.\n");
+        if (mei_hbm_start_wait(dev)) {
+                dev_err(&dev->pdev->dev, "HBM haven't started");
                 goto err;
         }
 
-
         if (!mei_host_is_ready(dev)) {
                 dev_err(&dev->pdev->dev, "host is not ready.\n");
                 goto err;
@@ -128,7 +112,6 @@ int mei_start(struct mei_device *dev)
                 goto err;
         }
 
-        dev->recvd_msg = false;
         dev_dbg(&dev->pdev->dev, "link layer has been established.\n");
 
         mutex_unlock(&dev->device_lock);
@@ -158,6 +141,7 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
 
         mei_hw_reset(dev, interrupts_enabled);
 
+        dev->hbm_state = MEI_HBM_IDLE;
 
         if (dev->dev_state != MEI_DEV_INITIALIZING) {
                 if (dev->dev_state != MEI_DEV_DISABLED &&