ASoC: SOF: ipc4: Fetch CPC from tplg mod_cfg or from manifest

include/uapi/sound/sof/tokens.h

@@ -99,6 +99,7 @@
 #define SOF_TKN_COMP_OUTPUT_PIN_BINDING_WNAME	414
 #define SOF_TKN_COMP_NUM_INPUT_AUDIO_FORMATS	415
 #define SOF_TKN_COMP_NUM_OUTPUT_AUDIO_FORMATS	416
+#define SOF_TKN_COMP_NUM_MOD_CFGS 417
 
 
 /* SSP */
@@ -203,6 +204,11 @@
 #define SOF_TKN_INTEL_COPIER_NODE_TYPE 1980
 #define SOF_TKN_INTEL_COPIER_DEEP_BUFFER_DMA_MS	1981
 
+/* module configurations */
+#define SOF_TKN_MOD_CFG_IBS 1990
+#define SOF_TKN_MOD_CFG_OBS 1991
+#define SOF_TKN_MOD_CFG_CPC 1992
+
 /* ACP I2S */
 #define SOF_TKN_AMD_ACPI2S_RATE 1700
 #define SOF_TKN_AMD_ACPI2S_CH 1701

sound/soc/sof/intel/apl.c

@@ -64,6 +64,9 @@ int sof_apl_ops_init(struct snd_sof_dev *sdev)
 
  ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_1_5;
 
+ /* Maximum core frequency is 400MHz */
+ ipc4_data->max_kcps = 400000;
+
  /* External library loading support */
  ipc4_data->load_library = hda_dsp_ipc4_load_library;
 

sound/soc/sof/intel/cnl.c

@@ -411,6 +411,9 @@ int sof_cnl_ops_init(struct snd_sof_dev *sdev)
 
  ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_1_8;
 
+ /* Maximum core frequency is 400MHz */
+ ipc4_data->max_kcps = 400000;
+
  /* External library loading support */
  ipc4_data->load_library = hda_dsp_ipc4_load_library;
 

sound/soc/sof/intel/icl.c

@@ -132,6 +132,9 @@ int sof_icl_ops_init(struct snd_sof_dev *sdev)
 
  ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_2;
 
+ /* Maximum core frequency is 400MHz */
+ ipc4_data->max_kcps = 400000;
+
  /* External library loading support */
  ipc4_data->load_library = hda_dsp_ipc4_load_library;
 

sound/soc/sof/intel/mtl.c

@@ -704,6 +704,9 @@ int sof_mtl_ops_init(struct snd_sof_dev *sdev)
 
 	ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_2;
 
+	/* Maximum core frequency is 400MHz */
+	ipc4_data->max_kcps = 400000;
+
 	/* External library loading support */
 	ipc4_data->load_library = hda_dsp_ipc4_load_library;
 

sound/soc/sof/intel/skl.c

@@ -72,6 +72,9 @@ int sof_skl_ops_init(struct snd_sof_dev *sdev)
 
 	ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_1_5;
 
+	/* Maximum core frequency is 400MHz */
+	ipc4_data->max_kcps = 400000;
+
 	sof_skl_ops.get_window_offset = skl_dsp_ipc_get_window_offset;
 	sof_skl_ops.get_mailbox_offset = skl_dsp_ipc_get_mailbox_offset;
 

sound/soc/sof/intel/tgl.c

@@ -91,6 +91,9 @@ int sof_tgl_ops_init(struct snd_sof_dev *sdev)
 
  ipc4_data->mtrace_type = SOF_IPC4_MTRACE_INTEL_CAVS_2;
 
+ /* Maximum core frequency is 400MHz */
+ ipc4_data->max_kcps = 400000;
+
  /* External library loading support */
  ipc4_data->load_library = hda_dsp_ipc4_load_library;
 

sound/soc/sof/ipc4-loader.c

@@ -112,16 +112,13 @@ static ssize_t sof_ipc4_fw_parse_ext_man(struct snd_sof_dev *sdev,
  return -EINVAL;
  }
 
- /* a module's config is always the same size */
- fw_module->bss_size = fm_config[fm_entry->cfg_offset].is_bytes;
+ fw_module->fw_mod_cfg = &fm_config[fm_entry->cfg_offset];
 
  dev_dbg(sdev->dev,
  "module %s: UUID %pUL cfg_count: %u, bss_size: %#x\n",
  fm_entry->name, &fm_entry->uuid, fm_entry->cfg_count,
-fw_module->bss_size);
+fm_config[fm_entry->cfg_offset].is_bytes);
  } else {
- fw_module->bss_size = 0;
-
  dev_dbg(sdev->dev, "module %s: UUID %pUL\n", fm_entry->name,
  &fm_entry->uuid);
  }
@@ -426,6 +423,58 @@ int sof_ipc4_reload_fw_libraries(struct snd_sof_dev *sdev)
 	return ret;
 }
 
+/**
+ * sof_ipc4_update_cpc_from_manifest - Update the cpc in base config from manifest
+ * @sdev: SOF device
+ * @fw_module: pointer struct sof_ipc4_fw_module to parse
+ * @basecfg: Pointer to the base_config to update
+ * @exact_match: Only consider exact matches based on obs/ibs
+ */
+void sof_ipc4_update_cpc_from_manifest(struct snd_sof_dev *sdev,
+ struct sof_ipc4_fw_module *fw_module,
+ struct sof_ipc4_base_module_cfg *basecfg,
+ bool exact_match)
+{
+	const struct sof_man4_module_config *fw_mod_cfg;
+	u32 cpc_pick = 0;
+	u32 max_cpc = 0;
+	int i;
+
+	/* The CPC is set from topology, ignoring manifest */
+	if (basecfg->cpc)
+ return;
+
+	if (!fw_module || !fw_module->fw_mod_cfg)
+ return;
+
+	fw_mod_cfg = fw_module->fw_mod_cfg;
+	for (i = 0; i < fw_module->man4_module_entry.cfg_count; i++) {
+ if (basecfg->obs == fw_mod_cfg[i].obs &&
+ basecfg->ibs == fw_mod_cfg[i].ibs &&
+ cpc_pick < fw_mod_cfg[i].cpc)
+ cpc_pick = fw_mod_cfg[i].cpc;
+
+ if (max_cpc < fw_mod_cfg[i].cpc)
+ max_cpc = fw_mod_cfg[i].cpc;
+	}
+
+	if (!cpc_pick) {
+ if (exact_match)
+ return;
+
+ dev_dbg(sdev->dev,
+ "%s: No exact CPC match from manifest (ibs/obs: %u/%u)\n",
+ fw_module->man4_module_entry.name, basecfg->ibs, basecfg->obs);
+
+ cpc_pick = max_cpc;
+	}
+
+	dev_dbg(sdev->dev, "%s: CPC from manifest: %u\n",
+ fw_module->man4_module_entry.name, cpc_pick);
+
+	basecfg->cpc = cpc_pick;
+}
+
 const struct sof_ipc_fw_loader_ops ipc4_loader_ops = {
 	.validate = sof_ipc4_validate_firmware,
 	.parse_ext_manifest = sof_ipc4_fw_parse_basefw_ext_man,

sound/soc/sof/ipc4-pcm.c

@@ -465,9 +465,9 @@ static int sof_ipc4_pcm_dai_link_fixup_rate(struct snd_sof_dev *sdev,
  struct snd_pcm_hw_params *params,
  struct sof_ipc4_copier *ipc4_copier)
 {
-	struct sof_ipc4_pin_format *pin_fmts = ipc4_copier->available_fmt.input_pin_fmts;
+	struct sof_ipc4_pin_format *pin_fmts = ipc4_copier->module_params.input_pin_fmts;
 	struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
-	int num_input_formats = ipc4_copier->available_fmt.num_input_formats;
+	int num_input_formats = ipc4_copier->module_params.num_input_formats;
 	unsigned int fe_rate = params_rate(params);
 	bool fe_be_rate_match = false;
 	bool single_be_rate = true;

sound/soc/sof/ipc4-priv.h

@@ -28,14 +28,14 @@ enum sof_ipc4_mtrace_type {
 /**
  * struct sof_ipc4_fw_module - IPC4 module info
  * @sof_man4_module: Module info
+ * @fw_mod_cfg: Pointer to the module config start of the module
  * @m_ida: Module instance identifier
- * @bss_size: Module object size
  * @private: Module private data
  */
 struct sof_ipc4_fw_module {
 	struct sof_man4_module man4_module_entry;
+	const struct sof_man4_module_config *fw_mod_cfg;
 	struct ida m_ida;
-	u32 bss_size;
 	void *private;
 };
 
@@ -69,6 +69,7 @@ struct sof_ipc4_fw_library {
  * @max_num_pipelines: max number of pipelines
  * @max_libs_count: Maximum number of libraries support by the FW including the
  * base firmware
+ * @max_kcps: maximum cycles per second * 1000, iow the maximum core frequency
  *
  * @load_library: Callback function for platform dependent library loading
  * @pipeline_state_mutex: Mutex to protect pipeline triggers, ref counts, states and deletion
@@ -81,6 +82,7 @@ struct sof_ipc4_fw_data {
 	u32 mtrace_log_bytes;
 	int max_num_pipelines;
 	u32 max_libs_count;
+	u32 max_kcps;
 
 	int (*load_library)(struct snd_sof_dev *sdev,
  struct sof_ipc4_fw_library *fw_lib, bool reload);
@@ -114,4 +116,11 @@ int sof_ipc4_query_fw_configuration(struct snd_sof_dev *sdev);
 int sof_ipc4_reload_fw_libraries(struct snd_sof_dev *sdev);
 struct sof_ipc4_fw_module *sof_ipc4_find_module_by_uuid(struct snd_sof_dev *sdev,
  const guid_t *uuid);
+
+struct sof_ipc4_base_module_cfg;
+void sof_ipc4_update_cpc_from_manifest(struct snd_sof_dev *sdev,
+ struct sof_ipc4_fw_module *fw_module,
+ struct sof_ipc4_base_module_cfg *basecfg,
+ bool exact_match);
+
 #endif