]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
UBUNTU: SAUCE: mei-vsc: switch wait event to uninterruptible
authorYe Xiang <xiang.ye@intel.com>
Wed, 10 Nov 2021 02:23:17 +0000 (10:23 +0800)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Tue, 31 May 2022 16:26:28 +0000 (18:26 +0200)
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@intel.com>
(cherry picked from commit c130eb32d87f76974dd2a47d320a6e7ee26cc880 github.com/intel/ivsc-driver)
Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
Acked-by: Andrea Righi <andrea.righi@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/misc/mei/hw-vsc.c

index 9a9965962dc77cee8cbefaadc99dcf631af35e5f..d9a22de485321fcf5e6569710a5019ecab75d5a0 100644 (file)
@@ -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),