| From 07cd7be3d92eeeae1f92a017f2cfe4fdd9256526 Mon Sep 17 00:00:00 2001 |
| From: Tomas Winkler <tomas.winkler@intel.com> |
| Date: Mon, 12 May 2014 12:19:40 +0300 |
| Subject: mei: me: drop harmful wait optimization |
| |
| From: Tomas Winkler <tomas.winkler@intel.com> |
| |
| commit 07cd7be3d92eeeae1f92a017f2cfe4fdd9256526 upstream. |
| |
| It my take time till ME_RDY will be cleared after the reset, |
| so we cannot check the bit before we got the interrupt |
| |
| 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> |
| |
| --- |
| drivers/misc/mei/hw-me.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| --- a/drivers/misc/mei/hw-me.c |
| +++ b/drivers/misc/mei/hw-me.c |
| @@ -186,6 +186,7 @@ static int mei_me_hw_reset(struct mei_de |
| else |
| hcsr &= ~H_IE; |
| |
| + dev->recvd_hw_ready = false; |
| mei_me_reg_write(hw, H_CSR, hcsr); |
| |
| if (intr_enable == false) |
| @@ -237,10 +238,7 @@ static bool mei_me_hw_is_ready(struct me |
| static int mei_me_hw_ready_wait(struct mei_device *dev) |
| { |
| int err; |
| - if (mei_me_hw_is_ready(dev)) |
| - return 0; |
| |
| - dev->recvd_hw_ready = false; |
| mutex_unlock(&dev->device_lock); |
| err = wait_event_interruptible_timeout(dev->wait_hw_ready, |
| dev->recvd_hw_ready, |
