Skip to contentSkip to conversation

[3.9] Lynx Point LP Bug Fixes for 3.9

PATCH In review Tomas Winkler 2 participants 5 messages Mar 10, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover [3.9] Lynx Point LP Bug Fixes for 3.9

Hi Greg
Please, if possible schedule these patches for 3.9 update.
The patches fix the reset/initialization for Lynx Point LP (dev_id: 0x9C3A) devices to be found in the Haswell systems.

This not a regression per se but it's a fix for a new device.

Tomas Winkler (2):
mei: ME hw reset need to be synchoronous
mei: add mei_stop function to stop mei device

 drivers/misc/mei/hw-me.c   | 35 +++++++++++++++++-------------
 drivers/misc/mei/init.c    | 16 ++++++++++++++
 drivers/misc/mei/mei_dev.h |  1 +
 drivers/misc/mei/pci-me.c  | 53 +++++-----------------------------------------
 4 files changed, 42 insertions(+), 63 deletions(-)
Signature · 1 line
1.8.1.3
#1 lore raw

PATCH 1/2 [3.9] mei: ME hardware reset needs to be synchronized

This fixes failure during initialization on Lynx Point LP devices.

ME driver needs to release the device from the reset only after the FW has completed its flow and indicated it by delivering an interrupt to the host.

This is the correct behavior for all the ME devices yet the the previous versions are less susceptive to the implementation that ignored FW reset completion indication.

We add mei_me_hw_reset_release function which is called after reset from the interrupt thread or directly from mei_reset during power down.

---
 drivers/misc/mei/hw-me.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)
drivers/misc/mei/hw-me.c +20 -9
index 45ea718..642c622 100644
@@ -152,6 +152,20 @@ static void mei_me_intr_disable(struct mei_device *dev)
 }
 
 /**
+ * mei_me_hw_reset_release - release device from the reset
+ *
+ * @dev: the device structure
+ */
+static void mei_me_hw_reset_release(struct mei_device *dev)
+{
+	struct mei_me_hw *hw = to_me_hw(dev);
+	u32 hcsr = mei_hcsr_read(hw);
+
+	hcsr |= H_IG;
+	hcsr &= ~H_RST;
+	mei_hcsr_set(hw, hcsr);
+}
+/**
  * mei_me_hw_reset - resets fw via mei csr register.
  *
  * @dev: the device structure
@@ -169,18 +183,14 @@ static void mei_me_hw_reset(struct mei_device *dev, bool intr_enable)
 	if (intr_enable)
 		hcsr |= H_IE;
 	else
-		hcsr &= ~H_IE;
-
-	mei_hcsr_set(hw, hcsr);
-
-	hcsr = mei_hcsr_read(hw) | H_IG;
-	hcsr &= ~H_RST;
+		hcsr |= ~H_IE;
 
 	mei_hcsr_set(hw, hcsr);
 
-	hcsr = mei_hcsr_read(hw);
+	if (dev->dev_state == MEI_DEV_POWER_DOWN)
+		mei_me_hw_reset_release(dev);
 
-	dev_dbg(&dev->pdev->dev, "current HCSR = 0x%08x.\n", hcsr);
+	dev_dbg(&dev->pdev->dev, "current HCSR = 0x%08x.\n", mei_hcsr_read(hw));
 }
 
 /**
@@ -466,7 +476,8 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)
 			mutex_unlock(&dev->device_lock);
 			return IRQ_HANDLED;
 		} else {
-			dev_dbg(&dev->pdev->dev, "FW not ready.\n");
+			dev_dbg(&dev->pdev->dev, "Reset Completed.\n");
+			mei_me_hw_reset_release(dev);
 			mutex_unlock(&dev->device_lock);
 			return IRQ_HANDLED;
 		}
Signature · 1 line
1.8.1.3
#2 lore raw

PATCH 2/2 [3.9] mei: add mei_stop function to stop mei device

In reply to Tomas Winkler

mei_stop calls mei_reset with disabling the interrupts.
It will have the same effect as the open code it replaces in the mei_remove.

The reset sequence on remove is required for the Lynx Point LP devices to clean the reset state.

mei_stop is called from mei_pci_suspend and mei_remove functions

---
 drivers/misc/mei/init.c    | 18 ++++++++++++++++
 drivers/misc/mei/mei_dev.h |  1 +
 drivers/misc/mei/pci-me.c  | 52 +++++++---------------------------------------
 3 files changed, 26 insertions(+), 45 deletions(-)
drivers/misc/mei/init.c +18 -0
index 6ec5301..3561799 100644
@@ -183,6 +183,24 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
 	mei_cl_all_write_clear(dev);
 }
 
+void mei_stop(struct mei_device *dev)
+{
+	dev_dbg(&dev->pdev->dev, "stopping the device.\n");
+
+	mutex_lock(&dev->device_lock);
+
+	cancel_delayed_work(&dev->timer_work);
+
+	mei_wd_stop(dev);
+
+	dev->dev_state = MEI_DEV_POWER_DOWN;
+	mei_reset(dev, 0);
+
+	mutex_unlock(&dev->device_lock);
+
+	flush_scheduled_work();
+}
+
 
 
 
drivers/misc/mei/mei_dev.h +1 -0
index cb80166..9787381 100644
@@ -381,6 +381,7 @@ static inline unsigned long mei_secs_to_jiffies(unsigned long sec)
 void mei_device_init(struct mei_device *dev);
 void mei_reset(struct mei_device *dev, int interrupts);
 int mei_hw_init(struct mei_device *dev);
+void mei_stop(struct mei_device *dev);
 
 /*
  *  MEI interrupt functions prototype
drivers/misc/mei/pci-me.c +7 -45

79 lines not on this page · raw message

Signature · 1 line
1.8.1.3
maintainer
#3 lore raw
In reply to Tomas Winkler
Quoted 6 lines · Tomas Winkler

Hi Greg
Please, if possible schedule these patches for 3.9 update.
The patches fix the reset/initialization for Lynx Point LP (dev_id: 0x9C3A) devices to be found in the Haswell systems.

This not a regression per se but it's a fix for a new device.

What happens if you have this new device and don't have these fixes?

#4 lore raw
Quoted 9 lines
Quoted 7 lines

Hi Greg
Please, if possible schedule these patches for 3.9 update. The patches fix the reset/initialization for Lynx Point LP (dev_id:
0x9C3A) devices to be found in the Haswell systems.

This not a regression per se but it's a fix for a new device.

What happens if you have this new device and don't have these fixes?

They fail to initialize as the reset flow doesn't complete, plainly it won't work.

Similar patch has to be send for 3.7 and 3.8. It Just needs to be done differently as there was large code movement included in 3.9.

I've assumed at the time that Lynx Point LP behaves same as Lynx Point but I was wrong.

Tomas
Thanks