Unverified Commit 7d6f623c authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: pcm: Make hw_params reset conditional for IPC3 



In the case of IPC4, since there is no PCM_PARAMS IPC to send the new
stream tag when restarting a stream without a hw_free, the original
stream tag needs to be preserved. So, add new a flag as part of struct
sof_ipc_pcm_ops, reset_hw_params_during_stop and set it only for IPC3.
This will ensure that the host DMA stream tag will not be given up during
the STOP trigger for IPC4.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-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>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230322094346.6019-3-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/ipc3-pcm.c

+1 −0
Original line number Diff line number Diff line
@@ -382,4 +382,5 @@ const struct sof_ipc_pcm_ops ipc3_pcm_ops = { 
	.hw_free = sof_ipc3_pcm_hw_free,

	.trigger = sof_ipc3_pcm_trigger,

	.dai_link_fixup = sof_ipc3_pcm_dai_link_fixup,

	.reset_hw_params_during_stop = true,

};

sound/soc/sof/pcm.c

+2 −1
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ static int sof_pcm_trigger(struct snd_soc_component *component, 
		fallthrough;

	case SNDRV_PCM_TRIGGER_STOP:

		ipc_first = true;

		if (pcm_ops && pcm_ops->reset_hw_params_during_stop)

			reset_hw_params = true;

		break;

	default:

sound/soc/sof/sof-audio.h

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ struct snd_sof_dai_config_data { 
 * @pcm_free: Function pointer for PCM free that can be used for freeing any

 *	       additional memory in the SOF PCM stream structure

 * @delay: Function pointer for pcm delay calculation

 * @reset_hw_params_during_stop: Flag indicating whether the hw_params should be reset during the

 *				 STOP pcm trigger

 */

struct sof_ipc_pcm_ops {

	int (*hw_params)(struct snd_soc_component *component, struct snd_pcm_substream *substream,
@@ -117,6 +119,7 @@ struct sof_ipc_pcm_ops { 
	void (*pcm_free)(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm);

	snd_pcm_sframes_t (*delay)(struct snd_soc_component *component,

				   struct snd_pcm_substream *substream);

	bool reset_hw_params_during_stop;

};



/**