[PATCH 23/29][SRU][OEM-5.14] UBUNTU: SAUCE: mei-vsc: switch wait event to uninterruptible

You-Sheng Yang vicamo.yang at canonical.com
Tue Dec 28 06:19:49 UTC 2021


From: Ye Xiang <xiang.ye at intel.com>

BugLink: https://bugs.launchpad.net/bugs/1955383

Change wakeup ack wait queue to uninterruptible to avoid
unexpected signal interrupt normal hardware transaction.

Signed-off-by: Ye Xiang <xiang.ye at intel.com>
(cherry picked from
https://github.com/intel/ivsc-driver/commit/c130eb32d87f76974dd2a47d320a6e7ee26cc880)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
 drivers/misc/mei/hw-vsc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/mei/hw-vsc.c b/drivers/misc/mei/hw-vsc.c
index 9a9965962dc7..d9a22de48532 100644
--- a/drivers/misc/mei/hw-vsc.c
+++ b/drivers/misc/mei/hw-vsc.c
@@ -97,8 +97,8 @@ static bool spi_need_read(struct mei_vsc_hw *hw)
 #define WAIT_FW_ASSERTED_TIMEOUT (2 * HZ)
 static int spi_xfer_wait_asserted(struct mei_vsc_hw *hw)
 {
-	wait_event_interruptible_timeout(hw->xfer_wait, spi_xfer_asserted(hw),
-					 WAIT_FW_ASSERTED_TIMEOUT);
+	wait_event_timeout(hw->xfer_wait, spi_xfer_asserted(hw),
+			   WAIT_FW_ASSERTED_TIMEOUT);
 
 	dev_dbg(&hw->spi->dev, "%s %d %d %d\n", __func__,
 		atomic_read(&hw->lock_cnt),
-- 
2.33.1




More information about the kernel-team mailing list