January 2025 - Sound-open-firmware - mailman.alsa-project.org

[PATCH AUTOSEL 6.12 01/14] ASoC: SOF: Intel: hda-dai: Ensure DAI widget is valid during params
by Sasha Levin 26 Jan '25

26 Jan '25

From: Bard Liao <yung-chuan.liao(a)linux.intel.com> [ Upstream commit 569922b82ca660f8b24e705f6cf674e6b1f99cc7 ] Each cpu DAI should associate with a widget. However, the topology might not create the right number of DAI widgets for aggregated amps. And it will cause NULL pointer deference. Check that the DAI widget associated with the CPU DAI is valid to prevent NULL pointer deference due to missing DAI widgets in topologies with aggregated amps. Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Liam Girdwood <liam.r.girdwood(a)intel.com> Link: https://patch.msgid.link/20241203104853.56956-1-yung-chuan.liao@linux.intel… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/intel/hda-dai.c | 12 ++++++++++++ sound/soc/sof/intel/hda.c | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index 82f46ecd94301..2e58a264da556 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -503,6 +503,12 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream, int ret; int i; + if (!w) { + dev_err(cpu_dai->dev, "%s widget not found, check amp link num in the topology\n", + cpu_dai->name); + return -EINVAL; + } + ops = hda_dai_get_ops(substream, cpu_dai); if (!ops) { dev_err(cpu_dai->dev, "DAI widget ops not set\n"); @@ -582,6 +588,12 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream, */ for_each_rtd_cpu_dais(rtd, i, dai) { w = snd_soc_dai_get_widget(dai, substream->stream); + if (!w) { + dev_err(cpu_dai->dev, + "%s widget not found, check amp link num in the topology\n", + dai->name); + return -EINVAL; + } ipc4_copier = widget_to_copier(w); memcpy(&ipc4_copier->dma_config_tlv[cpu_dai_id], dma_config_tlv, sizeof(*dma_config_tlv)); diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 70fc08c8fc99e..f10ed4d102501 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -63,6 +63,11 @@ static int sdw_params_stream(struct device *dev, struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(d, params_data->substream->stream); struct snd_sof_dai_config_data data = { 0 }; + if (!w) { + dev_err(dev, "%s widget not found, check amp link num in the topology\n", + d->name); + return -EINVAL; + } data.dai_index = (params_data->link_id << 8) | d->id; data.dai_data = params_data->alh_stream_id; data.dai_node_id = data.dai_data; -- 2.39.5

1 0

[PATCH AUTOSEL 6.13 01/16] ASoC: SOF: Intel: hda-dai: Ensure DAI widget is valid during params
by Sasha Levin 26 Jan '25

26 Jan '25

From: Bard Liao <yung-chuan.liao(a)linux.intel.com> [ Upstream commit 569922b82ca660f8b24e705f6cf674e6b1f99cc7 ] Each cpu DAI should associate with a widget. However, the topology might not create the right number of DAI widgets for aggregated amps. And it will cause NULL pointer deference. Check that the DAI widget associated with the CPU DAI is valid to prevent NULL pointer deference due to missing DAI widgets in topologies with aggregated amps. Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Liam Girdwood <liam.r.girdwood(a)intel.com> Link: https://patch.msgid.link/20241203104853.56956-1-yung-chuan.liao@linux.intel… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/intel/hda-dai.c | 12 ++++++++++++ sound/soc/sof/intel/hda.c | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index 0db2a3e554fb2..da12aabc1bb85 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -503,6 +503,12 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream, int ret; int i; + if (!w) { + dev_err(cpu_dai->dev, "%s widget not found, check amp link num in the topology\n", + cpu_dai->name); + return -EINVAL; + } + ops = hda_dai_get_ops(substream, cpu_dai); if (!ops) { dev_err(cpu_dai->dev, "DAI widget ops not set\n"); @@ -582,6 +588,12 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream, */ for_each_rtd_cpu_dais(rtd, i, dai) { w = snd_soc_dai_get_widget(dai, substream->stream); + if (!w) { + dev_err(cpu_dai->dev, + "%s widget not found, check amp link num in the topology\n", + dai->name); + return -EINVAL; + } ipc4_copier = widget_to_copier(w); memcpy(&ipc4_copier->dma_config_tlv[cpu_dai_id], dma_config_tlv, sizeof(*dma_config_tlv)); diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index f991785f727e9..be689f6e10c81 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -63,6 +63,11 @@ static int sdw_params_stream(struct device *dev, struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(d, params_data->substream->stream); struct snd_sof_dai_config_data data = { 0 }; + if (!w) { + dev_err(dev, "%s widget not found, check amp link num in the topology\n", + d->name); + return -EINVAL; + } data.dai_index = (params_data->link_id << 8) | d->id; data.dai_data = params_data->alh_stream_id; data.dai_node_id = data.dai_data; -- 2.39.5

1 0

Re: [PATCH] ASoC: SOF: topology: Use krealloc_array() to replace krealloc()
by kernel test robot 15 Jan '25

15 Jan '25

Hi Zhang, kernel test robot noticed the following build warnings: [auto build test WARNING on broonie-sound/for-next] [also build test WARNING on linus/master v6.13-rc7 next-20250114] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Zhang-Heng/ASoC-SOF-topology… base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next patch link: https://lore.kernel.org/r/20250114012853.877331-1-zhangheng%40kylinos.cn patch subject: [PATCH] ASoC: SOF: topology: Use krealloc_array() to replace krealloc() config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20250115/202501151630.VyzkV2xo-lkp@…) compiler: sh4-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250115/202501151630.VyzkV2xo-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202501151630.VyzkV2xo-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from include/linux/percpu.h:5, from include/linux/radix-tree.h:16, from include/linux/idr.h:15, from include/linux/kernfs.h:12, from include/linux/sysfs.h:16, from include/linux/kobject.h:20, from include/linux/energy_model.h:7, from include/linux/device.h:16, from sound/soc/sof/topology.c:12: sound/soc/sof/topology.c: In function 'sof_widget_parse_tokens': >> sound/soc/sof/topology.c:1277:59: warning: 'krealloc_array_noprof' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 1277 | sizeof(*new_tuples), num_tuples, GFP_KERNEL); | ^ include/linux/alloc_tag.h:228:16: note: in definition of macro 'alloc_hooks_tag' 228 | typeof(_do_alloc) _res = _do_alloc; \ | ^~~~~~~~~ include/linux/slab.h:979:49: note: in expansion of macro 'alloc_hooks' 979 | #define krealloc_array(...) alloc_hooks(krealloc_array_noprof(__VA_ARGS__)) | ^~~~~~~~~~~ sound/soc/sof/topology.c:1276:38: note: in expansion of macro 'krealloc_array' 1276 | new_tuples = krealloc_array(swidget->tuples, | ^~~~~~~~~~~~~~ sound/soc/sof/topology.c:1277:59: note: earlier argument should specify number of elements, later size of each element 1277 | sizeof(*new_tuples), num_tuples, GFP_KERNEL); | ^ include/linux/alloc_tag.h:228:16: note: in definition of macro 'alloc_hooks_tag' 228 | typeof(_do_alloc) _res = _do_alloc; \ | ^~~~~~~~~ include/linux/slab.h:979:49: note: in expansion of macro 'alloc_hooks' 979 | #define krealloc_array(...) alloc_hooks(krealloc_array_noprof(__VA_ARGS__)) | ^~~~~~~~~~~ sound/soc/sof/topology.c:1276:38: note: in expansion of macro 'krealloc_array' 1276 | new_tuples = krealloc_array(swidget->tuples, | ^~~~~~~~~~~~~~ >> sound/soc/sof/topology.c:1277:59: warning: 'krealloc_array_noprof' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 1277 | sizeof(*new_tuples), num_tuples, GFP_KERNEL); | ^ include/linux/alloc_tag.h:228:34: note: in definition of macro 'alloc_hooks_tag' 228 | typeof(_do_alloc) _res = _do_alloc; \ | ^~~~~~~~~ include/linux/slab.h:979:49: note: in expansion of macro 'alloc_hooks' 979 | #define krealloc_array(...) alloc_hooks(krealloc_array_noprof(__VA_ARGS__)) | ^~~~~~~~~~~ sound/soc/sof/topology.c:1276:38: note: in expansion of macro 'krealloc_array' 1276 | new_tuples = krealloc_array(swidget->tuples, | ^~~~~~~~~~~~~~ sound/soc/sof/topology.c:1277:59: note: earlier argument should specify number of elements, later size of each element 1277 | sizeof(*new_tuples), num_tuples, GFP_KERNEL); | ^ include/linux/alloc_tag.h:228:34: note: in definition of macro 'alloc_hooks_tag' 228 | typeof(_do_alloc) _res = _do_alloc; \ | ^~~~~~~~~ include/linux/slab.h:979:49: note: in expansion of macro 'alloc_hooks' 979 | #define krealloc_array(...) alloc_hooks(krealloc_array_noprof(__VA_ARGS__)) | ^~~~~~~~~~~ sound/soc/sof/topology.c:1276:38: note: in expansion of macro 'krealloc_array' 1276 | new_tuples = krealloc_array(swidget->tuples, | ^~~~~~~~~~~~~~ vim +1277 sound/soc/sof/topology.c 1191 1192 static int sof_widget_parse_tokens(struct snd_soc_component *scomp, struct snd_sof_widget *swidget, 1193 struct snd_soc_tplg_dapm_widget *tw, 1194 enum sof_tokens *object_token_list, int count) 1195 { 1196 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp); 1197 const struct sof_ipc_tplg_ops *tplg_ops = sof_ipc_get_ops(sdev, tplg); 1198 struct snd_soc_tplg_private *private = &tw->priv; 1199 const struct sof_token_info *token_list; 1200 int num_tuples = 0; 1201 int ret, i; 1202 1203 token_list = tplg_ops ? tplg_ops->token_list : NULL; 1204 /* nothing to do if token_list is NULL */ 1205 if (!token_list) 1206 return 0; 1207 1208 if (count > 0 && !object_token_list) { 1209 dev_err(scomp->dev, "No token list for widget %s\n", swidget->widget->name); 1210 return -EINVAL; 1211 } 1212 1213 /* calculate max size of tuples array */ 1214 for (i = 0; i < count; i++) 1215 num_tuples += token_list[object_token_list[i]].count; 1216 1217 /* allocate memory for tuples array */ 1218 swidget->tuples = kcalloc(num_tuples, sizeof(*swidget->tuples), GFP_KERNEL); 1219 if (!swidget->tuples) 1220 return -ENOMEM; 1221 1222 /* parse token list for widget */ 1223 for (i = 0; i < count; i++) { 1224 int num_sets = 1; 1225 1226 if (object_token_list[i] >= SOF_TOKEN_COUNT) { 1227 dev_err(scomp->dev, "Invalid token id %d for widget %s\n", 1228 object_token_list[i], swidget->widget->name); 1229 ret = -EINVAL; 1230 goto err; 1231 } 1232 1233 switch (object_token_list[i]) { 1234 case SOF_COMP_EXT_TOKENS: 1235 /* parse and save UUID in swidget */ 1236 ret = sof_parse_tokens(scomp, swidget, 1237 token_list[object_token_list[i]].tokens, 1238 token_list[object_token_list[i]].count, 1239 private->array, le32_to_cpu(private->size)); 1240 if (ret < 0) { 1241 dev_err(scomp->dev, "Failed parsing %s for widget %s\n", 1242 token_list[object_token_list[i]].name, 1243 swidget->widget->name); 1244 goto err; 1245 } 1246 1247 continue; 1248 case SOF_IN_AUDIO_FORMAT_TOKENS: 1249 num_sets = sof_get_token_value(SOF_TKN_COMP_NUM_INPUT_AUDIO_FORMATS, 1250 swidget->tuples, swidget->num_tuples); 1251 if (num_sets < 0) { 1252 dev_err(sdev->dev, "Invalid input audio format count for %s\n", 1253 swidget->widget->name); 1254 ret = num_sets; 1255 goto err; 1256 } 1257 break; 1258 case SOF_OUT_AUDIO_FORMAT_TOKENS: 1259 num_sets = sof_get_token_value(SOF_TKN_COMP_NUM_OUTPUT_AUDIO_FORMATS, 1260 swidget->tuples, swidget->num_tuples); 1261 if (num_sets < 0) { 1262 dev_err(sdev->dev, "Invalid output audio format count for %s\n", 1263 swidget->widget->name); 1264 ret = num_sets; 1265 goto err; 1266 } 1267 break; 1268 default: 1269 break; 1270 } 1271 1272 if (num_sets > 1) { 1273 struct snd_sof_tuple *new_tuples; 1274 1275 num_tuples += token_list[object_token_list[i]].count * (num_sets - 1); 1276 new_tuples = krealloc_array(swidget->tuples, > 1277 sizeof(*new_tuples), num_tuples, GFP_KERNEL); 1278 if (!new_tuples) { 1279 ret = -ENOMEM; 1280 goto err; 1281 } 1282 1283 swidget->tuples = new_tuples; 1284 } 1285 1286 /* copy one set of tuples per token ID into swidget->tuples */ 1287 ret = sof_copy_tuples(sdev, private->array, le32_to_cpu(private->size), 1288 object_token_list[i], num_sets, swidget->tuples, 1289 num_tuples, &swidget->num_tuples); 1290 if (ret < 0) { 1291 dev_err(scomp->dev, "Failed parsing %s for widget %s err: %d\n", 1292 token_list[object_token_list[i]].name, swidget->widget->name, ret); 1293 goto err; 1294 } 1295 } 1296 1297 return 0; 1298 err: 1299 kfree(swidget->tuples); 1300 return ret; 1301 } 1302 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

Re: [RESEND PATCH] ASoC: SOF: Intel: Use str_yes_no() to improve bdw_dump()
by Mark Brown 13 Jan '25

13 Jan '25

On Tue, 07 Jan 2025 12:08:59 +0100, Thorsten Blum wrote: > Remove hard-coded strings by using the str_yes_no() helper function. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: Intel: Use str_yes_no() to improve bdw_dump() commit: 7299cc06fe4ab2ac26af73ac5fecd35a28fef527 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0

Re: [RESEND PATCH] ASoC: SOF: Intel: Use str_yes_no() helper in atom_dump()
by Mark Brown 06 Jan '25

06 Jan '25

On Mon, 30 Dec 2024 09:57:15 +0100, Thorsten Blum wrote: > Remove hard-coded strings by using the str_yes_no() helper function. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: Intel: Use str_yes_no() helper in atom_dump() commit: c0641be588c22fdcecdb1e90a64803047d4441f8 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark

1 0