Commit ff96066e authored Jul 30, 2013 by Tomas Winkler Committed by Greg Kroah-Hartman Aug 12, 2013

mei: me: fix hardware reset flow



Both H_IS and H_IE needs to be set to receive H_RDY
interrupt

1. Assert H_IS to clear the interrupts during hw reset
and use mei_me_reg_write instead of mei_hcsr_set as the later
strips down the H_IS

2. fix interrupt disablement embarrassing typo
  hcsr |= ~H_IE -> hcsr &= ~H_IE;
this will remove the unwanted interrupt on power down

3. remove useless debug print outs

Cc: Shuah Khan <shuah.kh@samsung.com>
Cc: Konstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3d04dd2f

drivers/misc/mei/hw-me.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -176,21 +176,18 @@ static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable)
		struct mei_me_hw *hw = to_me_hw(dev);
		u32 hcsr = mei_hcsr_read(hw);

		dev_dbg(&dev->pdev->dev, "before reset HCSR = 0x%08x.\n", hcsr);

		hcsr \|= (H_RST \| H_IG);
		hcsr \|= H_RST \| H_IG \| H_IS;

		if (intr_enable)
		hcsr \|= H_IE;
		else
		hcsr \|= ~H_IE;
		hcsr &= ~H_IE;

		mei_hcsr_set(hw, hcsr);
		mei_me_reg_write(hw, H_CSR, hcsr);

		if (dev->dev_state == MEI_DEV_POWER_DOWN)
		mei_me_hw_reset_release(dev);

		dev_dbg(&dev->pdev->dev, "current HCSR = 0x%08x.\n", mei_hcsr_read(hw));
		return 0;
		}