ASoC: SOF: add default IPC capability and file paths

This patch adds a default IPC type for each platform, along with file
paths to be used for each IPC type. To make reviews simpler, we only
modify platform descriptors in this table, the information will be
used in the next patch.

The Intel IPCv4 is only supported on Intel platforms after APL, and
not by default. In follow-up patches, support for SKL and KBL will be
added, and in those two cases the IPCv4 will be the default (and only
supported mode).

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20220414184817.362215-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/sof.h b/include/sound/sof.h
index 69066fe..a65af85 100644 (file)
--- a/include/sound/sof.h
+++ b/include/sound/sof.h
@@ -124,6 +124,10 @@ struct sof_dev_desc {
        /* defaults for no codec mode */
        const char *nocodec_tplg_filename;
 
+       /* information on supported IPCs */
+       unsigned int ipc_supported_mask;
+       enum sof_ipc_type ipc_default;
+
        /* defaults paths for firmware and topology files */
        const char *default_fw_path[SOF_IPC_TYPE_COUNT];
        const char *default_tplg_path[SOF_IPC_TYPE_COUNT];

diff --git a/sound/soc/sof/amd/pci-rn.c b/sound/soc/sof/amd/pci-rn.c
index e2dfe60..34b153f 100644 (file)
--- a/sound/soc/sof/amd/pci-rn.c
+++ b/sound/soc/sof/amd/pci-rn.c
@@ -54,6 +54,8 @@ static const struct sof_dev_desc renoir_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info              = &renoir_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "amd/sof",
        },

diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
index d2c9e6d..cdbbd20 100644 (file)
--- a/sound/soc/sof/imx/imx8.c
+++ b/sound/soc/sof/imx/imx8.c
@@ -613,6 +613,8 @@ static const struct snd_sof_dsp_ops sof_imx8x_ops = {
 };
 
 static struct sof_dev_desc sof_of_imx8qxp_desc = {
+       .ipc_supported_mask     = BIT(SOF_IPC),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "imx/sof",
        },
@@ -625,6 +627,8 @@ static struct sof_dev_desc sof_of_imx8qxp_desc = {
 };
 
 static struct sof_dev_desc sof_of_imx8qm_desc = {
+       .ipc_supported_mask     = BIT(SOF_IPC),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "imx/sof",
        },

diff --git a/sound/soc/sof/imx/imx8m.c b/sound/soc/sof/imx/imx8m.c
index 7aa695a..cbee484 100644 (file)
--- a/sound/soc/sof/imx/imx8m.c
+++ b/sound/soc/sof/imx/imx8m.c
@@ -473,6 +473,8 @@ static const struct snd_sof_dsp_ops sof_imx8m_ops = {
 };
 
 static struct sof_dev_desc sof_of_imx8mp_desc = {
+       .ipc_supported_mask     = BIT(SOF_IPC),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "imx/sof",
        },

diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
index bc06f18..a0f22b1 100644 (file)
--- a/sound/soc/sof/intel/bdw.c
+++ b/sound/soc/sof/intel/bdw.c
@@ -646,6 +646,8 @@ static const struct sof_dev_desc sof_acpi_broadwell_desc = {
        .resindex_imr_base = -1,
        .irqindex_host_ipc = 0,
        .chip_info = &bdw_chip_info,
+       .ipc_supported_mask = BIT(SOF_IPC),
+       .ipc_default = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
        },

diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c
index 5281509..427b5c5 100644 (file)
--- a/sound/soc/sof/intel/byt.c
+++ b/sound/soc/sof/intel/byt.c
@@ -388,6 +388,8 @@ static const struct sof_dev_desc sof_acpi_baytrailcr_desc = {
        .resindex_imr_base = 2,
        .irqindex_host_ipc = 0,
        .chip_info = &byt_chip_info,
+       .ipc_supported_mask = BIT(SOF_IPC),
+       .ipc_default = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
        },
@@ -406,6 +408,8 @@ static const struct sof_dev_desc sof_acpi_baytrail_desc = {
        .resindex_imr_base = 2,
        .irqindex_host_ipc = 5,
        .chip_info = &byt_chip_info,
+       .ipc_supported_mask = BIT(SOF_IPC),
+       .ipc_default = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
        },
@@ -424,6 +428,8 @@ static const struct sof_dev_desc sof_acpi_cherrytrail_desc = {
        .resindex_imr_base = 2,
        .irqindex_host_ipc = 5,
        .chip_info = &cht_chip_info,
+       .ipc_supported_mask = BIT(SOF_IPC),
+       .ipc_default = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
        },

diff --git a/sound/soc/sof/intel/pci-apl.c b/sound/soc/sof/intel/pci-apl.c
index 802480a..c173f20 100644 (file)
--- a/sound/soc/sof/intel/pci-apl.c
+++ b/sound/soc/sof/intel/pci-apl.c
@@ -27,11 +27,15 @@ static const struct sof_dev_desc bxt_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &apl_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/apl",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-apl.ri",
        .nocodec_tplg_filename = "sof-apl-nocodec.tplg",
@@ -46,11 +50,15 @@ static const struct sof_dev_desc glk_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &apl_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/glk",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-glk.ri",
        .nocodec_tplg_filename = "sof-glk-nocodec.tplg",

diff --git a/sound/soc/sof/intel/pci-cnl.c b/sound/soc/sof/intel/pci-cnl.c
index b8206a9..b521939 100644 (file)
--- a/sound/soc/sof/intel/pci-cnl.c
+++ b/sound/soc/sof/intel/pci-cnl.c
@@ -28,11 +28,15 @@ static const struct sof_dev_desc cnl_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &cnl_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/cnl",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-cnl.ri",
        .nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
@@ -48,11 +52,15 @@ static const struct sof_dev_desc cfl_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &cnl_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/cnl",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-cfl.ri",
        .nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
@@ -68,11 +76,15 @@ static const struct sof_dev_desc cml_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &cnl_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/cnl",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-cml.ri",
        .nocodec_tplg_filename = "sof-cnl-nocodec.tplg",

diff --git a/sound/soc/sof/intel/pci-icl.c b/sound/soc/sof/intel/pci-icl.c
index a27cd4f..c1ed81b 100644 (file)
--- a/sound/soc/sof/intel/pci-icl.c
+++ b/sound/soc/sof/intel/pci-icl.c
@@ -28,11 +28,15 @@ static const struct sof_dev_desc icl_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &icl_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/icl",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-icl.ri",
        .nocodec_tplg_filename = "sof-icl-nocodec.tplg",
@@ -47,11 +51,15 @@ static const struct sof_dev_desc jsl_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &jsl_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/jsl",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-jsl.ri",
        .nocodec_tplg_filename = "sof-jsl-nocodec.tplg",

diff --git a/sound/soc/sof/intel/pci-tgl.c b/sound/soc/sof/intel/pci-tgl.c
index 49d165f..6a44143 100644 (file)
--- a/sound/soc/sof/intel/pci-tgl.c
+++ b/sound/soc/sof/intel/pci-tgl.c
@@ -28,11 +28,15 @@ static const struct sof_dev_desc tgl_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &tgl_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/tgl",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-tgl.ri",
        .nocodec_tplg_filename = "sof-tgl-nocodec.tplg",
@@ -48,11 +52,15 @@ static const struct sof_dev_desc tglh_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &tglh_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/tgl-h",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-tgl-h.ri",
        .nocodec_tplg_filename = "sof-tgl-nocodec.tplg",
@@ -67,11 +75,15 @@ static const struct sof_dev_desc ehl_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &ehl_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/ehl",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-ehl.ri",
        .nocodec_tplg_filename = "sof-ehl-nocodec.tplg",
@@ -87,11 +99,15 @@ static const struct sof_dev_desc adls_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &adls_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/adl-s",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-adl-s.ri",
        .nocodec_tplg_filename = "sof-adl-nocodec.tplg",
@@ -107,11 +123,15 @@ static const struct sof_dev_desc adl_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info = &tgl_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
+               [SOF_INTEL_IPC4] = "intel/avs/adl",
        },
        .default_tplg_path = {
                [SOF_IPC] = "intel/sof-tplg",
+               [SOF_INTEL_IPC4] = "intel/avs-tplg",
        },
        .default_fw_filename = "sof-adl.ri",
        .nocodec_tplg_filename = "sof-adl-nocodec.tplg",

diff --git a/sound/soc/sof/intel/pci-tng.c b/sound/soc/sof/intel/pci-tng.c
index d8d0180..18cf9f3 100644 (file)
--- a/sound/soc/sof/intel/pci-tng.c
+++ b/sound/soc/sof/intel/pci-tng.c
@@ -219,6 +219,8 @@ static const struct sof_dev_desc tng_desc = {
        .resindex_imr_base      = 0,
        .irqindex_host_ipc      = -1,
        .chip_info = &tng_chip_info,
+       .ipc_supported_mask     = BIT(SOF_IPC),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "intel/sof",
        },

diff --git a/sound/soc/sof/mediatek/mt8195/mt8195.c b/sound/soc/sof/mediatek/mt8195/mt8195.c
index 0982bf1..7291538 100644 (file)
--- a/sound/soc/sof/mediatek/mt8195/mt8195.c
+++ b/sound/soc/sof/mediatek/mt8195/mt8195.c
@@ -440,6 +440,8 @@ static const struct snd_sof_dsp_ops sof_mt8195_ops = {
 };
 
 static const struct sof_dev_desc sof_of_mt8195_desc = {
+       .ipc_supported_mask     = BIT(SOF_IPC),
+       .ipc_default            = SOF_IPC,
        .default_fw_path = {
                [SOF_IPC] = "mediatek/sof",
        },