Unverified Commit 4123c24b authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Introduce IPC3 PCM hw_free op 



Add the IPC3 PCM ops, define the hw_free op and modify all users to use
the op.

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


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

sound/soc/sof/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\

		control.o trace.o iomem-utils.o sof-audio.o stream-ipc.o\

		ipc3-topology.o ipc3.o ipc3-control.o

		ipc3-topology.o ipc3.o ipc3-control.o ipc3-pcm.o

ifneq ($(CONFIG_SND_SOC_SOF_CLIENT),)

snd-sof-objs += sof-client.o

endif

sound/soc/sof/ipc.c

+3 −2
Original line number Diff line number Diff line
@@ -1033,8 +1033,9 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev) 
	ipc->ops = &ipc3_ops;



	/* check for mandatory ops */

	if (!ipc->ops->tplg || !ipc->ops->tplg->widget || !ipc->ops->tplg->control) {

		dev_err(sdev->dev, "Invalid topology IPC ops\n");

	if (!ipc->ops->pcm || !ipc->ops->tplg || !ipc->ops->tplg->widget ||

	    !ipc->ops->tplg->control) {

		dev_err(sdev->dev, "Invalid IPC ops\n");

		return NULL;

	}

sound/soc/sof/ipc3-ops.h

+1 −0
Original line number Diff line number Diff line
@@ -16,5 +16,6 @@ 
extern const struct sof_ipc_tplg_ops ipc3_tplg_ops;

extern const struct sof_ipc_ops ipc3_ops;

extern const struct sof_ipc_tplg_control_ops tplg_ipc3_control_ops;

extern const struct sof_ipc_pcm_ops ipc3_pcm_ops;



#endif

sound/soc/sof/ipc3-pcm.c

0 → 100644
+43 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)

//

// This file is provided under a dual BSD/GPLv2 license.  When using or

// redistributing this file, you may do so under either license.

//

// Copyright(c) 2021 Intel Corporation. All rights reserved.

//

//



#include <sound/pcm_params.h>

#include "ipc3-ops.h"

#include "ops.h"

#include "sof-priv.h"

#include "sof-audio.h"



static int sof_ipc3_pcm_hw_free(struct snd_soc_component *component,

				struct snd_pcm_substream *substream)

{

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct sof_ipc_stream stream;

	struct sof_ipc_reply reply;

	struct snd_sof_pcm *spcm;



	spcm = snd_sof_find_spcm_dai(component, rtd);

	if (!spcm)

		return -EINVAL;



	if (!spcm->prepared[substream->stream])

		return 0;



	stream.hdr.size = sizeof(stream);

	stream.hdr.cmd = SOF_IPC_GLB_STREAM_MSG | SOF_IPC_STREAM_PCM_FREE;

	stream.comp_id = spcm->stream[substream->stream].comp_id;



	/* send IPC to the DSP */

	return sof_ipc_tx_message(sdev->ipc, stream.hdr.cmd, &stream,

				  sizeof(stream), &reply, sizeof(reply));

}



const struct sof_ipc_pcm_ops ipc3_pcm_ops = {

	.hw_free = sof_ipc3_pcm_hw_free,

};

sound/soc/sof/ipc3.c

+1 −0
Original line number Diff line number Diff line
@@ -41,4 +41,5 @@ static const struct sof_ipc_pm_ops ipc3_pm_ops = { 
const struct sof_ipc_ops ipc3_ops = {

	.tplg = &ipc3_tplg_ops,

	.pm = &ipc3_pm_ops,

	.pcm = &ipc3_pcm_ops,

};