Merge tag 'char-misc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / misc / mei / vsc-tp.c

diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c
index 55f7db490d3bbbabd08b7bd2ba6ff078abb93ad6..ecfb70cd057ca01eb33e544ef242ab1aee2cd25a 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)
@@ -416,8 +419,6 @@ static irqreturn_t vsc_tp_isr(int irq, void *data)
 
        atomic_inc(&tp->assert_cnt);
 
-       wake_up(&tp->xfer_wait);
-
        return IRQ_WAKE_THREAD;
 }
 
@@ -425,6 +426,8 @@ static irqreturn_t vsc_tp_thread_isr(int irq, void *data)
 {
        struct vsc_tp *tp = data;
 
+       wake_up(&tp->xfer_wait);
+
        if (tp->event_notify)
                tp->event_notify(tp->event_notify_context);
 
@@ -442,11 +445,16 @@ static int vsc_tp_match_any(struct acpi_device *adev, void *data)
 
 static int vsc_tp_probe(struct spi_device *spi)
 {
-       struct platform_device_info pinfo = { 0 };
+       struct vsc_tp *tp;
+       struct platform_device_info pinfo = {
+               .name = "intel_vsc",
+               .data = &tp,
+               .size_data = sizeof(tp),
+               .id = PLATFORM_DEVID_NONE,
+       };
        struct device *dev = &spi->dev;
        struct platform_device *pdev;
        struct acpi_device *adev;
-       struct vsc_tp *tp;
        int ret;
 
        tp = devm_kzalloc(dev, sizeof(*tp), GFP_KERNEL);
@@ -498,13 +506,8 @@ static int vsc_tp_probe(struct spi_device *spi)
                ret = -ENODEV;
                goto err_destroy_lock;
        }
-       pinfo.fwnode = acpi_fwnode_handle(adev);
-
-       pinfo.name = "intel_vsc";
-       pinfo.data = &tp;
-       pinfo.size_data = sizeof(tp);
-       pinfo.id = PLATFORM_DEVID_NONE;
 
+       pinfo.fwnode = acpi_fwnode_handle(adev);
        pdev = platform_device_register_full(&pinfo);
        if (IS_ERR(pdev)) {
                ret = PTR_ERR(pdev);