Skip to content

rp2040: Avoid screeches due to audio underflow during flash writes #8123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 27, 2023
Merged

rp2040: Avoid screeches due to audio underflow during flash writes #8123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4be231
rp2040: Avoid screeches due to audio underflow during flash writes
jepler Jun 26, 2023
3853661
Don't use "cookie" variable/function name
jepler Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions ports/raspberrypi/audio_dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,27 @@ bool audio_dma_get_paused(audio_dma_t *dma) {
return (control & DMA_CH0_CTRL_TRIG_EN_BITS) == 0;
}

uint32_t audio_dma_pause_all(void) {
uint32_t result = 0;
for (size_t channel = 0; channel < NUM_DMA_CHANNELS; channel++) {
audio_dma_t *dma = MP_STATE_PORT(playing_audio)[channel];
if (dma != NULL && !audio_dma_get_paused(dma)) {
audio_dma_pause(dma);
result |= (1 << channel);
}
}
return result;
}

void audio_dma_unpause_mask(uint32_t channel_mask) {
for (size_t channel = 0; channel < NUM_DMA_CHANNELS; channel++) {
audio_dma_t *dma = MP_STATE_PORT(playing_audio)[channel];
if (dma != NULL && (channel_mask & (1 << channel))) {
audio_dma_resume(dma);
}
}
}

void audio_dma_init(audio_dma_t *dma) {
dma->buffer[0] = NULL;
dma->buffer[1] = NULL;
Expand Down
3 changes: 3 additions & 0 deletions ports/raspberrypi/audio_dma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,7 @@ void audio_dma_pause(audio_dma_t *dma);
void audio_dma_resume(audio_dma_t *dma);
bool audio_dma_get_paused(audio_dma_t *dma);

uint32_t audio_dma_pause_all(void);
void audio_dma_unpause_mask(uint32_t channel_mask);

#endif // MICROPY_INCLUDED_RASPBERRYPI_AUDIO_DMA_OUT_H
4 changes: 4 additions & 0 deletions ports/raspberrypi/supervisor/internal_flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include "lib/oofatfs/ff.h"
#include "shared-bindings/microcontroller/__init__.h"

#include "audio_dma.h"
#include "supervisor/flash.h"
#include "supervisor/usb.h"

Expand Down Expand Up @@ -97,9 +98,12 @@ void port_internal_flash_flush(void) {
}
// Make sure we don't have an interrupt while we do flash operations.
common_hal_mcu_disable_interrupts();
// and audio DMA must be paused as well
uint32_t channel_mask = audio_dma_pause_all();
flash_range_erase(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + _cache_lba, SECTOR_SIZE);
flash_range_program(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + _cache_lba, _cache, SECTOR_SIZE);
_cache_lba = NO_CACHE;
audio_dma_unpause_mask(channel_mask);
common_hal_mcu_enable_interrupts();
}

Expand Down