Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c40765d9 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: me: read H_CSR after asserting reset 



According the spec the host should read H_CSR again
after asserting reset H_RST to ensure that reset was
read by the firmware

Cc: stable@vger.kernel.org
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07cd7be3

drivers/misc/mei/hw-me.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -206,6 +206,18 @@ static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable) 
	dev->recvd_hw_ready = false;

	dev->recvd_hw_ready = false;

	mei_me_reg_write(hw, H_CSR, hcsr);

	mei_me_reg_write(hw, H_CSR, hcsr);





	/*

	 * Host reads the H_CSR once to ensure that the

	 * posted write to H_CSR completes.

	 */

	hcsr = mei_hcsr_read(hw);



	if ((hcsr & H_RST) == 0)

		dev_warn(&dev->pdev->dev, "H_RST is not set = 0x%08X", hcsr);



	if ((hcsr & H_RDY) == H_RDY)

		dev_warn(&dev->pdev->dev, "H_RDY is not cleared 0x%08X", hcsr);



	if (intr_enable == false)

	if (intr_enable == false)

		mei_me_hw_reset_release(dev);

		mei_me_hw_reset_release(dev);