Tools: Testbench: Add extended base configuration to process type

The input and output pins count and format for each pin is
added into the "struct ipc4_base_module_cfg_ext" that is placed
after "struct ipc4_base_module_cfg" and before test bench and
plugin specific UUID.

This allows to load components those use the extended
configuration. Since there is no harm to apply it to every
process type component it done simply for all.

Signed-off-by: Seppo Ingalsuo <[email protected]>

tools/testbench/include/testbench/topology_ipc4.h

@@ -27,6 +27,11 @@
 #define TB_FILE_OUT_DAI_MODULE_ID	0x9c
 #define TB_FILE_IN_DAI_MODULE_ID	0x9d
 
+enum tb_pin_type {
+	TB_PIN_TYPE_INPUT = 0,
+	TB_PIN_TYPE_OUTPUT,
+};
+
 int tb_delete_pipeline(struct testbench_prm *tp, struct tplg_pipeline_info *pipe_info);
 int tb_free_all_pipelines(struct testbench_prm *tp);
 int tb_free_route(struct testbench_prm *tp, struct tplg_route_info *route_info);

tools/testbench/topology_ipc4.c

@@ -12,6 +12,7 @@
 #include <kernel/header.h>
 #include <tplg_parser/tokens.h>
 #include <tplg_parser/topology.h>
+#include <module/ipc4/base-config.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -330,10 +331,90 @@ int tb_match_audio_format(struct testbench_prm *tp, struct tplg_comp_info *comp_
 	return 0;
 }
 
+static int tb_set_pin_formats(struct tplg_comp_info *comp_info,
+			      struct ipc4_base_module_cfg *base_cfg,
+			      struct ipc4_base_module_cfg_ext *base_cfg_ext,
+			      enum tb_pin_type pin_type)
+{
+	struct sof_ipc4_pin_format *formats_array;
+	struct sof_ipc4_pin_format *pin_format_item;
+	struct sof_ipc4_pin_format *pin_format;
+	struct sof_ipc4_pin_format *base_cfg_ext_pin_formats =
+		(struct sof_ipc4_pin_format *)base_cfg_ext->pin_formats;
+	int format_list_count;
+	int num_pins;
+	int i, j;
+	int pin_format_offset = 0;
+
+	switch (pin_type) {
+	case TB_PIN_TYPE_INPUT:
+		num_pins = base_cfg_ext->nb_input_pins;
+		formats_array = comp_info->available_fmt.input_pin_fmts;
+		format_list_count = comp_info->available_fmt.num_input_formats;
+		break;
+	case TB_PIN_TYPE_OUTPUT:
+		num_pins = base_cfg_ext->nb_output_pins;
+		pin_format_offset = base_cfg_ext->nb_input_pins;
+		formats_array = comp_info->available_fmt.output_pin_fmts;
+		format_list_count = comp_info->available_fmt.num_output_formats;
+		break;
+	default:
+		fprintf(stderr, "Error: Illegal pin type %d for %s\n", pin_type, comp_info->name);
+	}
+
+	for (i = pin_format_offset; i < num_pins + pin_format_offset; i++) {
+		pin_format = &base_cfg_ext_pin_formats[i];
+
+		if (i == pin_format_offset) {
+			if (pin_type == TB_PIN_TYPE_INPUT) {
+				pin_format->buffer_size = base_cfg->ibs;
+				/* Note: Copy "struct ipc4_audio_format" to
+				 * "struct sof_ipc4_pin_format". They are same
+				 * but separate definitions. The last member fmt_cfg
+				 * is defined with bitfields for channels_count, valid_bit_depth,
+				 * s_type, reservedin ipc4_audio_format.
+				 */
+				memcpy(&pin_format->audio_fmt, &base_cfg->audio_fmt,
+				       sizeof(pin_format->audio_fmt));
+			} else {
+				pin_format->buffer_size = base_cfg->obs;
+				/* TODO: Using workaround, need to find out how to do this. This
+				 * is copied kernel function sof_ipc4_process_set_pin_formats()
+				 * from process->output_format. It's set in
+				 * sof_ipc4_prepare_process_module().
+				 */
+				memcpy(&pin_format->audio_fmt, &base_cfg->audio_fmt,
+				       sizeof(pin_format->audio_fmt));
+			}
+			continue;
+		}
+
+		for (j = 0; j < format_list_count; j++) {
+			pin_format_item = &formats_array[j];
+			if (pin_format_item->pin_index == i - pin_format_offset) {
+				*pin_format = *pin_format_item;
+				break;
+			}
+		}
+
+		if (j == format_list_count) {
+			fprintf(stderr, "%s pin %d format not found for %s\n",
+				(pin_type == TB_PIN_TYPE_INPUT) ? "input" : "output",
+				i - pin_format_offset, comp_info->name);
+			return -EINVAL;
+		}
+	}
+
+	return 0;
+}
+
 int tb_set_up_widget_base_config(struct testbench_prm *tp, struct tplg_comp_info *comp_info)
 {
 	char *config_name = tp->config[0].name;
+	struct ipc4_base_module_cfg *base_cfg;
+	struct ipc4_base_module_cfg_ext *base_cfg_ext;
 	struct tb_config *config;
+	struct tplg_pins_info *pins = &comp_info->pins_info;
 	bool config_found = false;
 	int ret, i;
 
@@ -359,6 +440,21 @@ int tb_set_up_widget_base_config(struct testbench_prm *tp, struct tplg_comp_info
 	/* copy the basecfg into the ipc payload */
 	memcpy(comp_info->ipc_payload, &comp_info->basecfg, sizeof(struct ipc4_base_module_cfg));
 
+	/* Copy ext config for process type */
+	if (comp_info->module_id == TB_PROCESS_MODULE_ID) {
+		base_cfg = comp_info->ipc_payload;
+		base_cfg_ext = comp_info->ipc_payload + sizeof(*base_cfg);
+		base_cfg_ext->nb_input_pins = pins->num_input_pins;
+		base_cfg_ext->nb_output_pins = pins->num_output_pins;
+		ret = tb_set_pin_formats(comp_info, base_cfg, base_cfg_ext, TB_PIN_TYPE_INPUT);
+		if (ret)
+			return ret;
+
+		ret = tb_set_pin_formats(comp_info, base_cfg, base_cfg_ext, TB_PIN_TYPE_OUTPUT);
+		if (ret)
+			return ret;
+	}
+
 	return 0;
 }
 
@@ -824,6 +920,9 @@ int tb_new_process(struct testbench_prm *tp)
 	struct tplg_context *ctx = &tp->tplg;
 	struct tplg_comp_info *comp_info = ctx->current_comp_info;
 	struct snd_soc_tplg_ctl_hdr *tplg_ctl;
+	struct tplg_pins_info *pins = &comp_info->pins_info;
+	size_t ext_size;
+	size_t uuid_offset;
 	int ret;
 
 	ret = tplg_parse_widget_audio_formats(ctx);
@@ -834,8 +933,14 @@ int tb_new_process(struct testbench_prm *tp)
 	if (!tplg_ctl)
 		return -ENOMEM;
 
+	/* Ext config size */
+	ext_size = ipc4_calc_base_module_cfg_ext_size(pins->num_input_pins, pins->num_output_pins);
+
 	/* use base config variant with uuid */
-	comp_info->ipc_size = sizeof(struct ipc4_base_module_cfg) + sizeof(struct sof_uuid);
+	comp_info->ipc_size = sizeof(struct ipc4_base_module_cfg);
+	comp_info->ipc_size += ext_size;
+	uuid_offset =  comp_info->ipc_size;
+	comp_info->ipc_size += sizeof(struct sof_uuid);
 	comp_info->ipc_payload = calloc(comp_info->ipc_size, 1);
 	if (!comp_info->ipc_payload) {
 		ret = ENOMEM;
@@ -857,8 +962,7 @@ int tb_new_process(struct testbench_prm *tp)
 	tb_setup_widget_ipc_msg(comp_info);
 
 	/* copy uuid to the end of the payload */
-	memcpy(comp_info->ipc_payload + sizeof(struct ipc4_base_module_cfg), &comp_info->uuid,
-	       sizeof(struct sof_uuid));
+	memcpy(comp_info->ipc_payload + uuid_offset, &comp_info->uuid, sizeof(struct sof_uuid));
 
 	/* TODO: drop tplg_ctl to avoid memory leak. Need to store and handle this
 	 * to support controls.