west.yml: update Zephyr (subset of PR8804 , no SMP changes) #8805
Conversation
Starting with Zephyr commit e021ccfc745221c6 ("drivers: dma:
intel-adsp-hda: add delay to stop host dma"), the pause-resume
sof-test cases started failing on Intel cAVS2.5 platforms.
Add a delay loop around DMA stop code in chain DMA to workaround
the issue while a proper fix is under investigation. This allows
to resume integration of newer Zephyr versions to SOF and ensure
we detect any new regressions in time.
Link: thesofproject#8792
Signed-off-by: Kai Vehmanen <[email protected]>
Update Zephyr to the most recent commit before the SMP interface change (which requires SOF side code changes). Signed-off-by: Kai Vehmanen <[email protected]>
kv2019i
requested review from
lgirdwood,
plbossart,
mmaka1,
lbetlej and
dbaluta
as code owners
|
One configuration was missed due to missing, but results are good: The pause-resume fail seen with newer Zephyr revisions in #8804 and #8764 is not seen in results for this PR, so the the SMP interface change is causing the new failure on pause-resume. |
kv2019i
requested review from
lyakh,
dcpleung,
RanderWang,
marc-hb and
tmleman
| if (err < 0) | ||
| if (err < 0) { | ||
| if (err == -EBUSY) { | ||
| int retries = 100; |
There was a problem hiding this comment.
you probably want to fix the misplaced brace at line 143, and while at it (optionally) you could also consider doing
for (int i = 0; i < 100 && err == -EBUSY; i++) {
if (!i)
comp_warn(...);
k_busy_wait(10);
err = dma_stop(...);
}
if (err < 0)
return err;
| */ | ||
| while (err == -EBUSY && --retries) { | ||
| k_busy_wait(10); | ||
| err = dma_stop(cd->chan_link->dma->z_dev, cd->chan_link->index); |
There was a problem hiding this comment.
Actually, @ujfalusi noted this is likely not doing actual stop from second iterations onwards, so this is a no-op operation (with the HD-DMA driver). Let me revise the workaround to be more explicit...
There was a problem hiding this comment.
I guess this would be identical and more explicit:
diff --git a/src/audio/chain_dma.c b/src/audio/chain_dma.c
index 696973146404..cea2a2e5c8f3 100644
--- a/src/audio/chain_dma.c
+++ b/src/audio/chain_dma.c
@@ -121,7 +121,7 @@ static int chain_host_stop(struct comp_dev *dev)
int err;
err = dma_stop(cd->chan_host->dma->z_dev, cd->chan_host->index);
- if (err < 0)
+ if (err < 0 && err != -EBUSY)
return err;
comp_info(dev, "chain_host_stop(): dma_stop() host chan_index = %u",With added comment
|
Workaround requires work, converting to a draft. |
No description provided.