From 14f84bca8f72d4ea039e516b9d372f4edc77124e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 12 Jun 2014 16:16:50 -0700 Subject: [PATCH] 3.10-stable patches added patches: mei-me-drop-harmful-wait-optimization.patch --- ...ei-me-drop-harmful-wait-optimization.patch | 41 +++++++++++++++++++ queue-3.10/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 queue-3.10/mei-me-drop-harmful-wait-optimization.patch diff --git a/queue-3.10/mei-me-drop-harmful-wait-optimization.patch b/queue-3.10/mei-me-drop-harmful-wait-optimization.patch new file mode 100644 index 00000000000..ce472357112 --- /dev/null +++ b/queue-3.10/mei-me-drop-harmful-wait-optimization.patch @@ -0,0 +1,41 @@ +From 07cd7be3d92eeeae1f92a017f2cfe4fdd9256526 Mon Sep 17 00:00:00 2001 +From: Tomas Winkler +Date: Mon, 12 May 2014 12:19:40 +0300 +Subject: mei: me: drop harmful wait optimization + +From: Tomas Winkler + +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 +Signed-off-by: Alexander Usyskin +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -183,6 +183,7 @@ static void mei_me_hw_reset(struct mei_d + else + hcsr &= ~H_IE; + ++ dev->recvd_hw_ready = false; + mei_me_reg_write(hw, H_CSR, hcsr); + + if (dev->dev_state == MEI_DEV_POWER_DOWN) +@@ -233,10 +234,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, diff --git a/queue-3.10/series b/queue-3.10/series index 5bc97f1bd2c..6df052e2162 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -13,3 +13,4 @@ mm-compaction-detect-when-scanners-meet-in-isolate_freepages.patch mm-compaction-make-isolate_freepages-start-at-pageblock-boundary.patch auditsc-audit_krule-mask-accesses-need-bounds-checking.patch scsi-megaraid-use-resource_size_t-for-pci-resources-not-long.patch +mei-me-drop-harmful-wait-optimization.patch -- 2.47.3