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

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

mei: me: drop harmful wait optimization 



It my take time till ME_RDY will be cleared after the reset,
so we cannot check the bit before we got the interrupt

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 b04ada92

drivers/misc/mei/hw-me.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -203,6 +203,7 @@ static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable) 
	else

	else

		hcsr &= ~H_IE;

		hcsr &= ~H_IE;





	dev->recvd_hw_ready = false;

	mei_me_reg_write(hw, H_CSR, hcsr);

	mei_me_reg_write(hw, H_CSR, hcsr);





	if (intr_enable == false)

	if (intr_enable == false)
@@ -254,10 +255,7 @@ static bool mei_me_hw_is_ready(struct mei_device *dev) 
static int mei_me_hw_ready_wait(struct mei_device *dev)

static int mei_me_hw_ready_wait(struct mei_device *dev)

{

{

	int err;

	int err;

	if (mei_me_hw_is_ready(dev))

		return 0;





	dev->recvd_hw_ready = false;

	mutex_unlock(&dev->device_lock);

	mutex_unlock(&dev->device_lock);

	err = wait_event_interruptible_timeout(dev->wait_hw_ready,

	err = wait_event_interruptible_timeout(dev->wait_hw_ready,

			dev->recvd_hw_ready,

			dev->recvd_hw_ready,