Unverified Commit 97e22cbd authored by Bud Liviu-Alexandru's avatar Bud Liviu-Alexandru Committed by Mark Brown
Browse files

ASoC: SOF: Make Intel IPC stream ops generic 



This operations should be generic as there is nothing Intel
specific. This works well for NXP i.MX8 stream IPC ops.

We start by moving sof/intel/intel-ipc.c into sof/stream-ipc.c and
rename the functions to be generic.

Notice that we use newly introduced snd_sof_dsp_mailbox_read
instead of sof_mailbox_read, to make sure that we are not
bound to existing MMIO memory access, and we allow platform
to implement their own memory access routines.

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 avatarDaniel Baluta <daniel.baluta@gmail.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20211004152147.1268978-3-daniel.baluta@oss.nxp.com


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

sound/soc/sof/Makefile

+1 −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

sound/soc/sof/intel/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
snd-sof-acpi-intel-byt-objs := byt.o

snd-sof-acpi-intel-bdw-objs := bdw.o



snd-sof-intel-ipc-objs := intel-ipc.o



snd-sof-intel-hda-common-objs := hda.o hda-loader.o hda-stream.o hda-trace.o \

				 hda-dsp.o hda-ipc.o hda-ctrl.o hda-pcm.o \

				 hda-dai.o hda-bus.o \
@@ -18,7 +16,6 @@ snd-sof-intel-atom-objs := atom.o 
obj-$(CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP) += snd-sof-intel-atom.o

obj-$(CONFIG_SND_SOC_SOF_BAYTRAIL) += snd-sof-acpi-intel-byt.o

obj-$(CONFIG_SND_SOC_SOF_BROADWELL) += snd-sof-acpi-intel-bdw.o

obj-$(CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC) += snd-sof-intel-ipc.o

obj-$(CONFIG_SND_SOC_SOF_HDA_COMMON) += snd-sof-intel-hda-common.o

obj-$(CONFIG_SND_SOC_SOF_HDA) += snd-sof-intel-hda.o

sound/soc/sof/intel/bdw.c

+4 −4
Original line number Diff line number Diff line
@@ -626,8 +626,8 @@ static const struct snd_sof_dsp_ops sof_bdw_ops = { 
	.get_mailbox_offset = bdw_get_mailbox_offset,

	.get_window_offset = bdw_get_window_offset,



	.ipc_msg_data	= intel_ipc_msg_data,

	.ipc_pcm_params	= intel_ipc_pcm_params,

	.ipc_msg_data	= sof_ipc_msg_data,

	.ipc_pcm_params	= sof_ipc_pcm_params,



	/* machine driver */

	.machine_select = bdw_machine_select,
@@ -642,8 +642,8 @@ static const struct snd_sof_dsp_ops sof_bdw_ops = { 
	.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,



	/* stream callbacks */

	.pcm_open	= intel_pcm_open,

	.pcm_close	= intel_pcm_close,

	.pcm_open	= sof_stream_pcm_open,

	.pcm_close	= sof_stream_pcm_close,



	/* Module loading */

	.load_module    = snd_sof_parse_module_memcpy,

sound/soc/sof/intel/byt.c

+8 −8
Original line number Diff line number Diff line
@@ -240,8 +240,8 @@ static const struct snd_sof_dsp_ops sof_byt_ops = { 
	.get_mailbox_offset = atom_get_mailbox_offset,

	.get_window_offset = atom_get_window_offset,



	.ipc_msg_data	= intel_ipc_msg_data,

	.ipc_pcm_params	= intel_ipc_pcm_params,

	.ipc_msg_data	= sof_ipc_msg_data,

	.ipc_pcm_params	= sof_ipc_pcm_params,



	/* machine driver */

	.machine_select = atom_machine_select,
@@ -256,8 +256,8 @@ static const struct snd_sof_dsp_ops sof_byt_ops = { 
	.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,



	/* stream callbacks */

	.pcm_open	= intel_pcm_open,

	.pcm_close	= intel_pcm_close,

	.pcm_open	= sof_stream_pcm_open,

	.pcm_close	= sof_stream_pcm_close,



	/* module loading */

	.load_module	= snd_sof_parse_module_memcpy,
@@ -322,8 +322,8 @@ static const struct snd_sof_dsp_ops sof_cht_ops = { 
	.get_mailbox_offset = atom_get_mailbox_offset,

	.get_window_offset = atom_get_window_offset,



	.ipc_msg_data	= intel_ipc_msg_data,

	.ipc_pcm_params	= intel_ipc_pcm_params,

	.ipc_msg_data	= sof_ipc_msg_data,

	.ipc_pcm_params	= sof_ipc_pcm_params,



	/* machine driver */

	.machine_select = atom_machine_select,
@@ -338,8 +338,8 @@ static const struct snd_sof_dsp_ops sof_cht_ops = { 
	.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,



	/* stream callbacks */

	.pcm_open	= intel_pcm_open,

	.pcm_close	= intel_pcm_close,

	.pcm_open	= sof_stream_pcm_open,

	.pcm_close	= sof_stream_pcm_close,



	/* module loading */

	.load_module	= snd_sof_parse_module_memcpy,

sound/soc/sof/intel/pci-tng.c

+4 −4
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ const struct snd_sof_dsp_ops sof_tng_ops = { 
	.get_mailbox_offset = atom_get_mailbox_offset,

	.get_window_offset = atom_get_window_offset,



	.ipc_msg_data	= intel_ipc_msg_data,

	.ipc_pcm_params	= intel_ipc_pcm_params,

	.ipc_msg_data	= sof_ipc_msg_data,

	.ipc_pcm_params	= sof_ipc_pcm_params,



	/* machine driver */

	.machine_select = atom_machine_select,
@@ -172,8 +172,8 @@ const struct snd_sof_dsp_ops sof_tng_ops = { 
	.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,



	/* stream callbacks */

	.pcm_open	= intel_pcm_open,

	.pcm_close	= intel_pcm_close,

	.pcm_open	= sof_stream_pcm_open,

	.pcm_close	= sof_stream_pcm_close,



	/* module loading */

	.load_module	= snd_sof_parse_module_memcpy,