• Richard Fitzgerald's avatar
    ASoC: soc-dai: Do not call snd_soc_link_be_hw_params_fixup() twice · 3115be55
    Richard Fitzgerald authored
    For a BE link snd_soc_link_be_hw_params_fixup() is called by
    dpcm_be_dai_hw_params() to initialize the params before it passes them
    to __soc_pcm_hw_params(). Then __soc_pcm_hw_params() refines params to
    match the BE codec and passes that to snd_soc_dai_hw_params().
    
    The second call of snd_soc_link_be_hw_params_fixup() within
    snd_soc_dai_hw_params() was overwriting the refined params with the
    original BE CPU DAI params. This would then lead to various problems,
    for example passing an invalid number of channels to the codec driver
    hw_params(), or enabling more AIF widgets on the codec than are actually
    mapped by TDM slots.
    
    These errors may not be noticed on a simple 1:1 link between one CPU DAI
    and one codec DAI, because most likely they have the same DAI config
    (though this is not necessarily true, for example if the CPU end has dummy
    TDM slots to achieve a desirable BCLK).
    
    For 1:N mappings there are likely to be multiple codecs using different
    subsets of the TDM slots and this overwriting of the refined params
    can cause incorrect configuration of each codec on the link.
    
    The erroneous extra call to the BE fixup function() was introduced
    by:
    commit a655de80 ("ASoC: core: Allow topology to override machine
    driver FE DAI link config.")
    
    at that time, the call to the BE fixup was already done by
    dpcm_be_dai_hw_params(), which was introduced several years earlier
    by:
    commit 01d7584c ("ASoC: dpcm: Add Dynamic PCM core operations.")
    
    The erroneous code has changed and moved to a different source file
    since the patch that introduced it, so this fix patch won't directly
    apply as a fix on top of code older than:
    commit 8b4ba1d3 ("ASoC: soc-dai: fix up hw params only if it is
    needed")
    
    though it can be applied with some minor adjustment to code before
    that patch but after:
    commit aa6166c2 ("ASoC: soc-dai: mv soc_dai_hw_params() to soc-dai")
    
    On any tree older than that the code is in soc-pcm.c.
    Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
    Link: https://lore.kernel.org/r/20221104160252.166114-1-rf@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
    3115be55
soc-dai.c 21 KB