Unverified Commit e0f96246 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Intel: MTL: Reduce the DSP init timeout 

20s seems unnecessarily large for the DSP init timeout. This coupled with
multiple FW boot attempts causes an excessive delay in the error path when
booting in recovery mode. Reduce it to 0.5s and use the existing
HDA_DSP_INIT_TIMEOUT_US.

Link: https://github.com/thesofproject/linux/issues/4565


Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230915134153.9688-1-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/intel/mtl.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ int mtl_dsp_cl_init(struct snd_sof_dev *sdev, int stream_tag, bool imr_boot) 
	/* step 3: wait for IPC DONE bit from ROM */

	ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, chip->ipc_ack, status,

					    ((status & chip->ipc_ack_mask) == chip->ipc_ack_mask),

					    HDA_DSP_REG_POLL_INTERVAL_US, MTL_DSP_PURGE_TIMEOUT_US);

					    HDA_DSP_REG_POLL_INTERVAL_US, HDA_DSP_INIT_TIMEOUT_US);

	if (ret < 0) {

		if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS)

			dev_err(sdev->dev, "timeout waiting for purge IPC done\n");

sound/soc/sof/intel/mtl.h

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ 
#define MTL_DSP_IRQSTS_IPC		BIT(0)

#define MTL_DSP_IRQSTS_SDW		BIT(6)



#define MTL_DSP_PURGE_TIMEOUT_US	20000000 /* 20s */

#define MTL_DSP_REG_POLL_INTERVAL_US	10	/* 10 us */



/* Memory windows */