3.10-stable patches

added patches:
	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 (file)
index 0000000..ce47235
--- /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 <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
+@@ -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 5bc97f1bd2c9f3ddf1ce455d1805d2c51ee9237e..6df052e216238786c3a2e300d315c1db2bf7f8ff 100644 (file)
--- 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