ASoC: SOF: IPC fallback and extended IPC file profile

include/sound/sof.h

@@ -57,6 +57,17 @@ enum sof_ipc_type {
 	SOF_IPC_TYPE_COUNT
 };
 
+struct sof_loadable_file_profile {
+	enum sof_ipc_type ipc_type;
+
+	const char *fw_path;
+	const char *fw_name;
+	const char *fw_lib_path;
+	const char *fw_path_postfix;
+	const char *tplg_path;
+	const char *tplg_name;
+};
+
 /*
  * SOF Platform data.
  */
@@ -86,6 +97,9 @@ struct snd_sof_pdata {
 	/* descriptor */
 	const struct sof_dev_desc *desc;
 
+	/* platform's preferred IPC type and path overrides */
+	struct sof_loadable_file_profile ipc_file_profile_base;
+
 	/* firmware and topology filenames */
 	const char *fw_filename_prefix;
 	const char *fw_filename;
@@ -143,13 +157,9 @@ struct sof_dev_desc {
 	/* The platform supports DSPless mode */
 	bool dspless_mode_supported;
 
-	/* defaults paths for firmware, library and topology files */
-	const char *default_fw_path[SOF_IPC_TYPE_COUNT];
-	const char *default_lib_path[SOF_IPC_TYPE_COUNT];
-	const char *default_tplg_path[SOF_IPC_TYPE_COUNT];
-
-	/* default firmware name */
-	const char *default_fw_filename[SOF_IPC_TYPE_COUNT];
+	/* strings used for the firmware layout path/filename creation */
+	const char *vendor;
+	const char *platform;
 
 	struct snd_sof_dsp_ops *ops;
 	int (*ops_init)(struct snd_sof_dev *sdev);

sound/soc/sof/Kconfig

@@ -126,6 +126,17 @@ config SND_SOC_SOF_STRICT_ABI_CHECKS
 	  If you are not involved in SOF releases and CI development,
 	  select "N".
 
+config SND_SOC_SOF_ALLOW_FALLBACK_TO_NEWER_IPC_VERSION
+	bool "SOF allow fallback to newer IPC version"
+	help
+	  This option will allow the kernel to try to 'fallback' to a newer IPC
+	  version if there are missing firmware files to satisfy the default IPC
+	  version.
+	  IPC version fallback to older versions is not affected by this option,
+	  it is always available.
+	  Say Y if you are involved in SOF development and need this option.
+	  If not, select N.
+
 config SND_SOC_SOF_DEBUG
 	bool "SOF debugging features"
 	help

sound/soc/sof/Makefile

@@ -1,7 +1,8 @@
 # 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
+		control.o trace.o iomem-utils.o sof-audio.o stream-ipc.o\
+		fw-file-profile.o
 
 # IPC implementations
 ifneq ($(CONFIG_SND_SOC_SOF_IPC3),)

sound/soc/sof/amd/pci-rmb.c

@@ -49,15 +49,8 @@ static const struct sof_dev_desc rembrandt_desc = {
 	.chip_info		= &rembrandt_chip_info,
 	.ipc_supported_mask     = BIT(SOF_IPC_TYPE_3),
 	.ipc_default            = SOF_IPC_TYPE_3,
-	.default_fw_path	= {
-		[SOF_IPC_TYPE_3] = "amd/sof",
-	},
-	.default_tplg_path	= {
-		[SOF_IPC_TYPE_3] = "amd/sof-tplg",
-	},
-	.default_fw_filename	= {
-		[SOF_IPC_TYPE_3] = "sof-rmb.ri",
-	},
+	.vendor			= "amd",
+	.platform		= "rmb",
 	.nocodec_tplg_filename	= "sof-acp.tplg",
 	.ops			= &sof_rembrandt_ops,
 	.ops_init		= sof_rembrandt_ops_init,

sound/soc/sof/amd/pci-rn.c

@@ -49,15 +49,8 @@ static const struct sof_dev_desc renoir_desc = {
 	.chip_info		= &renoir_chip_info,
 	.ipc_supported_mask	= BIT(SOF_IPC_TYPE_3),
 	.ipc_default		= SOF_IPC_TYPE_3,
-	.default_fw_path = {
-		[SOF_IPC_TYPE_3] = "amd/sof",
-	},
-	.default_tplg_path = {
-		[SOF_IPC_TYPE_3] = "amd/sof-tplg",
-	},
-	.default_fw_filename	= {
-		[SOF_IPC_TYPE_3] = "sof-rn.ri",
-	},
+	.vendor			= "amd",
+	.platform		= "rn",
 	.nocodec_tplg_filename	= "sof-acp.tplg",
 	.ops			= &sof_renoir_ops,
 	.ops_init		= sof_renoir_ops_init,

sound/soc/sof/amd/pci-vangogh.c

@@ -47,15 +47,8 @@ static const struct sof_dev_desc vangogh_desc = {
 	.chip_info		= &vangogh_chip_info,
 	.ipc_supported_mask     = BIT(SOF_IPC_TYPE_3),
 	.ipc_default            = SOF_IPC_TYPE_3,
-	.default_fw_path	= {
-		[SOF_IPC_TYPE_3] = "amd/sof",
-	},
-	.default_tplg_path	= {
-		[SOF_IPC_TYPE_3] = "amd/sof-tplg",
-	},
-	.default_fw_filename	= {
-		[SOF_IPC_TYPE_3] = "sof-vangogh.ri",
-	},
+	.vendor			= "amd",
+	.platform		= "vangogh",
 	.nocodec_tplg_filename	= "sof-acp.tplg",
 	.ops			= &sof_vangogh_ops,
 	.ops_init		= sof_vangogh_ops_init,