Unverified Commit 3400afcf authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-codec: add helpers to suspend and resume cmd_io 



No functionality change, code move to have better split between
HDaudio codec management and core parts.

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


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

sound/soc/sof/intel/hda-codec.c

+21 −0
Original line number Diff line number Diff line
@@ -269,6 +269,16 @@ void hda_codec_init_cmd_io(struct snd_sof_dev *sdev) 
}

EXPORT_SYMBOL_NS_GPL(hda_codec_init_cmd_io, SND_SOC_SOF_HDA_AUDIO_CODEC);



void hda_codec_resume_cmd_io(struct snd_sof_dev *sdev)

{

	struct hdac_bus *bus = sof_to_bus(sdev);



	/* set up CORB/RIRB buffers if was on before suspend */

	if (bus->cmd_dma_state)

		snd_hdac_bus_init_cmd_io(bus);

}

EXPORT_SYMBOL_NS_GPL(hda_codec_resume_cmd_io, SND_SOC_SOF_HDA_AUDIO_CODEC);



void hda_codec_stop_cmd_io(struct snd_sof_dev *sdev)

{

	struct hdac_bus *bus = sof_to_bus(sdev);
@@ -278,6 +288,17 @@ void hda_codec_stop_cmd_io(struct snd_sof_dev *sdev) 
}

EXPORT_SYMBOL_NS_GPL(hda_codec_stop_cmd_io, SND_SOC_SOF_HDA_AUDIO_CODEC);



void hda_codec_suspend_cmd_io(struct snd_sof_dev *sdev)

{

	struct hdac_bus *bus = sof_to_bus(sdev);



	/* stop the CORB/RIRB DMA if it is On */

	if (bus->cmd_dma_state)

		snd_hdac_bus_stop_cmd_io(bus);



}

EXPORT_SYMBOL_NS_GPL(hda_codec_suspend_cmd_io, SND_SOC_SOF_HDA_AUDIO_CODEC);



void hda_codec_rirb_status_clear(struct snd_sof_dev *sdev)

{

	struct hdac_bus *bus = sof_to_bus(sdev);

sound/soc/sof/intel/hda-dsp.c

+4 −6
Original line number Diff line number Diff line
@@ -745,11 +745,10 @@ int hda_dsp_resume(struct snd_sof_dev *sdev) 
				}

			}

		}

#endif



		/* set up CORB/RIRB buffers if was on before suspend */

		if (bus->cmd_dma_state)

			snd_hdac_bus_init_cmd_io(bus);

#endif

		hda_codec_resume_cmd_io(sdev);



		/* Set DSP power state */

		ret = snd_sof_dsp_set_power_state(sdev, &target_state);
@@ -858,11 +857,10 @@ int hda_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state) 
						HDA_VS_INTEL_EM2_L1SEN,

						HDA_VS_INTEL_EM2_L1SEN);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

		/* stop the CORB/RIRB DMA if it is On */

		if (bus->cmd_dma_state)

			snd_hdac_bus_stop_cmd_io(bus);

		hda_codec_suspend_cmd_io(sdev);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

		/* no link can be powered in s0ix state */

		ret = snd_hdac_ext_bus_link_power_down_all(bus);

		if (ret < 0) {

sound/soc/sof/intel/hda.h

+4 −0
Original line number Diff line number Diff line
@@ -719,7 +719,9 @@ void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev, bool enable); 
void hda_codec_jack_check(struct snd_sof_dev *sdev);

void hda_codec_check_for_state_change(struct snd_sof_dev *sdev);

void hda_codec_init_cmd_io(struct snd_sof_dev *sdev);

void hda_codec_resume_cmd_io(struct snd_sof_dev *sdev);

void hda_codec_stop_cmd_io(struct snd_sof_dev *sdev);

void hda_codec_suspend_cmd_io(struct snd_sof_dev *sdev);

void hda_codec_detect_mask(struct snd_sof_dev *sdev);

void hda_codec_rirb_status_clear(struct snd_sof_dev *sdev);

bool hda_codec_check_rirb_status(struct snd_sof_dev *sdev);
@@ -733,7 +735,9 @@ static inline void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev, bool ena 
static inline void hda_codec_jack_check(struct snd_sof_dev *sdev) { }

static inline void hda_codec_check_for_state_change(struct snd_sof_dev *sdev) { }

static inline void hda_codec_init_cmd_io(struct snd_sof_dev *sdev) { }

static inline void hda_codec_resume_cmd_io(struct snd_sof_dev *sdev) { }

static inline void hda_codec_stop_cmd_io(struct snd_sof_dev *sdev) { }

static inline void hda_codec_suspend_cmd_io(struct snd_sof_dev *sdev) { }

static inline void hda_codec_detect_mask(struct snd_sof_dev *sdev) { }

static inline void hda_codec_rirb_status_clear(struct snd_sof_dev *sdev) { }

static inline bool hda_codec_check_rirb_status(struct snd_sof_dev *sdev) { return false; }