ASoC: SOF: Intel: only detect codecs when HDA DSP probe
Subsystems (3)
Peter Ujfalusi
maintainercover ASoC: SOF: Intel: only detect codecs when HDA DSP probe
Hi,
SDW codecs use the global HDaudio WAKEEN/STS to detect wakes since LNL. But the wakeen is handled in the SDW driver. We should filter the bus->codec_mask to only include HDA and IDISP codecs to avoid clearing the wakeen status before it is handled.
Regards,
Peter
---
Bard Liao (2):
ASoC: SOF: Intel: split codec mask detect and programming UNSOL
ASoC: SOF: Intel: only detect codecs when HDA DSP probe
sound/soc/sof/intel/hda-codec.c | 3 --- sound/soc/sof/intel/hda-ctrl.c | 8 ++++++-- sound/soc/sof/intel/hda-dsp.c | 2 +- sound/soc/sof/intel/hda.c | 2 +- sound/soc/sof/intel/hda.h | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-)
Signature · 1 line
2.50.1
Peter Ujfalusi
maintainerPATCH 1/2 ASoC: SOF: Intel: split codec mask detect and programming UNSOL
From: Bard Liao <[email protected]>
We only need to detect codec mask in probe, but need to program UNSOL in probe and resume. We will detect codec mask and program UNSOL separately in the follow up commit.
--- sound/soc/sof/intel/hda-codec.c | 3 --- sound/soc/sof/intel/hda-ctrl.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/sof/intel/hda-codec.c +0 -3
@@ -260,9 +260,6 @@ void hda_codec_detect_mask(struct snd_sof_dev *sdev) sof_debug_check_flag(SOF_DBG_FORCE_NOCODEC)) return; -/* Accept unsolicited responses */ -snd_hdac_chip_updatel (bus,GCTL ,AZX_GCTL_UNSOL ,AZX_GCTL_UNSOL ); -/* detect codecs */ if (!bus->codec_mask) { bus->codec_mask =snd_hdac_chip_readw (bus,STATESTS );
sound/soc/sof/intel/hda-ctrl.c +3 -0
@@ -220,6 +220,9 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev) }usleep_range (1000 ,1200 ); +/* Accept unsolicited responses */ +snd_hdac_chip_updatel (bus,GCTL ,AZX_GCTL_UNSOL ,AZX_GCTL_UNSOL ); +hda_codec_detect_mask (sdev);/* clear stream status */
Signature · 1 line
2.50.1
Peter Ujfalusi
maintainerPATCH 2/2 ASoC: SOF: Intel: only detect codecs when HDA DSP probe
In reply to Peter UjfalusiFrom: Bard Liao <[email protected]>
SDW codecs use the global HDaudio WAKEEN/STS to detect wakes since LNL. But the wake event is handled in the SDW driver. We should only clear WAKESTS for the HDA and IDISP codecs that was detected when HDA DSP probe. The SoundWire codec will be included in the codec_mask if we read the STATESTS register when a SoundWire codec wake event happens. The commit avoid updating bus->codec_mask in resume to not clear WAKESTS of SoundWire codecs.
--- sound/soc/sof/intel/hda-ctrl.c | 5 +++-- sound/soc/sof/intel/hda-dsp.c | 2 +- sound/soc/sof/intel/hda.c | 2 +- sound/soc/sof/intel/hda.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-)
sound/soc/sof/intel/hda-ctrl.c +3 -2
@@ -183,7 +183,7 @@ int hda_dsp_ctrl_clock_power_gating(struct snd_sof_dev *sdev, bool enable) }EXPORT_SYMBOL_NS (hda_dsp_ctrl_clock_power_gating,"SND_SOC_SOF_INTEL_HDA_COMMON" ); -int hda_dsp_ctrl_init_chip (struct snd_sof_dev *sdev) +int hda_dsp_ctrl_init_chip (struct snd_sof_dev *sdev,bool detect_codec) {struct hdac_bus *bus =sof_to_bus (sdev);struct hdac_stream *stream;
@@ -223,7 +223,8 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev)/* Accept unsolicited responses */ snd_hdac_chip_updatel (bus,GCTL ,AZX_GCTL_UNSOL ,AZX_GCTL_UNSOL ); -hda_codec_detect_mask (sdev); +if (detect_codec) +hda_codec_detect_mask (sdev);/* clear stream status */ list_for_each_entry (stream, &bus->stream_list, list) {
sound/soc/sof/intel/hda-dsp.c +1 -1
@@ -870,7 +870,7 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume)snd_sof_pci_update_bits (sdev,PCI_TCSEL ,0x07 ,0 );/* reset and start hda controller */ - ret =hda_dsp_ctrl_init_chip (sdev); + ret =hda_dsp_ctrl_init_chip (sdev, false);if (ret <0 ) {dev_err (sdev->dev,"error: failed to start controller after resume\n" );
sound/soc/sof/intel/hda.c +1 -1
@@ -616,7 +616,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)dev_dbg (sdev->dev,"PP capability, will probe DSP later.\n" );/* Init HDA controller after i915 init */ - ret =hda_dsp_ctrl_init_chip (sdev); + ret =hda_dsp_ctrl_init_chip (sdev, true);if (ret <0 ) {dev_err (bus->dev,"error: init chip failed with ret: %d\n" , ret);
sound/soc/sof/intel/hda.h +1 -1
@@ -757,7 +757,7 @@ void hda_dsp_ctrl_ppcap_int_enable(struct snd_sof_dev *sdev, bool enable);int hda_dsp_ctrl_link_reset (struct snd_sof_dev *sdev,bool reset);void hda_dsp_ctrl_misc_clock_gating (struct snd_sof_dev *sdev,bool enable);int hda_dsp_ctrl_clock_power_gating (struct snd_sof_dev *sdev,bool enable); -int hda_dsp_ctrl_init_chip (struct snd_sof_dev *sdev); +int hda_dsp_ctrl_init_chip (struct snd_sof_dev *sdev,bool detect_codec);void hda_dsp_ctrl_stop_chip (struct snd_sof_dev *sdev);/* * HDA bus operations.
Signature · 1 line
2.50.1
Mark Brown
maintainerQuoted 9 lines · Peter Ujfalusi
SDW codecs use the global HDaudio WAKEEN/STS to detect wakes since LNL. But the wakeen is handled in the SDW driver. We should filter the
bus->codec_maskto only include HDA and IDISP codecs to avoid clearing the wakeen status before it is handled.Regards,
Peter[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: SOF: Intel: split codec mask detect and programming UNSOL
commit: 6158a321c051095024e8306c8996b79e5f7f79b6
[2/2] ASoC: SOF: Intel: only detect codecs when HDA DSP probe
commit: 5c39bc498f5ff7ef016abf3f16698f3e8db79677All 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