ASoC: SOF: ipc4-loader: get max pipeline number

Get max pipeline number from firmware configuration.

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

diff --git a/sound/soc/sof/ipc4-loader.c b/sound/soc/sof/ipc4-loader.c
index 702196774c50b8293b225085b9ec20da56abdb7d..1321acc402fdc6b128bcd5e7f68c75249fe02261 100644 (file)
--- a/sound/soc/sof/ipc4-loader.c
+++ b/sound/soc/sof/ipc4-loader.c
@@ -383,6 +383,17 @@ int sof_ipc4_query_fw_configuration(struct snd_sof_dev *sdev)
                        if (!ipc4_data->max_libs_count)
                                ipc4_data->max_libs_count = 1;
                        break;
+               case SOF_IPC4_FW_CFG_MAX_PPL_COUNT:
+                       ipc4_data->max_num_pipelines = *tuple->value;
+                       trace_sof_ipc4_fw_config(sdev, "Max PPL count %d",
+                                                ipc4_data->max_num_pipelines);
+                       if (ipc4_data->max_num_pipelines <= 0) {
+                               dev_err(sdev->dev, "Invalid max_num_pipelines %d",
+                                       ipc4_data->max_num_pipelines);
+                               ret = -EINVAL;
+                               goto out;
+                       }
+                       break;
                default:
                        break;
                }

diff --git a/sound/soc/sof/ipc4-priv.h b/sound/soc/sof/ipc4-priv.h
index d6f35004c4b7659683788455fbd70377d4235962..fc9efdce67e0f3d9f684a068b4a7755541638404 100644 (file)
--- a/sound/soc/sof/ipc4-priv.h
+++ b/sound/soc/sof/ipc4-priv.h
@@ -65,6 +65,7 @@ struct sof_ipc4_fw_library {
  * @nhlt: NHLT table either from the BIOS or the topology manifest
  * @mtrace_type: mtrace type supported on the booted platform
  * @mtrace_log_bytes: log bytes as reported by the firmware via fw_config reply
+ * @max_num_pipelines: max number of pipelines
  * @max_libs_count: Maximum number of libraries support by the FW including the
  *                 base firmware
  *
@@ -76,6 +77,7 @@ struct sof_ipc4_fw_data {
        void *nhlt;
        enum sof_ipc4_mtrace_type mtrace_type;
        u32 mtrace_log_bytes;
+       int max_num_pipelines;
        u32 max_libs_count;
 
        int (*load_library)(struct snd_sof_dev *sdev,