raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit b8b19acfaf ]

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: 566f5ca976 ("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>
This commit is contained in:
Sakari Ailus
2024-02-19 21:58:06 +02:00
committed by Sasha Levin
parent 76a5e0951a
commit 982f109fb8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/misc/mei/vsc-tp.c
View File

@@ -25,7 +25,8 @@
#define VSC_TP_ROM_BOOTUP_DELAY_MS 10 #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_TIMEOUT_US (500 * USEC_PER_MSEC)
#define VSC_TP_ROM_XFER_POLL_DELAY_US (20 * 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_MAX_XFER_COUNT 5
#define VSC_TP_PACKET_SYNC 0x31 #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); gpiod_set_value_cansleep(tp->wakeupfw, 0);
ret = wait_event_timeout(tp->xfer_wait, ret = wait_event_timeout(tp->xfer_wait,
atomic_read(&tp->assert_cnt) && atomic_read(&tp->assert_cnt),
gpiod_get_value_cansleep(tp->wakeuphost), VSC_TP_WAIT_FW_POLL_TIMEOUT);
VSC_TP_WAIT_FW_ASSERTED_TIMEOUT);
if (!ret) if (!ret)
return -ETIMEDOUT; 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) static void vsc_tp_wakeup_release(struct vsc_tp *tp)