ASoC: SOF: ipc4-topology: set config_length based on device_count

bardliao · bardliao · commit e59fce2dce45 · 2024-01-22T15:57:00.000+08:00
Set ipc4_copier-&gt;data.gtw_cfg.config_length dynamically based on
blob-&gt;alh_cfg.device_count to align with the other OS.

Signed-off-by: Bard Liao &lt;yung-chuan.liao@linux.intel.com&gt;
diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c
@@ -601,7 +601,11 @@ static int sof_ipc4_widget_setup_comp_dai(struct snd_sof_widget *swidget)
 		}
 
 		ipc4_copier->copier_config = (uint32_t *)blob;
-		ipc4_copier->data.gtw_cfg.config_length = sizeof(*blob) >> 2;
+		/* set data.gtw_cfg.config_length based on device_count */
+		ipc4_copier->data.gtw_cfg.config_length = (sizeof(blob->gw_attr) +
+							   sizeof(blob->alh_cfg.device_count) +
+							   sizeof(*blob->alh_cfg.mapping) *
+							   blob->alh_cfg.device_count) >> 2;
 		break;
 	}
 	case SOF_DAI_INTEL_SSP:

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,11 @@ static int sof_ipc4_widget_setup_comp_dai(struct snd_sof_widget *swidget)`
`601`	`601`	`}`
`602`	`602`
`603`	`603`	`ipc4_copier->copier_config = (uint32_t *)blob;`
`604`		`- ipc4_copier->data.gtw_cfg.config_length = sizeof(*blob) >> 2;`
	`604`	`+ /* set data.gtw_cfg.config_length based on device_count */`
	`605`	`+ ipc4_copier->data.gtw_cfg.config_length = (sizeof(blob->gw_attr) +`
	`606`	`+ sizeof(blob->alh_cfg.device_count) +`
	`607`	`+ sizeof(blob->alh_cfg.mapping) `
	`608`	`+ blob->alh_cfg.device_count) >> 2;`
`605`	`609`	`break;`
`606`	`610`	`}`
`607`	`611`	`case SOF_DAI_INTEL_SSP:`