Skip to content

ASoC: SOF: ipc4-topology: Fix shift-out-of-bounds for aggregated ALH … #5930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ujfalusi wants to merge 1 commit into
base: topic/sof-dev
Choose a base branch
from
Open

ASoC: SOF: ipc4-topology: Fix shift-out-of-bounds for aggregated ALH … #5930

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions sound/soc/sof/ipc4-topology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2476,11 +2476,14 @@ _sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
ch_map >>= 4;
}

if (swidget->id == snd_soc_dapm_dai_in && ch_count == out_ref_channels) {
if ((swidget->id == snd_soc_dapm_dai_in && ch_count == out_ref_channels) ||
ch_count < blob->alh_cfg.device_count) {
/*
* For playback DAI widgets where the channel number is equal to
* the output reference channels, set the step = 0 to ensure all
* the ch_mask is applied to all alh mappings.
* the output reference channels, or when there are fewer
* channels than aggregated devices (e.g. a mono capture
* stream split across multiple links), set step = 0 to
* ensure all the ch_mask is applied to all alh mappings.
*/
mask = ch_mask;
step = 0;
Expand Down
Loading