Patch "platform/x86: intel_scu_ipc: Check status after timeout in busy_loop()" has been added to the 6.5-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    platform/x86: intel_scu_ipc: Check status after timeout in busy_loop()

to the 6.5-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     platform-x86-intel_scu_ipc-check-status-after-timeou.patch
and it can be found in the queue-6.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 4be162ffa9a59f11844ccbdd2f7da0aeb8584f6f
Author: Stephen Boyd <swboyd@xxxxxxxxxxxx>
Date:   Wed Sep 13 14:27:19 2023 -0700

    platform/x86: intel_scu_ipc: Check status after timeout in busy_loop()
    
    [ Upstream commit e0b4ab3bb92bda8d12f55842614362989d5b2cb3 ]
    
    It's possible for the polling loop in busy_loop() to get scheduled away
    for a long time.
    
      status = ipc_read_status(scu); // status = IPC_STATUS_BUSY
      <long time scheduled away>
      if (!(status & IPC_STATUS_BUSY))
    
    If this happens, then the status bit could change while the task is
    scheduled away and this function would never read the status again after
    timing out. Instead, the function will return -ETIMEDOUT when it's
    possible that scheduling didn't work out and the status bit was cleared.
    Bit polling code should always check the bit being polled one more time
    after the timeout in case this happens.
    
    Fix this by reading the status once more after the while loop breaks.
    The readl_poll_timeout() macro implements all of this, and it is
    shorter, so use that macro here to consolidate code and fix this.
    
    There were some concerns with using readl_poll_timeout() because it uses
    timekeeping, and timekeeping isn't running early on or during the late
    stages of system suspend or early stages of system resume, but an audit
    of the code concluded that this code isn't called during those times so
    it is safe to use the macro.
    
    Cc: Prashant Malani <pmalani@xxxxxxxxxxxx>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
    Reviewed-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
    Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@xxxxxxxxxxxxxxx>
    Fixes: e7b7ab3847c9 ("platform/x86: intel_scu_ipc: Sleeping is fine when polling")
    Signed-off-by: Stephen Boyd <swboyd@xxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230913212723.3055315-2-swboyd@xxxxxxxxxxxx
    Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
    Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 6851d10d65825..4c774ee8bb1bb 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/iopoll.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 
@@ -231,19 +232,15 @@ static inline u32 ipc_data_readl(struct intel_scu_ipc_dev *scu, u32 offset)
 /* Wait till scu status is busy */
 static inline int busy_loop(struct intel_scu_ipc_dev *scu)
 {
-	unsigned long end = jiffies + IPC_TIMEOUT;
-
-	do {
-		u32 status;
-
-		status = ipc_read_status(scu);
-		if (!(status & IPC_STATUS_BUSY))
-			return (status & IPC_STATUS_ERR) ? -EIO : 0;
+	u8 status;
+	int err;
 
-		usleep_range(50, 100);
-	} while (time_before(jiffies, end));
+	err = readx_poll_timeout(ipc_read_status, scu, status, !(status & IPC_STATUS_BUSY),
+				 100, jiffies_to_usecs(IPC_TIMEOUT));
+	if (err)
+		return err;
 
-	return -ETIMEDOUT;
+	return (status & IPC_STATUS_ERR) ? -EIO : 0;
 }
 
 /* Wait till ipc ioc interrupt is received or timeout in 10 HZ */



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux