ASoC: SOF: Add a new fw loader op to reload_module libraries

Add a new op to struct sof_ipc_fw_loader_ops, reload_libraries, to
support reloading the libraries.

For HDA platforms, this is called during the post_fw_run op after the
base FW is cold booted with the exception of the first boot.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Author: ranj063

sound/soc/sof/intel/hda-loader.c

@@ -538,7 +538,6 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev)
 	ret = hda_cl_copy_fw(sdev, hext_stream);
 	if (!ret) {
 		dev_dbg(sdev->dev, "Firmware download successful, booting...\n");
-		hda->skip_imr_boot = false;
 	} else {
 		snd_sof_dsp_dbg_dump(sdev, "Firmware download failed",
 				     SOF_DBG_DUMP_PCI | SOF_DBG_DUMP_MBOX);
@@ -584,6 +583,7 @@ int hda_dsp_pre_fw_run(struct snd_sof_dev *sdev)
 /* post fw run operations */
 int hda_dsp_post_fw_run(struct snd_sof_dev *sdev)
 {
+	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
 	int ret;
 
 	if (sdev->first_boot) {
@@ -601,8 +601,17 @@ int hda_dsp_post_fw_run(struct snd_sof_dev *sdev)
 		    (sdev->fw_ready.flags & SOF_IPC_INFO_D3_PERSISTENT ||
 		     sdev->pdata->ipc_type == SOF_INTEL_IPC4))
 			hdev->imrboot_supported = true;
+	} else {
+		/* reload all 3rd party module libraries during cold boot */
+		if (!hda->imrboot_supported || hda->skip_imr_boot) {
+			ret = sdev->ipc->ops->fw_loader->reload_libraries(sdev);
+			if (ret < 0)
+				return ret;
+		}
 	}
 
+	hda->skip_imr_boot = false;
+
 	hda_sdw_int_enable(sdev, true);
 
 	/* re-enable clock gating and power gating */

sound/soc/sof/ipc4-loader.c

@@ -352,9 +352,39 @@ static int sof_ipc4_load_library(struct snd_sof_dev *sdev, struct snd_sof_widget
 	return ret;
 }
 
+static int sof_ipc4_reload_libraries(struct snd_sof_dev *sdev)
+{
+	struct sof_ipc4_fw_data *ipc4_data = sdev->private;
+	int i, ret;
+
+	if (sof_ops(sdev)->load_library) {
+		dev_err(sdev->dev, "Loading module libraries not supported\n");
+		return -EINVAL;
+	}
+
+	/* Index 0 is reserved for base firmware */
+	for (i = 1; i < ipc4_data->max_fw_libs; i++) {
+		if (!ipc4_data->module_lib_info[i].id)
+			break;
+
+		ret = sof_ops(sdev)->load_library(sdev, &ipc4_data->module_lib_info[i]);
+		if (ret < 0) {
+			dev_err(sdev->dev, "Failed loading module FW library: %s\n",
+				ipc4_data->module_lib_info[i].name);
+			return ret;
+		}
+
+		dev_dbg(sdev->dev, "Loaded FW library for module: %s\n",
+			ipc4_data->module_lib_info[i].name);
+	}
+
+	return 0;
+}
+
 const struct sof_ipc_fw_loader_ops ipc4_loader_ops = {
 	.validate = sof_ipc4_validate_firmware,
 	.parse_ext_manifest = sof_ipc4_fw_parse_ext_man,
 	.query_fw_configuration = sof_ipc4_query_fw_configuration,
 	.load_library = sof_ipc4_load_library,
+	.reload_libraries = sof_ipc4_reload_libraries,
 };

sound/soc/sof/sof-priv.h

@@ -427,6 +427,7 @@ struct snd_sof_widget;
  *			configuration from the booted firmware.
  *			Executed after the first successful firmware boot.
  * @load_library: Optional function pointer to load a 3rd party module library
+ * @reload_libraries: Optional function pointer to reload all needed 3rd party module libraries
  */
 struct sof_ipc_fw_loader_ops {
 	int (*validate)(struct snd_sof_dev *sdev);
@@ -435,6 +436,7 @@ struct sof_ipc_fw_loader_ops {
 	int (*load_fw_to_dsp)(struct snd_sof_dev *sdev);
 	int (*query_fw_configuration)(struct snd_sof_dev *sdev);
 	int (*load_library)(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget);
+	int (*reload_libraries)(struct snd_sof_dev *sdev);
 };
 
 struct sof_ipc_tplg_ops;