Commit 0db2b671 authored by Miquel Raynal's avatar Miquel Raynal Committed by Vinod Koul

dmaengine: xilinx: xdma: Prepare the introduction of cyclic transfers

In order to reduce and clarify the diff when introducing cyclic
transfers support, let's first prepare the driver a bit. There is no
functional change.
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20231005160237.2804238-3-miquel.raynal@bootlin.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent c48de45d
...@@ -137,10 +137,10 @@ static inline void *xdma_blk_last_desc(struct xdma_desc_block *block) ...@@ -137,10 +137,10 @@ static inline void *xdma_blk_last_desc(struct xdma_desc_block *block)
} }
/** /**
* xdma_link_desc_blocks - Link descriptor blocks for DMA transfer * xdma_link_sg_desc_blocks - Link SG descriptor blocks for DMA transfer
* @sw_desc: Tx descriptor pointer * @sw_desc: Tx descriptor pointer
*/ */
static void xdma_link_desc_blocks(struct xdma_desc *sw_desc) static void xdma_link_sg_desc_blocks(struct xdma_desc *sw_desc)
{ {
struct xdma_desc_block *block; struct xdma_desc_block *block;
u32 last_blk_desc, desc_control; u32 last_blk_desc, desc_control;
...@@ -239,6 +239,7 @@ xdma_alloc_desc(struct xdma_chan *chan, u32 desc_num) ...@@ -239,6 +239,7 @@ xdma_alloc_desc(struct xdma_chan *chan, u32 desc_num)
struct xdma_hw_desc *desc; struct xdma_hw_desc *desc;
dma_addr_t dma_addr; dma_addr_t dma_addr;
u32 dblk_num; u32 dblk_num;
u32 control;
void *addr; void *addr;
int i, j; int i, j;
...@@ -254,6 +255,8 @@ xdma_alloc_desc(struct xdma_chan *chan, u32 desc_num) ...@@ -254,6 +255,8 @@ xdma_alloc_desc(struct xdma_chan *chan, u32 desc_num)
if (!sw_desc->desc_blocks) if (!sw_desc->desc_blocks)
goto failed; goto failed;
control = XDMA_DESC_CONTROL(1, 0);
sw_desc->dblk_num = dblk_num; sw_desc->dblk_num = dblk_num;
for (i = 0; i < sw_desc->dblk_num; i++) { for (i = 0; i < sw_desc->dblk_num; i++) {
addr = dma_pool_alloc(chan->desc_pool, GFP_NOWAIT, &dma_addr); addr = dma_pool_alloc(chan->desc_pool, GFP_NOWAIT, &dma_addr);
...@@ -263,10 +266,10 @@ xdma_alloc_desc(struct xdma_chan *chan, u32 desc_num) ...@@ -263,10 +266,10 @@ xdma_alloc_desc(struct xdma_chan *chan, u32 desc_num)
sw_desc->desc_blocks[i].virt_addr = addr; sw_desc->desc_blocks[i].virt_addr = addr;
sw_desc->desc_blocks[i].dma_addr = dma_addr; sw_desc->desc_blocks[i].dma_addr = dma_addr;
for (j = 0, desc = addr; j < XDMA_DESC_ADJACENT; j++) for (j = 0, desc = addr; j < XDMA_DESC_ADJACENT; j++)
desc[j].control = cpu_to_le32(XDMA_DESC_CONTROL(1, 0)); desc[j].control = cpu_to_le32(control);
} }
xdma_link_desc_blocks(sw_desc); xdma_link_sg_desc_blocks(sw_desc);
return sw_desc; return sw_desc;
...@@ -577,6 +580,12 @@ static int xdma_alloc_chan_resources(struct dma_chan *chan) ...@@ -577,6 +580,12 @@ static int xdma_alloc_chan_resources(struct dma_chan *chan)
return 0; return 0;
} }
static enum dma_status xdma_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
struct dma_tx_state *state)
{
return dma_cookie_status(chan, cookie, state);
}
/** /**
* xdma_channel_isr - XDMA channel interrupt handler * xdma_channel_isr - XDMA channel interrupt handler
* @irq: IRQ number * @irq: IRQ number
...@@ -923,7 +932,7 @@ static int xdma_probe(struct platform_device *pdev) ...@@ -923,7 +932,7 @@ static int xdma_probe(struct platform_device *pdev)
xdev->dma_dev.dev = &pdev->dev; xdev->dma_dev.dev = &pdev->dev;
xdev->dma_dev.device_free_chan_resources = xdma_free_chan_resources; xdev->dma_dev.device_free_chan_resources = xdma_free_chan_resources;
xdev->dma_dev.device_alloc_chan_resources = xdma_alloc_chan_resources; xdev->dma_dev.device_alloc_chan_resources = xdma_alloc_chan_resources;
xdev->dma_dev.device_tx_status = dma_cookie_status; xdev->dma_dev.device_tx_status = xdma_tx_status;
xdev->dma_dev.device_prep_slave_sg = xdma_prep_device_sg; xdev->dma_dev.device_prep_slave_sg = xdma_prep_device_sg;
xdev->dma_dev.device_config = xdma_device_config; xdev->dma_dev.device_config = xdma_device_config;
xdev->dma_dev.device_issue_pending = xdma_issue_pending; xdev->dma_dev.device_issue_pending = xdma_issue_pending;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment