Unverified Commit 858f7a5c authored by Daniel Baluta's avatar Daniel Baluta Committed by Mark Brown
Browse files

ASoC: SOF: Introduce fragment elapsed notification API 



This patch prepares the introduction of the compress API with SOF.

After each fragment is accepted by the DSP we need to inform
the userspace applications that they can send the next fragment.
This is done via snd_compr_fragment_elapsed.

Similar with the PCM case, in order to avoid sending an IPC before
the previous IPC is handled we need to schedule a delayed work to
call snd_compr_fragment_elapsed().

See snd_sof_pcm_period_elapsed.

To sum up this patch offers the following API to SOF code:
	* snd_sof_compr_init_elapsed_work
	* snd_sof_compr_fragment_elapsed

Note that implementation for compressed function is in a new file
selected via CONFIG_SND_SOC_SOF_COMPRESS invisible config option.
This option is automatically selected for platforms that support
the compress interface. For now only i.MX8 platforms support this.

For symmetry we introduce snd_sof_pcm_init_elapsed_work to setup
the work struct for PCM case.

Signed-off-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: default avatarBud Liviu-Alexandru <budliviu@gmail.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPaul Olaru <paul.olaru@oss.nxp.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20211004152147.1268978-5-daniel.baluta@oss.nxp.com


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

sound/soc/sof/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ config SND_SOC_SOF_OF 
	  required to enable i.MX8 devices.

	  Say Y if you need this option. If unsure select "N".



config SND_SOC_SOF_COMPRESS

	tristate

	select SND_SOC_COMPRESS



config SND_SOC_SOF_DEBUG_PROBES

	bool "SOF enable data probing"

	select SND_SOC_COMPRESS

sound/soc/sof/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\ 
		control.o trace.o utils.o sof-audio.o stream-ipc.o



snd-sof-$(CONFIG_SND_SOC_SOF_DEBUG_PROBES) += sof-probes.o

snd-sof-$(CONFIG_SND_SOC_SOF_COMPRESS) += compress.o



snd-sof-pci-objs := sof-pci-dev.o

snd-sof-acpi-objs := sof-acpi-dev.o

sound/soc/sof/compress.c

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

//

// Copyright 2021 NXP

//

// Author: Daniel Baluta <daniel.baluta@nxp.com>



#include <sound/soc.h>

#include <sound/sof.h>

#include <sound/compress_driver.h>

#include "sof-audio.h"

#include "sof-priv.h"



static void snd_sof_compr_fragment_elapsed_work(struct work_struct *work)

{

	struct snd_sof_pcm_stream *sps =

		container_of(work, struct snd_sof_pcm_stream,

			     period_elapsed_work);



	snd_compr_fragment_elapsed(sps->cstream);

}



void snd_sof_compr_init_elapsed_work(struct work_struct *work)

{

	INIT_WORK(work, snd_sof_compr_fragment_elapsed_work);

}



/*

 * sof compr fragment elapse, this could be called in irq thread context

 */

void snd_sof_compr_fragment_elapsed(struct snd_compr_stream *cstream)

{

	struct snd_soc_component *component;

	struct snd_soc_pcm_runtime *rtd;

	struct snd_sof_pcm *spcm;



	if (!cstream)

		return;



	rtd = cstream->private_data;

	component = snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME);



	spcm = snd_sof_find_spcm_dai(component, rtd);

	if (!spcm) {

		dev_err(component->dev,

			"fragment elapsed called for unknown stream!\n");

		return;

	}



	/* use the same workqueue-based solution as for PCM, cf. snd_sof_pcm_elapsed */

	schedule_work(&spcm->stream[cstream->direction].period_elapsed_work);

}

sound/soc/sof/imx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ config SND_SOC_SOF_IMX8 
	tristate

	select SND_SOC_SOF_IMX_COMMON

	select SND_SOC_SOF_XTENSA

	select SND_SOC_SOF_COMPRESS

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level.
@@ -54,6 +55,7 @@ config SND_SOC_SOF_IMX8M 
	tristate

	select SND_SOC_SOF_IMX_COMMON

	select SND_SOC_SOF_XTENSA

	select SND_SOC_SOF_COMPRESS

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level.

sound/soc/sof/ipc.c

+4 −2
Original line number Diff line number Diff line
@@ -539,8 +539,10 @@ static void ipc_period_elapsed(struct snd_sof_dev *sdev, u32 msg_id) 


	memcpy(&stream->posn, &posn, sizeof(posn));



	if (spcm->pcm.compress)

		snd_sof_compr_fragment_elapsed(stream->cstream);

	else if (!stream->substream->runtime->no_period_wakeup)

		/* only inform ALSA for period_wakeup mode */

	if (!stream->substream->runtime->no_period_wakeup)

		snd_sof_pcm_period_elapsed(stream->substream);

}