ASoC: SOF: Intel: Split the set_power_op for IPC3 and IPC4
Subsystems (3)
Peter Ujfalusi
maintainerPATCH 1/1 ASoC: SOF: Intel: Split the set_power_op for IPC3 and IPC4
From: Ranjani Sridharan <[email protected]>
Suspending to S0iX with IPC3 requires the PM_GATE IPC to be sent again to stop the DMA trace. But with IPC4, this is not needed as the trace is stopped with the LARGE_CONFIG_SET IPC. Also, sending the MOD_D0IX IPC to set the D0I3 state again when the DSP is in D0I3 already results in an imbalance in PM runtime states in the firmware. So split the set_power_state ops for IPC3 and IPC4 to avoid sending the MOD_D0IX IPC when the DSP is already in D0I3 with IPC4.
---
Mark,
last minute patch for 6.4 as the issue this patch addressing was discovered and fixed recently for IPC4.
Regards,
Peter
sound/soc/sof/intel/apl.c | 4 ++ sound/soc/sof/intel/cnl.c | 4 ++ sound/soc/sof/intel/hda-common-ops.c | 1 - sound/soc/sof/intel/hda-dsp.c | 60 ++++++++++++++++++---------- sound/soc/sof/intel/hda.h | 6 ++- sound/soc/sof/intel/icl.c | 4 ++ sound/soc/sof/intel/mtl.c | 2 + sound/soc/sof/intel/tgl.c | 4 ++ 8 files changed, 60 insertions(+), 25 deletions(-)
sound/soc/sof/intel/apl.c +4 -0
@@ -48,6 +48,8 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev)/* debug */ sof_apl_ops.ipc_dump = hda_ipc_dump; + + sof_apl_ops.set_power_state = hda_dsp_set_power_state_ipc3; }if (sdev->pdata->ipc_type ==SOF_INTEL_IPC4 ) {
@@ -73,6 +75,8 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev)/* debug */ sof_apl_ops.ipc_dump = hda_ipc4_dump; + + sof_apl_ops.set_power_state = hda_dsp_set_power_state_ipc4; }/* set DAI driver ops */
sound/soc/sof/intel/cnl.c +4 -0
@@ -395,6 +395,8 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)/* debug */ sof_cnl_ops.ipc_dump = cnl_ipc_dump; + + sof_cnl_ops.set_power_state = hda_dsp_set_power_state_ipc3; }if (sdev->pdata->ipc_type ==SOF_INTEL_IPC4 ) {
@@ -420,6 +422,8 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)/* debug */ sof_cnl_ops.ipc_dump = cnl_ipc4_dump; + + sof_cnl_ops.set_power_state = hda_dsp_set_power_state_ipc4; }/* set DAI driver ops */
sound/soc/sof/intel/hda-common-ops.c +0 -1
@@ -89,7 +89,6 @@ struct snd_sof_dsp_ops sof_hda_common_ops = { .runtime_resume = hda_dsp_runtime_resume, .runtime_idle = hda_dsp_runtime_idle, .set_hw_params_upon_resume = hda_dsp_set_hw_params_upon_resume, - .set_power_state = hda_dsp_set_power_state,/* ALSA HW info flags */ .hw_info = SNDRV_PCM_INFO_MMAP |
sound/soc/sof/intel/hda-dsp.c +38 -22
75 lines not on this page · raw message
sound/soc/sof/intel/hda.h +4 -2
@@ -584,8 +584,10 @@ void hda_dsp_ipc_int_enable(struct snd_sof_dev *sdev);void hda_dsp_ipc_int_disable (struct snd_sof_dev *sdev);bool hda_dsp_core_is_enabled (struct snd_sof_dev *sdev,unsigned int core_mask); -int hda_dsp_set_power_state (struct snd_sof_dev *sdev, -const struct sof_dsp_power_state *target_state); +int hda_dsp_set_power_state_ipc3 (struct snd_sof_dev *sdev, +const struct sof_dsp_power_state *target_state); +int hda_dsp_set_power_state_ipc4 (struct snd_sof_dev *sdev, +const struct sof_dsp_power_state *target_state);int hda_dsp_suspend (struct snd_sof_dev *sdev,u32 target_state);int hda_dsp_resume (struct snd_sof_dev *sdev);
sound/soc/sof/intel/icl.c +4 -0
@@ -116,6 +116,8 @@ int sof_icl_ops_init(struct snd_sof_dev *sdev)/* debug */ sof_icl_ops.ipc_dump = cnl_ipc_dump; + + sof_icl_ops.set_power_state = hda_dsp_set_power_state_ipc3; }if (sdev->pdata->ipc_type ==SOF_INTEL_IPC4 ) {
@@ -141,6 +143,8 @@ int sof_icl_ops_init(struct snd_sof_dev *sdev)/* debug */ sof_icl_ops.ipc_dump = cnl_ipc4_dump; + + sof_icl_ops.set_power_state = hda_dsp_set_power_state_ipc4; }/* debug */
sound/soc/sof/intel/mtl.c +2 -0
@@ -668,6 +668,8 @@ int sof_mtl_ops_init(struct snd_sof_dev *sdev)/* set DAI ops */ hda_set_dai_drv_ops (sdev, &sof_mtl_ops); + sof_mtl_ops.set_power_state = hda_dsp_set_power_state_ipc4; +return 0 ; };EXPORT_SYMBOL_NS (sof_mtl_ops_init,SND_SOC_SOF_INTEL_HDA_COMMON );
sound/soc/sof/intel/tgl.c +4 -0
@@ -71,6 +71,8 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev)/* debug */ sof_tgl_ops.ipc_dump = cnl_ipc_dump; + + sof_tgl_ops.set_power_state = hda_dsp_set_power_state_ipc3; }if (sdev->pdata->ipc_type ==SOF_INTEL_IPC4 ) {
@@ -96,6 +98,8 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev)/* debug */ sof_tgl_ops.ipc_dump = cnl_ipc4_dump; + + sof_tgl_ops.set_power_state = hda_dsp_set_power_state_ipc4; }/* set DAI driver ops */
Signature · 1 line
2.40.0
Mark Brown
maintainerQuoted 9 lines · Peter Ujfalusi
Suspending to S0iX with IPC3 requires the
PM_GATEIPC to be sent again to stop the DMA trace. But with IPC4, this is not needed as the trace is stopped with theLARGE_CONFIG_SETIPC. Also, sending theMOD_D0IXIPC to set the D0I3 state again when the DSP is in D0I3 already results in an imbalance in PM runtime states in the firmware. So split theset_power_stateops for IPC3 and IPC4 to avoid sending theMOD_D0IXIPC when the DSP is already in D0I3 with IPC4.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: SOF: Intel: Split the set_power_op for IPC3 and IPC4
commit: 996b07efe49620325332081afdb0dc0bd6fe5cd0
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