Skip to content

More RP1 PIO DMA tweaks #7190

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
pelwell wants to merge 2 commits into
base: rpi-6.12.y
Choose a base branch
from
Open

More RP1 PIO DMA tweaks #7190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9975031
misc: rp1-pio: Use DMA burst size for threshold
pelwell Jan 8, 2026
7ce12d4
misc: rp1-pio: Increase DMA timeouts to 10 seconds
pelwell Jan 8, 2026
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
15 changes: 8 additions & 7 deletions drivers/misc/rp1-pio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@

#define RP1_PIO_DMACTRL_DEFAULT 0x80000104

#define WAIT_TIMEOUT 10000

#define HANDLER(_n, _f) \
[_IOC_NR(PIO_IOC_ ## _n)] = { #_n, rp1_pio_ ## _f, _IOC_SIZE(PIO_IOC_ ## _n) }

Expand Down Expand Up @@ -610,7 +612,7 @@ static int rp1_pio_sm_config_xfer_internal(struct rp1_pio_client *client, uint s
struct rp1_pio_device *pio = client->pio;
struct platform_device *pdev = pio->pdev;
struct device *dev = &pdev->dev;
struct dma_slave_config config = {};
struct dma_slave_config config = { 0 };
struct dma_slave_caps dma_caps;
phys_addr_t fifo_addr;
struct dma_info *dma;
Expand Down Expand Up @@ -690,9 +692,8 @@ static int rp1_pio_sm_config_xfer_internal(struct rp1_pio_client *client, uint s

set_dmactrl_args.sm = sm;
set_dmactrl_args.is_tx = (dir == RP1_PIO_DIR_TO_SM);
set_dmactrl_args.ctrl = RP1_PIO_DMACTRL_DEFAULT;
if (dir == RP1_PIO_DIR_FROM_SM)
set_dmactrl_args.ctrl = (RP1_PIO_DMACTRL_DEFAULT & ~0x1f) | 1;
set_dmactrl_args.rsvd = 0;
set_dmactrl_args.ctrl = (RP1_PIO_DMACTRL_DEFAULT & ~0x1f) | dma_caps.max_burst;

ret = rp1_pio_sm_set_dmactrl(client, &set_dmactrl_args);
if (ret)
Expand Down Expand Up @@ -747,7 +748,7 @@ static int rp1_pio_sm_tx_user(struct rp1_pio_device *pio, struct dma_info *dma,
/* grab the next free buffer, waiting if they're all full */
if (dma->head_idx - dma->tail_idx == dma->buf_count) {
if (down_timeout(&dma->buf_sem,
msecs_to_jiffies(1000))) {
msecs_to_jiffies(WAIT_TIMEOUT))) {
dev_err(dev, "DMA bounce timed out\n");
break;
}
Expand Down Expand Up @@ -791,7 +792,7 @@ static int rp1_pio_sm_tx_user(struct rp1_pio_device *pio, struct dma_info *dma,

/* Block for completion */
while (dma->tail_idx != dma->head_idx) {
if (down_timeout(&dma->buf_sem, msecs_to_jiffies(1000))) {
if (down_timeout(&dma->buf_sem, msecs_to_jiffies(WAIT_TIMEOUT))) {
dev_err(dev, "DMA wait timed out\n");
ret = -ETIMEDOUT;
break;
Expand Down Expand Up @@ -824,7 +825,7 @@ static int rp1_pio_sm_rx_user(struct rp1_pio_device *pio, struct dma_info *dma,
*/
if (!bytes || dma->head_idx - dma->tail_idx == dma->buf_count) {
if (down_timeout(&dma->buf_sem,
msecs_to_jiffies(1000))) {
msecs_to_jiffies(WAIT_TIMEOUT))) {
dev_err(dev, "DMA wait timed out\n");
ret = -ETIMEDOUT;
break;
Expand Down