ASoC: SOF: ipc4-topology: Fix ChainDMA DMA Link ID handling during xrun #5119
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ujfalusi
requested review from
lgirdwood,
plbossart,
ranj063,
kv2019i,
dbaluta and
bardliao
as code owners
|
The patch which actually triggers the issue is new for 6.10: |
|
to reproduce the issue (on soundwire device): Kill the second HDMI playback: Start it again: Press < Note: Likely only two aplay to HDMI is adequate. |
ujfalusi
force-pushed
the
peter/sof/pr/chaindma_dmalinkid_fix_01
branch
from
1016f12
to
20e8ef5
Compare
…hainDMA The DMA Link ID is only valid in snd_sof_dai_config_data when the dai_config is called with HW_PARAMS. The commit that this patch fixes is actually moved a code section without changing it, the same bug exists in the original code, needing different patch to kernel prior to 6.9 kernels. Cc: stable@vger.kernel.org Fixes: 3858464 ("ASoC: SOF: ipc4-topology: change chain_dma handling in dai_config") Link: thesofproject#5116 Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
…prepare The DMA Link ID is set to the IPC message's primary during dai_config, which is only during hw_params. During xrun handling the hw_params is not called and the DMA Link ID information will be lost. All other fields in the message expected to be 0 for re-configuration, only the DMA Link ID needs to be preserved and the in case of repeated dai_config, it is correctly updated (masked and then set). Cc: stable@vger.kernel.org Fixes: ca5ce0c ("ASoC: SOF: ipc4/intel: Add support for chained DMA") Link: thesofproject#5116 Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
|
Changes since v1:
|
bardliao
approved these changes
Jul 23, 2024
ranj063
approved these changes
Jul 23, 2024
plbossart
approved these changes
Jul 23, 2024
plbossart
merged commit 1958a09
into
thesofproject:topic/sof-dev
12 of 15 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi,
Recent fixes for xrun (pending_stop) caused a regression on xrun handling of ChainDMA by uncovering two bugs related to how the DMA Link ID is handled and causing firmware crash under special circumstances.
The bugs will result loosing the DMA Link ID for the stream which experienced an xrun.
The first patch is a fix for a code move, but the actual bug was introduced by the same commit as the second patch is fixing, we need to create a new patch out from the first one for kernel versions prior to 6.9.
Fixes: #5116