Skip to content

Commit 0ba2df0

Browse files
Marc Ferlandvinodkoul
authored andcommitted
dmaengine: xilinx_dma: use readl_poll_timeout_atomic variant
The xilinx_dma_poll_timeout macro is sometimes called while holding a spinlock (see xilinx_dma_issue_pending() for an example) this means we shouldn't sleep when polling the dma channel registers. To address it in xilinx poll timeout macro use readl_poll_timeout_atomic instead of readl_poll_timeout variant. Signed-off-by: Marc Ferland <ferlandm@amotus.ca> Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> Link: https://lore.kernel.org/r/1604473206-32573-2-git-send-email-radhey.shyam.pandey@xilinx.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 7686641 commit 0ba2df0

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/dma/xilinx/xilinx_dma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,8 @@ struct xilinx_dma_device {
517517
#define to_dma_tx_descriptor(tx) \
518518
container_of(tx, struct xilinx_dma_tx_descriptor, async_tx)
519519
#define xilinx_dma_poll_timeout(chan, reg, val, cond, delay_us, timeout_us) \
520-
readl_poll_timeout(chan->xdev->regs + chan->ctrl_offset + reg, val, \
521-
cond, delay_us, timeout_us)
520+
readl_poll_timeout_atomic(chan->xdev->regs + chan->ctrl_offset + reg, \
521+
val, cond, delay_us, timeout_us)
522522

523523
/* IO accessors */
524524
static inline u32 dma_read(struct xilinx_dma_chan *chan, u32 reg)

0 commit comments

Comments
 (0)