Skip to content

Commit e0f9624

Browse files
ranj063broonie
authored andcommitted
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: thesofproject#4565 Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: https://lore.kernel.org/r/20230915134153.9688-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent c923e77 commit e0f9624

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

sound/soc/sof/intel/mtl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ int mtl_dsp_cl_init(struct snd_sof_dev *sdev, int stream_tag, bool imr_boot)
460460
/* step 3: wait for IPC DONE bit from ROM */
461461
ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, chip->ipc_ack, status,
462462
((status & chip->ipc_ack_mask) == chip->ipc_ack_mask),
463-
HDA_DSP_REG_POLL_INTERVAL_US, MTL_DSP_PURGE_TIMEOUT_US);
463+
HDA_DSP_REG_POLL_INTERVAL_US, HDA_DSP_INIT_TIMEOUT_US);
464464
if (ret < 0) {
465465
if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS)
466466
dev_err(sdev->dev, "timeout waiting for purge IPC done\n");

sound/soc/sof/intel/mtl.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
#define MTL_DSP_IRQSTS_IPC BIT(0)
6363
#define MTL_DSP_IRQSTS_SDW BIT(6)
6464

65-
#define MTL_DSP_PURGE_TIMEOUT_US 20000000 /* 20s */
6665
#define MTL_DSP_REG_POLL_INTERVAL_US 10 /* 10 us */
6766

6867
/* Memory windows */

0 commit comments

Comments
 (0)