ASoC: SOF: Compile and runtime IPC version selection

The new IPC4 version is only supported by Intel platforms, iMX, AMD and
MediaTek only uses the standard SOF IPC.
There is no need for these platforms to build kernel support for IPC4 as
it is just dead code for them.

SND_SOC_SOF_IPC3 and SND_SOC_SOF_INTEL_IPC4 is introduced to allow compile
time selection and exclusion of IPC implementations.

To avoid randconfig failures add also support for runtime selection of
the IPC ops in ipc.c based on sdev->pdata->ipc_type

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220614075618.28605-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
index 4542868cd730f435bca5913e503e9fa9b49d1638..e90f173d067c9aba54b4e8e99933eca47913b003 100644 (file)
--- a/sound/soc/sof/Kconfig
+++ b/sound/soc/sof/Kconfig
@@ -252,6 +252,13 @@ config SND_SOC_SOF_PROBE_WORK_QUEUE
          When selected, the probe is handled in two steps, for example to
          avoid lockdeps if request_module is used in the probe.
 
+# Supported IPC versions
+config SND_SOC_SOF_IPC3
+       bool
+
+config SND_SOC_SOF_INTEL_IPC4
+       bool
+
 source "sound/soc/sof/amd/Kconfig"
 source "sound/soc/sof/imx/Kconfig"
 source "sound/soc/sof/intel/Kconfig"

diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile
index 2fa8088707a8a7e1dec66cc9526b378dce623400..9a74ed116ed92a2263aaeed7ab0ab165428e1e88 100644 (file)
--- a/sound/soc/sof/Makefile
+++ b/sound/soc/sof/Makefile
@@ -1,10 +1,18 @@
 # 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 iomem-utils.o sof-audio.o stream-ipc.o\
-               ipc3-topology.o ipc3-control.o ipc3.o ipc3-pcm.o ipc3-loader.o\
-               ipc3-dtrace.o\
-               ipc4.o ipc4-loader.o ipc4-topology.o ipc4-control.o ipc4-pcm.o
+               control.o trace.o iomem-utils.o sof-audio.o stream-ipc.o
+
+# IPC implementations
+ifneq ($(CONFIG_SND_SOC_SOF_IPC3),)
+snd-sof-objs +=        ipc3.o ipc3-loader.o ipc3-topology.o ipc3-control.o ipc3-pcm.o\
+               ipc3-dtrace.o
+endif
+ifneq ($(CONFIG_SND_SOC_SOF_INTEL_IPC4),)
+snd-sof-objs += ipc4.o ipc4-loader.o ipc4-topology.o ipc4-control.o ipc4-pcm.o
+endif
+
+# SOF client support
 ifneq ($(CONFIG_SND_SOC_SOF_CLIENT),)
 snd-sof-objs += sof-client.o
 endif

diff --git a/sound/soc/sof/amd/Kconfig b/sound/soc/sof/amd/Kconfig
index 085232e04582ece53dc9d9659b2036cded7aebee..190c85d57047bfc54fc07f26bd5c21e5e3e401d0 100644 (file)
--- a/sound/soc/sof/amd/Kconfig
+++ b/sound/soc/sof/amd/Kconfig
@@ -17,6 +17,7 @@ if SND_SOC_SOF_AMD_TOPLEVEL
 config SND_SOC_SOF_AMD_COMMON
        tristate
        select SND_SOC_SOF
+       select SND_SOC_SOF_IPC3
        select SND_SOC_SOF_PCI_DEV
        select SND_AMD_ACP_CONFIG
        select SND_SOC_ACPI if ACPI

diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig
index 9b8d5bb1e4491d245792991f21b44b490b9f499f..cc6e695f913a121b4fe2b6b33fc9e5ea7cbd7563 100644 (file)
--- a/sound/soc/sof/imx/Kconfig
+++ b/sound/soc/sof/imx/Kconfig
@@ -15,6 +15,7 @@ config SND_SOC_SOF_IMX_COMMON
        tristate
        select SND_SOC_SOF_OF_DEV
        select SND_SOC_SOF
+       select SND_SOC_SOF_IPC3
        select SND_SOC_SOF_XTENSA
        select SND_SOC_SOF_COMPRESS
        help

diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 0def2aa5581dac69ae09fb931de11e2c883b8364..80cdc3788bbed608073cd64f5eebdd9670aeaf53 100644 (file)
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -40,6 +40,7 @@ if SND_SOC_SOF_ACPI
 config SND_SOC_SOF_BAYTRAIL
        tristate "SOF support for Baytrail, Braswell and Cherrytrail"
        default SND_SOC_SOF_ACPI
+       select SND_SOC_SOF_IPC3
        select SND_SOC_SOF_INTEL_COMMON
        select SND_SOC_SOF_INTEL_ATOM_HIFI_EP
        select SND_SOC_SOF_ACPI_DEV
@@ -60,6 +61,7 @@ config SND_SOC_SOF_BAYTRAIL
 config SND_SOC_SOF_BROADWELL
        tristate "SOF support for Broadwell"
        default SND_SOC_SOF_ACPI
+       select SND_SOC_SOF_IPC3
        select SND_SOC_SOF_INTEL_COMMON
        select SND_SOC_SOF_INTEL_HIFI_EP_IPC
        select SND_SOC_SOF_ACPI_DEV
@@ -85,6 +87,7 @@ config SND_SOC_SOF_MERRIFIELD
        tristate "SOF support for Tangier/Merrifield"
        default SND_SOC_SOF_PCI
        select SND_SOC_SOF_PCI_DEV
+       select SND_SOC_SOF_IPC3
        select SND_SOC_SOF_INTEL_ATOM_HIFI_EP
        help
          This adds support for Sound Open Firmware for Intel(R) platforms
@@ -95,6 +98,8 @@ config SND_SOC_SOF_MERRIFIELD
 config SND_SOC_SOF_INTEL_APL
        tristate
        select SND_SOC_SOF_HDA_COMMON
+       select SND_SOC_SOF_IPC3
+       select SND_SOC_SOF_INTEL_IPC4
 
 config SND_SOC_SOF_APOLLOLAKE
        tristate "SOF support for Apollolake"
@@ -120,6 +125,8 @@ config SND_SOC_SOF_INTEL_CNL
        tristate
        select SND_SOC_SOF_HDA_COMMON
        select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
+       select SND_SOC_SOF_IPC3
+       select SND_SOC_SOF_INTEL_IPC4
 
 config SND_SOC_SOF_CANNONLAKE
        tristate "SOF support for Cannonlake"
@@ -154,6 +161,8 @@ config SND_SOC_SOF_INTEL_ICL
        tristate
        select SND_SOC_SOF_HDA_COMMON
        select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
+       select SND_SOC_SOF_IPC3
+       select SND_SOC_SOF_INTEL_IPC4
 
 config SND_SOC_SOF_ICELAKE
        tristate "SOF support for Icelake"
@@ -179,6 +188,8 @@ config SND_SOC_SOF_INTEL_TGL
        tristate
        select SND_SOC_SOF_HDA_COMMON
        select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
+       select SND_SOC_SOF_IPC3
+       select SND_SOC_SOF_INTEL_IPC4
 
 config SND_SOC_SOF_TIGERLAKE
        tristate "SOF support for Tigerlake"

diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c
index c5aef5fc056b59f1da77d379f6bfd903abb46257..6ed3f9b6a0c4e60084d98ac022992d903c815bec 100644 (file)
--- a/sound/soc/sof/ipc.c
+++ b/sound/soc/sof/ipc.c
@@ -155,12 +155,22 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev)
 
        init_waitqueue_head(&msg->waitq);
 
-       /*
-        * Use IPC3 ops as it is the only available version now. With the addition of new IPC
-        * versions, this will need to be modified to use the selected version at runtime.
-        */
-       ipc->ops = &ipc3_ops;
-       ops = ipc->ops;
+       switch (sdev->pdata->ipc_type) {
+#if defined(CONFIG_SND_SOC_SOF_IPC3)
+       case SOF_IPC:
+               ops = &ipc3_ops;
+               break;
+#endif
+#if defined(CONFIG_SND_SOC_SOF_INTEL_IPC4)
+       case SOF_INTEL_IPC4:
+               ops = &ipc4_ops;
+               break;
+#endif
+       default:
+               dev_err(sdev->dev, "Not supported IPC version: %d\n",
+                       sdev->pdata->ipc_type);
+               return NULL;
+       }
 
        /* check for mandatory ops */
        if (!ops->tx_msg || !ops->rx_msg || !ops->set_get_data || !ops->get_reply) {
@@ -190,6 +200,8 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev)
                return NULL;
        }
 
+       ipc->ops = ops;
+
        return ipc;
 }
 EXPORT_SYMBOL(snd_sof_ipc_init);

diff --git a/sound/soc/sof/mediatek/Kconfig b/sound/soc/sof/mediatek/Kconfig
index a149dd1b3f44c558af27066945bba56619846238..4a2eddf6009a5593651f09dc17af77214760f232 100644 (file)
--- a/sound/soc/sof/mediatek/Kconfig
+++ b/sound/soc/sof/mediatek/Kconfig
@@ -15,6 +15,7 @@ config SND_SOC_SOF_MTK_COMMON
        tristate
        select SND_SOC_SOF_OF_DEV
        select SND_SOC_SOF
+       select SND_SOC_SOF_IPC3
        select SND_SOC_SOF_XTENSA
        select SND_SOC_SOF_COMPRESS
        help