Unverified Commit 99f11b65 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "Introduce new SOF helpers" from Daniel Baluta <daniel.baluta@oss.nxp.com> 

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

From: Daniel Baluta <daniel.baluta@nxp.com>

This patchseries adds new helpers in order to reduce code duplication
and prepare for compress audio support with SOF.

Bud Liviu-Alexandru (1):
  ASoC: SOF: Make Intel IPC stream ops generic

Daniel Baluta (3):
  ASoC: SOF: Introduce snd_sof_mailbox_read / snd_sof_mailbox_write
    callbacks
  ASoC: SOF: imx: Use newly introduced generic IPC stream ops
  ASoC: SOF: Introduce fragment elapsed notification API

 sound/soc/sof/Kconfig                         |  4 ++
 sound/soc/sof/Makefile                        |  3 +-
 sound/soc/sof/compress.c                      | 51 +++++++++++++++++++
 sound/soc/sof/imx/Kconfig                     |  2 +
 sound/soc/sof/imx/imx8.c                      | 39 +++++++-------
 sound/soc/sof/imx/imx8m.c                     | 26 ++++------
 sound/soc/sof/intel/Makefile                  |  3 --
 sound/soc/sof/intel/apl.c                     |  4 ++
 sound/soc/sof/intel/bdw.c                     | 12 +++--
 sound/soc/sof/intel/byt.c                     | 24 ++++++---
 sound/soc/sof/intel/cnl.c                     |  4 ++
 sound/soc/sof/intel/icl.c                     |  4 ++
 sound/soc/sof/intel/pci-tng.c                 | 12 +++--
 sound/soc/sof/intel/tgl.c                     |  4 ++
 sound/soc/sof/ipc.c                           |  6 ++-
 sound/soc/sof/ops.h                           | 15 ++++++
 sound/soc/sof/pcm.c                           |  7 ++-
 sound/soc/sof/sof-audio.h                     | 11 +++-
 sound/soc/sof/sof-priv.h                      | 28 ++++++----
 .../sof/{intel/intel-ipc.c => stream-ipc.c}   | 50 +++++++++---------
 sound/soc/sof/topology.c                      |  6 ++-
 21 files changed, 218 insertions(+), 97 deletions(-)
 create mode 100644 sound/soc/sof/compress.c
 rename sound/soc/sof/{intel/intel-ipc.c => stream-ipc.c} (58%)

--
2.27.0
parents 1cfd7c2e 858f7a5c

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

+2 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)



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

		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/imx/imx8.c

+20 −19
Original line number Diff line number Diff line
@@ -369,21 +369,6 @@ static int imx8_get_bar_index(struct snd_sof_dev *sdev, u32 type) 
	return type;

}



static int imx8_ipc_msg_data(struct snd_sof_dev *sdev,

			     struct snd_pcm_substream *substream,

			     void *p, size_t sz)

{

	sof_mailbox_read(sdev, sdev->dsp_box.offset, p, sz);

	return 0;

}



static int imx8_ipc_pcm_params(struct snd_sof_dev *sdev,

			       struct snd_pcm_substream *substream,

			       const struct sof_ipc_pcm_params_reply *reply)

{

	return 0;

}



static struct snd_soc_dai_driver imx8_dai[] = {

{

	.name = "esai0",
@@ -421,14 +406,18 @@ struct snd_sof_dsp_ops sof_imx8_ops = { 
	.block_read	= sof_block_read,

	.block_write	= sof_block_write,



	/* Mailbox IO */

	.mailbox_read	= sof_mailbox_read,

	.mailbox_write	= sof_mailbox_write,



	/* ipc */

	.send_msg	= imx8_send_msg,

	.fw_ready	= sof_fw_ready,

	.get_mailbox_offset	= imx8_get_mailbox_offset,

	.get_window_offset	= imx8_get_window_offset,



	.ipc_msg_data	= imx8_ipc_msg_data,

	.ipc_pcm_params	= imx8_ipc_pcm_params,

	.ipc_msg_data	= sof_ipc_msg_data,

	.ipc_pcm_params	= sof_ipc_pcm_params,



	/* module loading */

	.load_module	= snd_sof_parse_module_memcpy,
@@ -440,6 +429,10 @@ struct snd_sof_dsp_ops sof_imx8_ops = { 
	.dbg_dump = imx8_dump,

	.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,



	/* stream callbacks */

	.pcm_open = sof_stream_pcm_open,

	.pcm_close = sof_stream_pcm_close,



	/* Firmware ops */

	.dsp_arch_ops = &sof_xtensa_arch_ops,
@@ -468,14 +461,18 @@ struct snd_sof_dsp_ops sof_imx8x_ops = { 
	.block_read	= sof_block_read,

	.block_write	= sof_block_write,



	/* Mailbox IO */

	.mailbox_read	= sof_mailbox_read,

	.mailbox_write	= sof_mailbox_write,



	/* ipc */

	.send_msg	= imx8_send_msg,

	.fw_ready	= sof_fw_ready,

	.get_mailbox_offset	= imx8_get_mailbox_offset,

	.get_window_offset	= imx8_get_window_offset,



	.ipc_msg_data	= imx8_ipc_msg_data,

	.ipc_pcm_params	= imx8_ipc_pcm_params,

	.ipc_msg_data	= sof_ipc_msg_data,

	.ipc_pcm_params	= sof_ipc_pcm_params,



	/* module loading */

	.load_module	= snd_sof_parse_module_memcpy,
@@ -487,6 +484,10 @@ struct snd_sof_dsp_ops sof_imx8x_ops = { 
	.dbg_dump = imx8_dump,

	.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,



	/* stream callbacks */

	.pcm_open = sof_stream_pcm_open,

	.pcm_close = sof_stream_pcm_close,



	/* Firmware ops */

	.dsp_arch_ops = &sof_xtensa_arch_ops,