@@ -8,7 +8,7 @@
#include <linux/acpi.h>
#include <linux/delay.h>
-#include <linux/jiffies.h>
+#include <linux/iopoll.h>
#include <linux/module.h>
#include <linux/platform_data/cros_ec_commands.h>
#include <linux/platform_data/cros_ec_proto.h>
@@ -108,7 +108,6 @@ static bool cros_typec_check_event(struct cros_typec_switch_data *sdata, int por
static int cros_typec_configure_mux(struct cros_typec_switch_data *sdata, int port_num, int index,
unsigned long mode, struct typec_altmode *alt)
{
- unsigned long end;
u32 event_mask;
u8 mux_state;
int ret;
@@ -134,18 +133,14 @@ static int cros_typec_configure_mux(struct cros_typec_switch_data *sdata, int po
return ret;
/* Check for the mux set done event. */
- end = jiffies + msecs_to_jiffies(1000);
- do {
- if (cros_typec_check_event(sdata, port_num, event_mask))
- return 0;
+ if (read_poll_timeout(cros_typec_check_event, ret, ret == 0, 1000,
+ 1000 * 1000UL, false, sdata, port_num, event_mask)) {
+ dev_err(sdata->dev, "Timed out waiting for mux set done on index: %d, state: %d\n",
+ index, mux_state);
+ return -ETIMEDOUT;
+ }
- usleep_range(500, 1000);
- } while (time_before(jiffies, end));
-
- dev_err(sdata->dev, "Timed out waiting for mux set done on index: %d, state: %d\n",
- index, mux_state);
-
- return -ETIMEDOUT;
+ return 0;
}
static int cros_typec_mode_switch_set(struct typec_mux_dev *mode_switch,
It's possible for this polling loop to get scheduled away for a long time right after checking the status on the EC. If that happens, we will never try to check the status at least one more time before giving up and saying that it timed out. Let's use the read_poll_timeout() macro to construct the loop with a proper timeout mechanism and the ability to check that the condition is true once more when the timeout hits. Cc: Prashant Malani <pmalani@chromium.org> Cc: Benson Leung <bleung@chromium.org> Cc: Tzung-Bi Shih <tzungbi@kernel.org> Cc: <chrome-platform@lists.linux.dev> Cc: Pin-yen Lin <treapking@chromium.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- drivers/platform/chrome/cros_typec_switch.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)