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

ASoC: SOF: Intel: start splitting top-level from common parts 



The existing code relies on the 'HDA_COMMON' module and namespace. We
need to start splitting top-level parts from the low-level ones,
otherwise we will not be able to reuse the low-level parts DMA support
for SoundWire/BPT.

In the end the dependencies will be:

         +----------------------------------------------+
         |                                              |
         |                                              v
sof-pci-intel-xxx --> sof-intel-hda ------------> sof-hda-common
                          |                             ^
                          |                             |
                          +-> soundwire_intel --> sof_hda_sdw_bpt

This patch adds the initial split between the sof-pci-intel-xxx
modules and the common parts, in a follow-up patch we will further
split the HDA_COMMON parts

Since the PCI modules are not all independent, i.e. the CNL parts are
also used in JSL and TGL, additional Kconfig and namespace modules
were added.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20240503135221.229202-4-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/intel/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ config SND_SOC_SOF_INTEL_ICL 
	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	select SND_SOC_SOF_IPC3

	select SND_SOC_SOF_IPC4

	select SND_SOC_SOF_INTEL_CNL



config SND_SOC_SOF_ICELAKE

	tristate "SOF support for Icelake"
@@ -215,6 +216,7 @@ config SND_SOC_SOF_INTEL_TGL 
	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	select SND_SOC_SOF_IPC3

	select SND_SOC_SOF_IPC4

	select SND_SOC_SOF_INTEL_CNL



config SND_SOC_SOF_TIGERLAKE

	tristate "SOF support for Tigerlake"
@@ -267,6 +269,7 @@ config SND_SOC_SOF_INTEL_LNL 
	select SND_SOC_SOF_HDA_COMMON

	select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE

	select SND_SOC_SOF_IPC4

	select SND_SOC_SOF_INTEL_MTL



config SND_SOC_SOF_LUNARLAKE

	tristate "SOF support for Lunarlake"

sound/soc/sof/intel/Makefile

+8 −9
Original line number Diff line number Diff line
@@ -6,8 +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-dai-ops.o hda-bus.o \

				 skl.o hda-loader-skl.o \

				 apl.o cnl.o tgl.o icl.o mtl.o lnl.o hda-common-ops.o \

				 hda-common-ops.o \

				 telemetry.o



snd-sof-intel-hda-mlink-objs := hda-mlink.o
@@ -26,13 +25,13 @@ obj-$(CONFIG_SND_SOC_SOF_HDA_MLINK) += snd-sof-intel-hda-mlink.o 
obj-$(CONFIG_SND_SOC_SOF_HDA) += snd-sof-intel-hda.o



snd-sof-pci-intel-tng-objs := pci-tng.o

snd-sof-pci-intel-skl-objs := pci-skl.o

snd-sof-pci-intel-apl-objs := pci-apl.o

snd-sof-pci-intel-cnl-objs := pci-cnl.o

snd-sof-pci-intel-icl-objs := pci-icl.o

snd-sof-pci-intel-tgl-objs := pci-tgl.o

snd-sof-pci-intel-mtl-objs := pci-mtl.o

snd-sof-pci-intel-lnl-objs := pci-lnl.o

snd-sof-pci-intel-skl-objs := pci-skl.o skl.o hda-loader-skl.o

snd-sof-pci-intel-apl-objs := pci-apl.o apl.o

snd-sof-pci-intel-cnl-objs := pci-cnl.o cnl.o

snd-sof-pci-intel-icl-objs := pci-icl.o icl.o

snd-sof-pci-intel-tgl-objs := pci-tgl.o tgl.o

snd-sof-pci-intel-mtl-objs := pci-mtl.o mtl.o

snd-sof-pci-intel-lnl-objs := pci-lnl.o lnl.o



obj-$(CONFIG_SND_SOC_SOF_MERRIFIELD) += snd-sof-pci-intel-tng.o

obj-$(CONFIG_SND_SOC_SOF_INTEL_SKL) += snd-sof-pci-intel-skl.o

sound/soc/sof/intel/apl.c

+0 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ static const struct snd_sof_debugfs_map apl_dsp_debugfs[] = { 


/* apollolake ops */

struct snd_sof_dsp_ops sof_apl_ops;

EXPORT_SYMBOL_NS(sof_apl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);



int sof_apl_ops_init(struct snd_sof_dev *sdev)

{
@@ -97,7 +96,6 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev) 


	return 0;

};

EXPORT_SYMBOL_NS(sof_apl_ops_init, SND_SOC_SOF_INTEL_HDA_COMMON);



const struct sof_intel_dsp_desc apl_chip_info = {

	/* Apollolake */
@@ -121,4 +119,3 @@ const struct sof_intel_dsp_desc apl_chip_info = { 
	.disable_interrupts = hda_dsp_disable_interrupts,

	.hw_ip_version = SOF_INTEL_CAVS_1_5_PLUS,

};
 
EXPORT_SYMBOL_NS(apl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);

sound/soc/sof/intel/cnl.c

+9 −4
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ irqreturn_t cnl_ipc4_irq_thread(int irq, void *context) 


	return IRQ_HANDLED;

}

EXPORT_SYMBOL_NS(cnl_ipc4_irq_thread, SND_SOC_SOF_INTEL_CNL);



irqreturn_t cnl_ipc_irq_thread(int irq, void *context)

{
@@ -202,6 +203,7 @@ irqreturn_t cnl_ipc_irq_thread(int irq, void *context) 


	return IRQ_HANDLED;

}

EXPORT_SYMBOL_NS(cnl_ipc_irq_thread, SND_SOC_SOF_INTEL_CNL);



static void cnl_ipc_host_done(struct snd_sof_dev *sdev)

{
@@ -284,6 +286,7 @@ int cnl_ipc4_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg) 


	return 0;

}

EXPORT_SYMBOL_NS(cnl_ipc4_send_msg, SND_SOC_SOF_INTEL_CNL);



int cnl_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg)

{
@@ -331,6 +334,7 @@ int cnl_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg) 


	return 0;

}

EXPORT_SYMBOL_NS(cnl_ipc_send_msg, SND_SOC_SOF_INTEL_CNL);



void cnl_ipc_dump(struct snd_sof_dev *sdev)

{
@@ -351,6 +355,7 @@ void cnl_ipc_dump(struct snd_sof_dev *sdev) 
		"error: host status 0x%8.8x dsp status 0x%8.8x mask 0x%8.8x\n",

		hipcida, hipctdr, hipcctl);

}

EXPORT_SYMBOL_NS(cnl_ipc_dump, SND_SOC_SOF_INTEL_CNL);



void cnl_ipc4_dump(struct snd_sof_dev *sdev)

{
@@ -372,10 +377,11 @@ void cnl_ipc4_dump(struct snd_sof_dev *sdev) 
		"Host IPC initiator: %#x|%#x|%#x, target: %#x|%#x|%#x, ctl: %#x\n",

		hipcidr, hipcidd, hipcida, hipctdr, hipctdd, hipctda, hipcctl);

}

EXPORT_SYMBOL_NS(cnl_ipc4_dump, SND_SOC_SOF_INTEL_CNL);



/* cannonlake ops */

struct snd_sof_dsp_ops sof_cnl_ops;

EXPORT_SYMBOL_NS(sof_cnl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);

EXPORT_SYMBOL_NS(sof_cnl_ops, SND_SOC_SOF_INTEL_CNL);



int sof_cnl_ops_init(struct snd_sof_dev *sdev)

{
@@ -444,7 +450,7 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev) 


	return 0;

};

EXPORT_SYMBOL_NS(sof_cnl_ops_init, SND_SOC_SOF_INTEL_HDA_COMMON);

EXPORT_SYMBOL_NS(sof_cnl_ops_init, SND_SOC_SOF_INTEL_CNL);



const struct sof_intel_dsp_desc cnl_chip_info = {

	/* Cannonlake */
@@ -473,7 +479,6 @@ const struct sof_intel_dsp_desc cnl_chip_info = { 
	.disable_interrupts = hda_dsp_disable_interrupts,

	.hw_ip_version = SOF_INTEL_CAVS_1_8,

};

EXPORT_SYMBOL_NS(cnl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);



/*

 * JasperLake is technically derived from IceLake, and should be in
@@ -509,4 +514,4 @@ const struct sof_intel_dsp_desc jsl_chip_info = { 
	.disable_interrupts = hda_dsp_disable_interrupts,

	.hw_ip_version = SOF_INTEL_CAVS_2_0,

};

EXPORT_SYMBOL_NS(jsl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);
 
EXPORT_SYMBOL_NS(jsl_chip_info, SND_SOC_SOF_INTEL_CNL);

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

+1 −0
Original line number Diff line number Diff line
@@ -105,3 +105,4 @@ const struct snd_sof_dsp_ops sof_hda_common_ops = { 


	.dsp_arch_ops = &sof_xtensa_arch_ops,

};

EXPORT_SYMBOL_NS(sof_hda_common_ops, SND_SOC_SOF_INTEL_HDA_COMMON);