Unverified Commit 37e809d5 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: use common ops across platforms 



The dsp_ops are mostly common between platforms. Introduce a common
structure and an init function to set platform-specific values.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220414184817.362215-10-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/core.c

+4 −1
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ static void sof_probe_work(struct work_struct *work) 
int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data)

{

	struct snd_sof_dev *sdev;

	int ret;



	sdev = devm_kzalloc(dev, sizeof(*sdev), GFP_KERNEL);

	if (!sdev)
@@ -358,7 +359,9 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data) 
	dev_set_drvdata(dev, sdev);



	/* init ops, if necessary */

	sof_ops_init(sdev);

	ret = sof_ops_init(sdev);

	if (ret < 0)

		return ret;



	/* check all mandatory ops */

	if (!sof_ops(sdev) || !sof_ops(sdev)->probe || !sof_ops(sdev)->run ||

sound/soc/sof/intel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ snd-sof-acpi-intel-bdw-objs := bdw.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 \

				 apl.o cnl.o tgl.o icl.o

				 apl.o cnl.o tgl.o icl.o hda-common-ops.o

snd-sof-intel-hda-common-$(CONFIG_SND_SOC_SOF_HDA_PROBES) += hda-probes.o



snd-sof-intel-hda-objs := hda-codec.o

sound/soc/sof/intel/apl.c

+18 −86
Original line number Diff line number Diff line
@@ -26,108 +26,40 @@ static const struct snd_sof_debugfs_map apl_dsp_debugfs[] = { 
};



/* apollolake ops */

struct snd_sof_dsp_ops sof_apl_ops = {

	/* probe/remove/shutdown */

	.probe		= hda_dsp_probe,

	.remove		= hda_dsp_remove,

	.shutdown	= hda_dsp_shutdown,



	/* Register IO */

	.write		= sof_io_write,

	.read		= sof_io_read,

	.write64	= sof_io_write64,

	.read64		= sof_io_read64,

struct snd_sof_dsp_ops sof_apl_ops;

EXPORT_SYMBOL_NS(sof_apl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);



	/* Block IO */

	.block_read	= sof_block_read,

	.block_write	= sof_block_write,

int sof_apl_ops_init(struct snd_sof_dev *sdev)

{

	/* common defaults */

	memcpy(&sof_apl_ops, &sof_hda_common_ops, sizeof(struct snd_sof_dsp_ops));



	/* Mailbox IO */

	.mailbox_read	= sof_mailbox_read,

	.mailbox_write	= sof_mailbox_write,

	/* probe/remove/shutdown */

	sof_apl_ops.shutdown	= hda_dsp_shutdown;



	/* doorbell */

	.irq_thread	= hda_dsp_ipc_irq_thread,

	sof_apl_ops.irq_thread	= hda_dsp_ipc_irq_thread;



	/* ipc */

	.send_msg	= hda_dsp_ipc_send_msg,

	.fw_ready	= sof_fw_ready,

	.get_mailbox_offset = hda_dsp_ipc_get_mailbox_offset,

	.get_window_offset = hda_dsp_ipc_get_window_offset,



	.ipc_msg_data	= hda_ipc_msg_data,

	.set_stream_data_offset = hda_set_stream_data_offset,



	/* machine driver */

	.machine_select = hda_machine_select,

	.machine_register = sof_machine_register,

	.machine_unregister = sof_machine_unregister,

	.set_mach_params = hda_set_mach_params,

	sof_apl_ops.send_msg	= hda_dsp_ipc_send_msg;



	/* debug */

	.debug_map	= apl_dsp_debugfs,

	.debug_map_count	= ARRAY_SIZE(apl_dsp_debugfs),

	.dbg_dump	= hda_dsp_dump,

	.ipc_dump	= hda_ipc_dump,

	.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,



	/* stream callbacks */

	.pcm_open	= hda_dsp_pcm_open,

	.pcm_close	= hda_dsp_pcm_close,

	.pcm_hw_params	= hda_dsp_pcm_hw_params,

	.pcm_hw_free	= hda_dsp_stream_hw_free,

	.pcm_trigger	= hda_dsp_pcm_trigger,

	.pcm_pointer	= hda_dsp_pcm_pointer,

	.pcm_ack	= hda_dsp_pcm_ack,



	/* firmware loading */

	.load_firmware = snd_sof_load_firmware_raw,

	sof_apl_ops.debug_map	= apl_dsp_debugfs;

	sof_apl_ops.debug_map_count	= ARRAY_SIZE(apl_dsp_debugfs);

	sof_apl_ops.ipc_dump	= hda_ipc_dump;



	/* firmware run */

	.run = hda_dsp_cl_boot_firmware,

	sof_apl_ops.run = hda_dsp_cl_boot_firmware;



	/* pre/post fw run */

	.pre_fw_run = hda_dsp_pre_fw_run,

	.post_fw_run = hda_dsp_post_fw_run,



	/* parse platform specific extended manifest */

	.parse_platform_ext_manifest = hda_dsp_ext_man_get_cavs_config_data,

	sof_apl_ops.post_fw_run = hda_dsp_post_fw_run;



	/* dsp core get/put */

	.core_get = hda_dsp_core_get,



	/* trace callback */

	.trace_init = hda_dsp_trace_init,

	.trace_release = hda_dsp_trace_release,

	.trace_trigger = hda_dsp_trace_trigger,



	/* client ops */

	.register_ipc_clients = hda_register_clients,

	.unregister_ipc_clients = hda_unregister_clients,



	/* DAI drivers */

	.drv		= skl_dai,

	.num_drv	= SOF_SKL_NUM_DAIS,

	sof_apl_ops.core_get = hda_dsp_core_get;



	/* PM */

	.suspend		= hda_dsp_suspend,

	.resume			= hda_dsp_resume,

	.runtime_suspend	= hda_dsp_runtime_suspend,

	.runtime_resume		= hda_dsp_runtime_resume,

	.runtime_idle		= hda_dsp_runtime_idle,

	.set_hw_params_upon_resume = hda_dsp_set_hw_params_upon_resume,

	.set_power_state	= hda_dsp_set_power_state,



	/* ALSA HW info flags */

	.hw_info =	SNDRV_PCM_INFO_MMAP |

			SNDRV_PCM_INFO_MMAP_VALID |

			SNDRV_PCM_INFO_INTERLEAVED |

			SNDRV_PCM_INFO_PAUSE |

			SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,



	.dsp_arch_ops = &sof_xtensa_arch_ops,

	return 0;

};

EXPORT_SYMBOL_NS(sof_apl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);

EXPORT_SYMBOL_NS(sof_apl_ops_init, SND_SOC_SOF_INTEL_HDA_COMMON);



const struct sof_intel_dsp_desc apl_chip_info = {

	/* Apollolake */

sound/soc/sof/intel/cnl.c

+19 −87
Original line number Diff line number Diff line
@@ -244,108 +244,40 @@ void cnl_ipc_dump(struct snd_sof_dev *sdev) 
}



/* cannonlake ops */

struct snd_sof_dsp_ops sof_cnl_ops = {

	/* probe/remove/shutdown */

	.probe		= hda_dsp_probe,

	.remove		= hda_dsp_remove,

	.shutdown	= hda_dsp_shutdown,



	/* Register IO */

	.write		= sof_io_write,

	.read		= sof_io_read,

	.write64	= sof_io_write64,

	.read64		= sof_io_read64,

struct snd_sof_dsp_ops sof_cnl_ops;

EXPORT_SYMBOL_NS(sof_cnl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);



	/* Block IO */

	.block_read	= sof_block_read,

	.block_write	= sof_block_write,

int sof_cnl_ops_init(struct snd_sof_dev *sdev)

{

	/* common defaults */

	memcpy(&sof_cnl_ops, &sof_hda_common_ops, sizeof(struct snd_sof_dsp_ops));



	/* Mailbox IO */

	.mailbox_read	= sof_mailbox_read,

	.mailbox_write	= sof_mailbox_write,

	/* probe/remove/shutdown */

	sof_cnl_ops.shutdown	= hda_dsp_shutdown;



	/* doorbell */

	.irq_thread	= cnl_ipc_irq_thread,

	sof_cnl_ops.irq_thread	= cnl_ipc_irq_thread;



	/* ipc */

	.send_msg	= cnl_ipc_send_msg,

	.fw_ready	= sof_fw_ready,

	.get_mailbox_offset = hda_dsp_ipc_get_mailbox_offset,

	.get_window_offset = hda_dsp_ipc_get_window_offset,



	.ipc_msg_data	= hda_ipc_msg_data,

	.set_stream_data_offset = hda_set_stream_data_offset,



	/* machine driver */

	.machine_select = hda_machine_select,

	.machine_register = sof_machine_register,

	.machine_unregister = sof_machine_unregister,

	.set_mach_params = hda_set_mach_params,

	sof_cnl_ops.send_msg	= cnl_ipc_send_msg;



	/* debug */

	.debug_map	= cnl_dsp_debugfs,

	.debug_map_count	= ARRAY_SIZE(cnl_dsp_debugfs),

	.dbg_dump	= hda_dsp_dump,

	.ipc_dump	= cnl_ipc_dump,

	.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,



	/* stream callbacks */

	.pcm_open	= hda_dsp_pcm_open,

	.pcm_close	= hda_dsp_pcm_close,

	.pcm_hw_params	= hda_dsp_pcm_hw_params,

	.pcm_hw_free	= hda_dsp_stream_hw_free,

	.pcm_trigger	= hda_dsp_pcm_trigger,

	.pcm_pointer	= hda_dsp_pcm_pointer,

	.pcm_ack	= hda_dsp_pcm_ack,



	/* firmware loading */

	.load_firmware = snd_sof_load_firmware_raw,

	sof_cnl_ops.debug_map	= cnl_dsp_debugfs;

	sof_cnl_ops.debug_map_count	= ARRAY_SIZE(cnl_dsp_debugfs);

	sof_cnl_ops.ipc_dump	= cnl_ipc_dump;



	/* pre/post fw run */

	.pre_fw_run = hda_dsp_pre_fw_run,

	.post_fw_run = hda_dsp_post_fw_run,

	sof_cnl_ops.post_fw_run = hda_dsp_post_fw_run;



	/* parse platform specific extended manifest */

	.parse_platform_ext_manifest = hda_dsp_ext_man_get_cavs_config_data,

	/* firmware run */

	sof_cnl_ops.run = hda_dsp_cl_boot_firmware;



	/* dsp core get/put */

	.core_get = hda_dsp_core_get,

	sof_cnl_ops.core_get = hda_dsp_core_get;



	/* firmware run */

	.run = hda_dsp_cl_boot_firmware,



	/* trace callback */

	.trace_init = hda_dsp_trace_init,

	.trace_release = hda_dsp_trace_release,

	.trace_trigger = hda_dsp_trace_trigger,



	/* client ops */

	.register_ipc_clients = hda_register_clients,

	.unregister_ipc_clients = hda_unregister_clients,



	/* DAI drivers */

	.drv		= skl_dai,

	.num_drv	= SOF_SKL_NUM_DAIS,



	/* PM */

	.suspend		= hda_dsp_suspend,

	.resume			= hda_dsp_resume,

	.runtime_suspend	= hda_dsp_runtime_suspend,

	.runtime_resume		= hda_dsp_runtime_resume,

	.runtime_idle		= hda_dsp_runtime_idle,

	.set_hw_params_upon_resume = hda_dsp_set_hw_params_upon_resume,

	.set_power_state	= hda_dsp_set_power_state,



	/* ALSA HW info flags */

	.hw_info =	SNDRV_PCM_INFO_MMAP |

			SNDRV_PCM_INFO_MMAP_VALID |

			SNDRV_PCM_INFO_INTERLEAVED |

			SNDRV_PCM_INFO_PAUSE |

			SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,



	.dsp_arch_ops = &sof_xtensa_arch_ops,

	return 0;

};

EXPORT_SYMBOL_NS(sof_cnl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);

EXPORT_SYMBOL_NS(sof_cnl_ops_init, SND_SOC_SOF_INTEL_HDA_COMMON);



const struct sof_intel_dsp_desc cnl_chip_info = {

	/* Cannonlake */

sound/soc/sof/intel/hda-common-ops.c

0 → 100644
+107 −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) 2022 Intel Corporation. All rights reserved.

//



/*

 * common ops for SKL+ HDAudio platforms

 */



#include "../sof-priv.h"

#include "hda.h"

#include "../sof-audio.h"



struct snd_sof_dsp_ops sof_hda_common_ops = {

	/* probe/remove/shutdown */

	.probe		= hda_dsp_probe,

	.remove		= hda_dsp_remove,



	/* Register IO */

	.write		= sof_io_write,

	.read		= sof_io_read,

	.write64	= sof_io_write64,

	.read64		= sof_io_read64,



	/* Block IO */

	.block_read	= sof_block_read,

	.block_write	= sof_block_write,



	/* Mailbox IO */

	.mailbox_read	= sof_mailbox_read,

	.mailbox_write	= sof_mailbox_write,



	/* ipc */

	.fw_ready	= sof_fw_ready,

	.get_mailbox_offset = hda_dsp_ipc_get_mailbox_offset,

	.get_window_offset = hda_dsp_ipc_get_window_offset,



	.ipc_msg_data	= hda_ipc_msg_data,

	.set_stream_data_offset = hda_set_stream_data_offset,



	/* machine driver */

	.machine_select = hda_machine_select,

	.machine_register = sof_machine_register,

	.machine_unregister = sof_machine_unregister,

	.set_mach_params = hda_set_mach_params,



	/* debug */

	.dbg_dump	= hda_dsp_dump,

	.debugfs_add_region_item = snd_sof_debugfs_add_region_item_iomem,



	/* stream callbacks */

	.pcm_open	= hda_dsp_pcm_open,

	.pcm_close	= hda_dsp_pcm_close,

	.pcm_hw_params	= hda_dsp_pcm_hw_params,

	.pcm_hw_free	= hda_dsp_stream_hw_free,

	.pcm_trigger	= hda_dsp_pcm_trigger,

	.pcm_pointer	= hda_dsp_pcm_pointer,

	.pcm_ack	= hda_dsp_pcm_ack,



	/* firmware loading */

	.load_firmware = snd_sof_load_firmware_raw,



	/* pre/post fw run */

	.pre_fw_run = hda_dsp_pre_fw_run,



	/* firmware run */

	.run = hda_dsp_cl_boot_firmware,



	/* parse platform specific extended manifest */

	.parse_platform_ext_manifest = hda_dsp_ext_man_get_cavs_config_data,



	/* dsp core get/put */



	/* trace callback */

	.trace_init = hda_dsp_trace_init,

	.trace_release = hda_dsp_trace_release,

	.trace_trigger = hda_dsp_trace_trigger,



	/* client ops */

	.register_ipc_clients = hda_register_clients,

	.unregister_ipc_clients = hda_unregister_clients,



	/* DAI drivers */

	.drv		= skl_dai,

	.num_drv	= SOF_SKL_NUM_DAIS,



	/* PM */

	.suspend		= hda_dsp_suspend,

	.resume			= hda_dsp_resume,

	.runtime_suspend	= hda_dsp_runtime_suspend,

	.runtime_resume		= hda_dsp_runtime_resume,

	.runtime_idle		= hda_dsp_runtime_idle,

	.set_hw_params_upon_resume = hda_dsp_set_hw_params_upon_resume,

	.set_power_state	= hda_dsp_set_power_state,



	/* ALSA HW info flags */

	.hw_info =	SNDRV_PCM_INFO_MMAP |

			SNDRV_PCM_INFO_MMAP_VALID |

			SNDRV_PCM_INFO_INTERLEAVED |

			SNDRV_PCM_INFO_PAUSE |

			SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,



	.dsp_arch_ops = &sof_xtensa_arch_ops,

};