mei: vsc: Don't use sleeping condition in wait_event_timeout()

[ Upstream commit b8b19acfafdeacbedd4e2795cb18c81c4d8bb6cc ]

vsc_tp_wakeup_request() called wait_event_timeout() with
gpiod_get_value_cansleep() which may sleep, and does so as the
implementation is that of gpio-ljca.

Move the GPIO state check outside the call.

Fixes: 566f5ca97680 ("mei: Add transport driver for IVSC device")
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-and-Reviewed-by: Wentong Wu <wentong.wu@intel.com>
Link: https://lore.kernel.org/r/20240219195807.517742-3-sakari.ailus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c
index 0e623700c3b0ea453d71fb77f3331cef43da0271..682c62c635b636275ce020e066a40506e5645841 100644 (file)
--- a/drivers/misc/mei/vsc-tp.c
+++ b/drivers/misc/mei/vsc-tp.c
@@ -25,7 +25,8 @@
 #define VSC_TP_ROM_BOOTUP_DELAY_MS             10
 #define VSC_TP_ROM_XFER_POLL_TIMEOUT_US                (500 * USEC_PER_MSEC)
 #define VSC_TP_ROM_XFER_POLL_DELAY_US          (20 * USEC_PER_MSEC)
-#define VSC_TP_WAIT_FW_ASSERTED_TIMEOUT                (2 * HZ)
+#define VSC_TP_WAIT_FW_POLL_TIMEOUT            (2 * HZ)
+#define VSC_TP_WAIT_FW_POLL_DELAY_US           (20 * USEC_PER_MSEC)
 #define VSC_TP_MAX_XFER_COUNT                  5
 
 #define VSC_TP_PACKET_SYNC                     0x31
@@ -101,13 +102,15 @@ static int vsc_tp_wakeup_request(struct vsc_tp *tp)
        gpiod_set_value_cansleep(tp->wakeupfw, 0);
 
        ret = wait_event_timeout(tp->xfer_wait,
-                                atomic_read(&tp->assert_cnt) &&
-                                gpiod_get_value_cansleep(tp->wakeuphost),
-                                VSC_TP_WAIT_FW_ASSERTED_TIMEOUT);
+                                atomic_read(&tp->assert_cnt),
+                                VSC_TP_WAIT_FW_POLL_TIMEOUT);
        if (!ret)
                return -ETIMEDOUT;
 
-       return 0;
+       return read_poll_timeout(gpiod_get_value_cansleep, ret, ret,
+                                VSC_TP_WAIT_FW_POLL_DELAY_US,
+                                VSC_TP_WAIT_FW_POLL_TIMEOUT, false,
+                                tp->wakeuphost);
 }
 
 static void vsc_tp_wakeup_release(struct vsc_tp *tp)