On Fri, 2020-01-17 at 19:21 +0530, Sibi Sankar wrote:
> Replace the loop for HALT_ACK detection with regmap_read_poll_timeout.
>
> Signed-off-by: Sibi Sankar <sibis@xxxxxxxxxxxxxx>
> ---
> drivers/remoteproc/qcom_q6v5_mss.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
> index 51f451311f5fc..f20b39c6ff0ed 100644
> --- a/drivers/remoteproc/qcom_q6v5_mss.c
> +++ b/drivers/remoteproc/qcom_q6v5_mss.c
> @@ -73,6 +73,7 @@
> #define NAV_AXI_IDLE_BIT BIT(2)
>
> #define HALT_ACK_TIMEOUT_MS 100
> +#define NAV_HALT_ACK_TIMEOUT_US 200
>
> /* QDSP6SS_RESET */
> #define Q6SS_STOP_CORE BIT(0)
> @@ -746,7 +747,6 @@ static void q6v5proc_halt_nav_axi_port(struct q6v5 *qproc,
> struct regmap *halt_map,
> u32 offset)
> {
> - unsigned long timeout;
> unsigned int val;
> int ret;
>
> @@ -760,15 +760,11 @@ static void q6v5proc_halt_nav_axi_port(struct q6v5 *qproc,
> NAV_AXI_HALTREQ_BIT);
>
> /* Wait for halt ack*/
> - timeout = jiffies + msecs_to_jiffies(HALT_ACK_TIMEOUT_MS);
> - for (;;) {
> - ret = regmap_read(halt_map, offset, &val);
> - if (ret || (val & NAV_AXI_HALTACK_BIT) ||
> - time_after(jiffies, timeout))
> - break;
> -
> - udelay(5);
> - }
> + ret = regmap_read_poll_timeout(halt_map, offset, val,
> + (val & NAV_AXI_HALTACK_BIT),
> + 5, NAV_HALT_ACK_TIMEOUT_US);
> + if (ret)
> + dev_err(qproc->dev, "nav halt ack timeout\n");
>
> ret = regmap_read(halt_map, offset, &val);
> if (ret || !(val & NAV_AXI_IDLE_BIT))
Reviewed-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
regards
Philipp
