Skip to content

i2s: i2s_nrfx: Lock irqs when supplying buffers in i2s_nrfx_write() #99443

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −0
Open

i2s: i2s_nrfx: Lock irqs when supplying buffers in i2s_nrfx_write() #99443

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions drivers/i2s/i2s_nrfx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,8 @@ static int i2s_nrfx_write(const struct device *dev,
* opens the possibility for a race condition between this function and
* data_handler() that is called in interrupt context.
*/

unsigned int key = irq_lock();
if (drv_data->state == I2S_STATE_RUNNING &&
drv_data->next_tx_buffer_needed) {
nrfx_i2s_buffers_t next = { 0 };
Expand All @@ -670,6 +672,7 @@ static int i2s_nrfx_write(const struct device *dev,
* responsible for releasing the buffer.
*/
LOG_ERR("Cannot reacquire queued buffer");
irq_unlock(key);
return 0;
}

Expand All @@ -678,10 +681,12 @@ static int i2s_nrfx_write(const struct device *dev,
LOG_DBG("Next TX %p", next.p_tx_buffer);

if (!supply_next_buffers(drv_data, &next)) {
irq_unlock(key);
return -EIO;
}

}
irq_unlock(key);

return 0;
}
Expand Down