Unverified Commit 4bf77dfa authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Mark Brown
Browse files

ASoC: renesas: rz-ssi: Use readl_poll_timeout_atomic() 



Use readl_poll_timeout_atomic() instead of hardcoding something similar.
While at it replace dev_info() with dev_warn_ratelimited() as the
rz_ssi_set_idle() can also be called from IRQ context and if the SSI
idle is not properly set this is at least a warning for user.

Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Link: https://patch.msgid.link/20241210170953.2936724-11-claudiu.beznea.uj@bp.renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 109e6086

sound/soc/renesas/rz-ssi.c

+6 −10
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/clk.h>

#include <linux/dmaengine.h>

#include <linux/io.h>

#include <linux/iopoll.h>

#include <linux/module.h>

#include <linux/pm_runtime.h>

#include <linux/reset.h>
@@ -307,7 +308,8 @@ static int rz_ssi_clk_setup(struct rz_ssi_priv *ssi, unsigned int rate, 


static void rz_ssi_set_idle(struct rz_ssi_priv *ssi)

{

	int timeout;

	u32 tmp;

	int ret;



	/* Disable irqs */

	rz_ssi_reg_mask_setl(ssi, SSICR, SSICR_TUIEN | SSICR_TOIEN |
@@ -320,15 +322,9 @@ static void rz_ssi_set_idle(struct rz_ssi_priv *ssi) 
			      SSISR_RUIRQ), 0);



	/* Wait for idle */

	timeout = 100;

	while (--timeout) {

		if (rz_ssi_reg_readl(ssi, SSISR) & SSISR_IIRQ)

			break;

		udelay(1);

	}



	if (!timeout)

		dev_info(ssi->dev, "timeout waiting for SSI idle\n");

	ret = readl_poll_timeout_atomic(ssi->base + SSISR, tmp, (tmp & SSISR_IIRQ), 1, 100);

	if (ret)

		dev_warn_ratelimited(ssi->dev, "timeout waiting for SSI idle\n");



	/* Hold FIFOs in reset */

	rz_ssi_reg_mask_setl(ssi, SSIFCR, 0, SSIFCR_FIFO_RST);