diff mbox series

ASoC: SOF: Intel: hda-ctrl: re-add sleep after entering and exiting reset

Message ID 20230307095412.3416-1-peter.ujfalusi@linux.intel.com (mailing list archive)
State Accepted
Commit 8bac40b8ed17ab1be9133e9620f65fae80262b7e
Headers show
Series ASoC: SOF: Intel: hda-ctrl: re-add sleep after entering and exiting reset | expand

Commit Message

Peter Ujfalusi March 7, 2023, 9:54 a.m. UTC 
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

This reverts commit a09d82ce0a867 ("ASoC: SOF: Intel: hda-ctrl: remove
useless sleep")

It was a mistake to remove those delays, in light of comments in the
HDaudio spec captured in snd_hdac_bus_reset_link() that the codec
needs time for its initialization and PLL lock.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
---
 sound/soc/sof/intel/hda-ctrl.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Mark Brown March 8, 2023, 1:52 p.m. UTC | #1 
On Tue, 07 Mar 2023 11:54:12 +0200, Peter Ujfalusi wrote:
> This reverts commit a09d82ce0a867 ("ASoC: SOF: Intel: hda-ctrl: remove
> useless sleep")
> 
> It was a mistake to remove those delays, in light of comments in the
> HDaudio spec captured in snd_hdac_bus_reset_link() that the codec
> needs time for its initialization and PLL lock.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: SOF: Intel: hda-ctrl: re-add sleep after entering and exiting reset
      commit: 8bac40b8ed17ab1be9133e9620f65fae80262b7e

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/sof/intel/hda-ctrl.c b/sound/soc/sof/intel/hda-ctrl.c
index a1037512da1f..e1dba6b79065 100644
--- a/sound/soc/sof/intel/hda-ctrl.c
+++ b/sound/soc/sof/intel/hda-ctrl.c
@@ -198,12 +198,15 @@  int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev)
 		goto err;
 	}
 
+	usleep_range(500, 1000);
+
 	/* exit HDA controller reset */
 	ret = hda_dsp_ctrl_link_reset(sdev, false);
 	if (ret < 0) {
 		dev_err(sdev->dev, "error: failed to exit HDA controller reset\n");
 		goto err;
 	}
+	usleep_range(1000, 1200);
 
 	hda_codec_detect_mask(sdev);