ASoC: SOF: Intel: hda-dai: use lowest N channels

bardliao · bardliao · commit ad66cb73a1ae · 2024-01-29T20:30:06.000+08:00
The ch_mask in a link indicates the locations of the channels.
However, the channels used in each stream are the lowest N channels.
So convert ch_mask to GENMASK(hweight_long(ch_mask) - 1, 0).

Signed-off-by: Bard Liao &lt;yung-chuan.liao@linux.intel.com&gt;
diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c
@@ -509,6 +509,8 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream,
 		if (ch_maps->cpu == cpu_dai_id)
 			ch_mask |= ch_maps->ch_mask;
 	}
+	/* Calculate how many bits are used, and set the lowest N bits to ch_mask */
+	ch_mask = GENMASK(hweight_long(ch_mask) - 1, 0);
 
 	ret = hdac_bus_eml_sdw_map_stream_ch(sof_to_bus(sdev), link_id, cpu_dai->id,
 					     ch_mask,

Original file line number	Diff line number	Diff line change
`@@ -509,6 +509,8 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream,`
`509`	`509`	`if (ch_maps->cpu == cpu_dai_id)`
`510`	`510`	`ch_mask \|= ch_maps->ch_mask;`
`511`	`511`	`}`
	`512`	`+ /* Calculate how many bits are used, and set the lowest N bits to ch_mask */`
	`513`	`+ ch_mask = GENMASK(hweight_long(ch_mask) - 1, 0);`
`512`	`514`
`513`	`515`	`ret = hdac_bus_eml_sdw_map_stream_ch(sof_to_bus(sdev), link_id, cpu_dai->id,`
`514`	`516`	`ch_mask,`