Skip to content

ASoC: dwc: Revert i2s_stop to the upstream version - #7588

Merged
pelwell merged 1 commit into
raspberrypi:rpi-6.18.yfrom
pelwell:is7584
Oct 2, 2026
Merged

pelwell merged 1 commit into
raspberrypi:rpi-6.18.yfrom
pelwell:is7584

Conversation

@pelwell

@pelwell pelwell commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Since we started using the DWC I2S block in RP1, the upstream driver has improved a lot. Drop the downstream version of i2s_stop, which avoided clearing ITER and IRER in order to not block DMA, now that upstream uses i2s_disable_dma.

See: #7584

Since we started using the DWC I2S block in RP1, the upstream driver
has improved a lot. Drop the downstream version of i2s_stop, which
avoided clearing ITER and IRER in order to not block DMA, now that
upstream uses i2s_disable_dma.

See: raspberrypi#7584

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
@hifiberry

Copy link
Copy Markdown
Contributor

Thanks for the fix here — and credit to Hyeonsu Cho (reporter on #7584) for running it through a proper validation: 100 consecutive induced XRUN/underrun cycles on a Pi 5 + HiFiBerry DAC8x (8-channel ALSA playback, 44.1kHz), all 100 recovering cleanly via snd_pcm_prepare() with no dma2chan2 failed to stop errors — see the confirmation comment on #7584.

@pelwell: in our opinion this can be merged.

@pelwell
pelwell merged commit 8946ad8 into raspberrypi:rpi-6.18.y Oct 2, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants