diff options
| author | Georgi Vlaev <g-vlaev@ti.com> | 2022-10-21 21:57:04 +0300 |
|---|---|---|
| committer | Nishanth Menon <nm@ti.com> | 2022-10-28 16:20:18 +0300 |
| commit | b13b2c3e0e4d0854228b5217fa34e145f3ace8ac (patch) | |
| tree | 8a85af1f211e1e974e95e0913396a42604e53486 | |
| parent | 4dc3883203736dcd979672ac8d9f086dbd4d2140 (diff) | |
| download | linux-b13b2c3e0e4d0854228b5217fa34e145f3ace8ac.tar.xz | |
firmware: ti_sci: Fix polled mode during system suspend
Commit b9e8a7d950ff ("firmware: ti_sci: Switch transport to polled
mode during system suspend") uses read_poll_timeout_atomic() macro
in ti_sci_do_xfer() to wait for completion when the system is
suspending. The break condition of the macro is set to "true" which
will cause it break immediately when evaluated, likely before the
TISCI xfer is completed, and always return 0. We want to poll here
until "done_state == true".
1) Change the break condition of read_poll_timeout_atomic() to
the bool variable "done_state".
2) The read_poll_timeout_atomic() returns 0 if the break condition
is met or -ETIMEDOUT if not. Since our break condition has changed
to "done_state", we also don't have to check for "!done_state" when
evaluating the return value.
Fixes: b9e8a7d950ff ("firmware: ti_sci: Switch transport to polled mode during system suspend")
Signed-off-by: Georgi Vlaev <g-vlaev@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Link: https://lore.kernel.org/r/20221021185704.181316-1-g-vlaev@ti.com
| -rw-r--r-- | drivers/firmware/ti_sci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 49677533f376..6d2fd0ff7ff3 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -429,15 +429,14 @@ static inline int ti_sci_do_xfer(struct ti_sci_info *info, * during noirq phase, so we must manually poll the completion. */ ret = read_poll_timeout_atomic(try_wait_for_completion, done_state, - true, 1, + done_state, 1, info->desc->max_rx_timeout_ms * 1000, false, &xfer->done); } - if (ret == -ETIMEDOUT || !done_state) { + if (ret == -ETIMEDOUT) dev_err(dev, "Mbox timedout in resp(caller: %pS)\n", (void *)_RET_IP_); - } /* * NOTE: we might prefer not to need the mailbox ticker to manage the |