| Message ID | 20210214220414.2876690-1-kai.vehmanen@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 140f553d1298e0ddbe21983efe5789fe8b484273 |
| Headers | show |
| Series | ASoC: soc-pcm: fix hwparams min/max init for dpcm | expand |
On Mon, 15 Feb 2021 00:04:14 +0200, Kai Vehmanen wrote: > When runtime is initialized with dpcm_init_runtime_hw(), some of the > min/max calculations assume that defaults are set. For example > calculation of channel min/max values may be done using zero-initialized > data and soc_pcm_hw_update_chan() will always return max-channels of 0 > in this case. This will result in failure to open the PCM at all. > > Fix the issue by calling soc_pcm_hw_init() before calling any > soc_pcm_hw_update_*() functions. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: soc-pcm: fix hwparams min/max init for dpcm commit: 140f553d1298e0ddbe21983efe5789fe8b484273 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
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index b7c90da1820e..37094aeff440 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1531,12 +1531,10 @@ static void dpcm_init_runtime_hw(struct snd_pcm_runtime *runtime, { struct snd_pcm_hardware *hw = &runtime->hw; + soc_pcm_hw_init(hw); soc_pcm_hw_update_rate(hw, stream); soc_pcm_hw_update_chan(hw, stream); - if (runtime->hw.formats) - runtime->hw.formats &= stream->formats; - else - runtime->hw.formats = stream->formats; + soc_pcm_hw_update_format(hw, stream); } static void dpcm_runtime_merge_format(struct snd_pcm_substream *substream,
When runtime is initialized with dpcm_init_runtime_hw(), some of the min/max calculations assume that defaults are set. For example calculation of channel min/max values may be done using zero-initialized data and soc_pcm_hw_update_chan() will always return max-channels of 0 in this case. This will result in failure to open the PCM at all. Fix the issue by calling soc_pcm_hw_init() before calling any soc_pcm_hw_update_*() functions. Remove the conditional code on runtime->hw.formats as this field is anyways set in soc_pcm_hw_init(). Fixes: 6cb56a4549e9 ("ASoC: soc-pcm: add soc_pcm_hw_update_chan()") Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> --- sound/soc/soc-pcm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Notes: - This fixes regressions caught by SOF CI. Matching SOF CI test run with this patch applied is at: https://github.com/thesofproject/linux/pull/2756 base-commit: debc71f26cdbd45798c63b0dcdabdea93d2f6870