The sun6i driver is a good candidate for the new scheduled DMA driver. Convert it to it.
Signed-off-by: Maxime Ripard <[email protected]> --- drivers/dma/sun6i-dma.c | 853 ++++++++++-------------------------------------- 1 file changed, 181 insertions(+), 672 deletions(-) diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index 7ebcf9bec698..9133593fe7f5 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -24,6 +24,7 @@ #include <linux/slab.h> #include <linux/types.h> +#include "scheduled-dma.h" #include "virt-dma.h" /* @@ -51,17 +52,19 @@ /* * Channels specific registers */ -#define DMA_CHAN_ENABLE 0x00 +#define DMA_CHAN_BASE(chan) (0x100 + (chan) * 0x40) + +#define DMA_CHAN_ENABLE(chan) (DMA_CHAN_BASE(chan) + 0x00) #define DMA_CHAN_ENABLE_START BIT(0) #define DMA_CHAN_ENABLE_STOP 0 -#define DMA_CHAN_PAUSE 0x04 +#define DMA_CHAN_PAUSE(chan) (DMA_CHAN_BASE(chan) + 0x04) #define DMA_CHAN_PAUSE_PAUSE BIT(1) #define DMA_CHAN_PAUSE_RESUME 0 -#define DMA_CHAN_LLI_ADDR 0x08 +#define DMA_CHAN_LLI_ADDR(chan) (DMA_CHAN_BASE(chan) + 0x08) -#define DMA_CHAN_CUR_CFG 0x0c +#define DMA_CHAN_CUR_CFG(chan) (DMA_CHAN_BASE(chan) + 0x0c) #define DMA_CHAN_CFG_SRC_DRQ(x) ((x) & 0x1f) #define DMA_CHAN_CFG_SRC_IO_MODE BIT(5) #define DMA_CHAN_CFG_SRC_LINEAR_MODE (0 << 5) @@ -74,13 +77,13 @@ #define DMA_CHAN_CFG_DST_BURST(x) (DMA_CHAN_CFG_SRC_BURST(x) << 16) #define DMA_CHAN_CFG_DST_WIDTH(x) (DMA_CHAN_CFG_SRC_WIDTH(x) << 16) -#define DMA_CHAN_CUR_SRC 0x10 +#define DMA_CHAN_CUR_SRC(chan) (DMA_CHAN_BASE(chan) + 0x10) -#define DMA_CHAN_CUR_DST 0x14 +#define DMA_CHAN_CUR_DST(chan) (DMA_CHAN_BASE(chan) + 0x14) -#define DMA_CHAN_CUR_CNT 0x18 +#define DMA_CHAN_CUR_CNT(chan) (DMA_CHAN_BASE(chan) + 0x18) -#define DMA_CHAN_CUR_PARA 0x1c +#define DMA_CHAN_CUR_PARA(chan) (DMA_CHAN_BASE(chan) + 0x1c) /* @@ -125,114 +128,14 @@ struct sun6i_dma_lli { struct sun6i_dma_lli *v_lli_next; }; - -struct sun6i_desc { - struct virt_dma_desc vd; - dma_addr_t p_lli; - struct sun6i_dma_lli *v_lli; -}; - -struct sun6i_pchan { - u32 idx; - void __iomem *base; - struct sun6i_vchan *vchan; - struct sun6i_desc *desc; - struct sun6i_desc *done; -}; - -struct sun6i_vchan { - struct virt_dma_chan vc; - struct list_head node; - struct dma_slave_config cfg; - struct sun6i_pchan *phy; - u8 port; -}; - struct sun6i_dma_dev { - struct dma_device slave; void __iomem *base; struct clk *clk; int irq; - spinlock_t lock; struct reset_control *rstc; - struct tasklet_struct task; - atomic_t tasklet_shutdown; - struct list_head pending; - struct dma_pool *pool; - struct sun6i_pchan *pchans; - struct sun6i_vchan *vchans; const struct sun6i_dma_config *cfg; }; -static struct device *chan2dev(struct dma_chan *chan) -{ - return &chan->dev->device; -} - -static inline struct sun6i_dma_dev *to_sun6i_dma_dev(struct dma_device *d) -{ - return container_of(d, struct sun6i_dma_dev, slave); -} - -static inline struct sun6i_vchan *to_sun6i_vchan(struct dma_chan *chan) -{ - return container_of(chan, struct sun6i_vchan, vc.chan); -} - -static inline struct sun6i_desc * -to_sun6i_desc(struct dma_async_tx_descriptor *tx) -{ - return container_of(tx, struct sun6i_desc, vd.tx); -} - -static inline void sun6i_dma_dump_com_regs(struct sun6i_dma_dev *sdev) -{ - dev_dbg(sdev->slave.dev, "Common register:\n" - "\tmask0(%04x): 0x%08x\n" - "\tmask1(%04x): 0x%08x\n" - "\tpend0(%04x): 0x%08x\n" - "\tpend1(%04x): 0x%08x\n" - "\tstats(%04x): 0x%08x\n", - DMA_IRQ_EN(0), readl(sdev->base + DMA_IRQ_EN(0)), - DMA_IRQ_EN(1), readl(sdev->base + DMA_IRQ_EN(1)), - DMA_IRQ_STAT(0), readl(sdev->base + DMA_IRQ_STAT(0)), - DMA_IRQ_STAT(1), readl(sdev->base + DMA_IRQ_STAT(1)), - DMA_STAT, readl(sdev->base + DMA_STAT)); -} - -static inline void sun6i_dma_dump_chan_regs(struct sun6i_dma_dev *sdev, - struct sun6i_pchan *pchan) -{ - phys_addr_t reg = virt_to_phys(pchan->base); - - dev_dbg(sdev->slave.dev, "Chan %d reg: %pa\n" - "\t___en(%04x): \t0x%08x\n" - "\tpause(%04x): \t0x%08x\n" - "\tstart(%04x): \t0x%08x\n" - "\t__cfg(%04x): \t0x%08x\n" - "\t__src(%04x): \t0x%08x\n" - "\t__dst(%04x): \t0x%08x\n" - "\tcount(%04x): \t0x%08x\n" - "\t_para(%04x): \t0x%08x\n\n", - pchan->idx, ®, - DMA_CHAN_ENABLE, - readl(pchan->base + DMA_CHAN_ENABLE), - DMA_CHAN_PAUSE, - readl(pchan->base + DMA_CHAN_PAUSE), - DMA_CHAN_LLI_ADDR, - readl(pchan->base + DMA_CHAN_LLI_ADDR), - DMA_CHAN_CUR_CFG, - readl(pchan->base + DMA_CHAN_CUR_CFG), - DMA_CHAN_CUR_SRC, - readl(pchan->base + DMA_CHAN_CUR_SRC), - DMA_CHAN_CUR_DST, - readl(pchan->base + DMA_CHAN_CUR_DST), - DMA_CHAN_CUR_CNT, - readl(pchan->base + DMA_CHAN_CUR_CNT), - DMA_CHAN_CUR_PARA, - readl(pchan->base + DMA_CHAN_CUR_PARA)); -} - static inline s8 convert_burst(u32 maxburst) { switch (maxburst) { @@ -254,20 +157,16 @@ static inline s8 convert_buswidth(enum dma_slave_buswidth addr_width) return addr_width >> 1; } -static void *sun6i_dma_lli_add(struct sun6i_dma_lli *prev, - struct sun6i_dma_lli *next, - dma_addr_t next_phy, - struct sun6i_desc *txd) +static void *sun6i_dma_lli_queue(void *prev_v_lli, + void *v_lli, + dma_addr_t p_lli) { - if ((!prev && !txd) || !next) - return NULL; + struct sun6i_dma_lli *prev = (struct sun6i_dma_lli*)prev_v_lli; + struct sun6i_dma_lli *next = (struct sun6i_dma_lli*)v_lli; - if (!prev) { - txd->p_lli = next_phy; - txd->v_lli = next; - } else { - prev->p_lli_next = next_phy; - prev->v_lli_next = next; + if (prev) { + prev->p_lli_next = p_lli; + prev->v_lli_next = v_lli; } next->p_lli_next = LLI_LAST_ITEM; @@ -283,29 +182,28 @@ static inline int sun6i_dma_cfg_lli(struct sun6i_dma_lli *lli, { u8 src_width, dst_width, src_burst, dst_burst; - if (!config) - return -EINVAL; - - src_burst = convert_burst(config->src_maxburst); - if (src_burst) - return src_burst; + if (config) { + src_burst = convert_burst(config->src_maxburst); + if (src_burst) + return src_burst; - dst_burst = convert_burst(config->dst_maxburst); - if (dst_burst) - return dst_burst; + dst_burst = convert_burst(config->dst_maxburst); + if (dst_burst) + return dst_burst; - src_width = convert_buswidth(config->src_addr_width); - if (src_width) - return src_width; + src_width = convert_buswidth(config->src_addr_width); + if (src_width) + return src_width; - dst_width = convert_buswidth(config->dst_addr_width); - if (dst_width) - return dst_width; + dst_width = convert_buswidth(config->dst_addr_width); + if (dst_width) + return dst_width; - lli->cfg = DMA_CHAN_CFG_SRC_BURST(src_burst) | - DMA_CHAN_CFG_SRC_WIDTH(src_width) | - DMA_CHAN_CFG_DST_BURST(dst_burst) | - DMA_CHAN_CFG_DST_WIDTH(dst_width); + lli->cfg = DMA_CHAN_CFG_SRC_BURST(src_burst) | + DMA_CHAN_CFG_SRC_WIDTH(src_width) | + DMA_CHAN_CFG_DST_BURST(dst_burst) | + DMA_CHAN_CFG_DST_WIDTH(dst_width); + } lli->src = src; lli->dst = dst; @@ -315,156 +213,29 @@ static inline int sun6i_dma_cfg_lli(struct sun6i_dma_lli *lli, return 0; } -static inline void sun6i_dma_dump_lli(struct sun6i_vchan *vchan, - struct sun6i_dma_lli *lli) -{ - phys_addr_t p_lli = virt_to_phys(lli); - - dev_dbg(chan2dev(&vchan->vc.chan), - "\n\tdesc: p - %pa v - 0x%p\n" - "\t\tc - 0x%08x s - 0x%08x d - 0x%08x\n" - "\t\tl - 0x%08x p - 0x%08x n - 0x%08x\n", - &p_lli, lli, - lli->cfg, lli->src, lli->dst, - lli->len, lli->para, lli->p_lli_next); -} - -static void sun6i_dma_free_desc(struct virt_dma_desc *vd) -{ - struct sun6i_desc *txd = to_sun6i_desc(&vd->tx); - struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(vd->tx.chan->device); - struct sun6i_dma_lli *v_lli, *v_next; - dma_addr_t p_lli, p_next; - - if (unlikely(!txd)) - return; - - p_lli = txd->p_lli; - v_lli = txd->v_lli; - - while (v_lli) { - v_next = v_lli->v_lli_next; - p_next = v_lli->p_lli_next; - - dma_pool_free(sdev->pool, v_lli, p_lli); - - v_lli = v_next; - p_lli = p_next; - } - - kfree(txd); -} - -static int sun6i_dma_start_desc(struct sun6i_vchan *vchan) +static int sun6i_dma_channel_start(struct sdma_channel *schan, + struct sdma_desc *sdesc) { - struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(vchan->vc.chan.device); - struct virt_dma_desc *desc = vchan_next_desc(&vchan->vc); - struct sun6i_pchan *pchan = vchan->phy; + struct sun6i_dma_dev *sdc = schan->private; u32 irq_val, irq_reg, irq_offset; - if (!pchan) - return -EAGAIN; - - if (!desc) { - pchan->desc = NULL; - pchan->done = NULL; - return -EAGAIN; - } - - list_del(&desc->node); - - pchan->desc = to_sun6i_desc(&desc->tx); - pchan->done = NULL; - - sun6i_dma_dump_lli(vchan, pchan->desc->v_lli); - - irq_reg = pchan->idx / DMA_IRQ_CHAN_NR; - irq_offset = pchan->idx % DMA_IRQ_CHAN_NR; + irq_reg = schan->index / DMA_IRQ_CHAN_NR; + irq_offset = schan->index % DMA_IRQ_CHAN_NR; - irq_val = readl(sdev->base + DMA_IRQ_EN(irq_offset)); + irq_val = readl(sdc->base + DMA_IRQ_EN(irq_offset)); irq_val |= DMA_IRQ_QUEUE << (irq_offset * DMA_IRQ_CHAN_WIDTH); - writel(irq_val, sdev->base + DMA_IRQ_EN(irq_offset)); + writel(irq_val, sdc->base + DMA_IRQ_EN(irq_offset)); - writel(pchan->desc->p_lli, pchan->base + DMA_CHAN_LLI_ADDR); - writel(DMA_CHAN_ENABLE_START, pchan->base + DMA_CHAN_ENABLE); - - sun6i_dma_dump_com_regs(sdev); - sun6i_dma_dump_chan_regs(sdev, pchan); + writel(sdesc->p_lli, sdc->base + DMA_CHAN_LLI_ADDR(schan->index)); + writel(DMA_CHAN_ENABLE_START, sdc->base + DMA_CHAN_ENABLE(schan->index)); return 0; } -static void sun6i_dma_tasklet(unsigned long data) -{ - struct sun6i_dma_dev *sdev = (struct sun6i_dma_dev *)data; - const struct sun6i_dma_config *cfg = sdev->cfg; - struct sun6i_vchan *vchan; - struct sun6i_pchan *pchan; - unsigned int pchan_alloc = 0; - unsigned int pchan_idx; - - list_for_each_entry(vchan, &sdev->slave.channels, vc.chan.device_node) { - spin_lock_irq(&vchan->vc.lock); - - pchan = vchan->phy; - - if (pchan && pchan->done) { - if (sun6i_dma_start_desc(vchan)) { - /* - * No current txd associated with this channel - */ - dev_dbg(sdev->slave.dev, "pchan %u: free\n", - pchan->idx); - - /* Mark this channel free */ - vchan->phy = NULL; - pchan->vchan = NULL; - } - } - spin_unlock_irq(&vchan->vc.lock); - } - - spin_lock_irq(&sdev->lock); - for (pchan_idx = 0; pchan_idx < cfg->nr_max_channels; pchan_idx++) { - pchan = &sdev->pchans[pchan_idx]; - - if (pchan->vchan || list_empty(&sdev->pending)) - continue; - - vchan = list_first_entry(&sdev->pending, - struct sun6i_vchan, node); - - /* Remove from pending channels */ - list_del_init(&vchan->node); - pchan_alloc |= BIT(pchan_idx); - - /* Mark this channel allocated */ - pchan->vchan = vchan; - vchan->phy = pchan; - dev_dbg(sdev->slave.dev, "pchan %u: alloc vchan %p\n", - pchan->idx, &vchan->vc); - } - spin_unlock_irq(&sdev->lock); - - for (pchan_idx = 0; pchan_idx < cfg->nr_max_channels; pchan_idx++) { - if (!(pchan_alloc & BIT(pchan_idx))) - continue; - - pchan = sdev->pchans + pchan_idx; - vchan = pchan->vchan; - if (vchan) { - spin_lock_irq(&vchan->vc.lock); - sun6i_dma_start_desc(vchan); - spin_unlock_irq(&vchan->vc.lock); - } - } -} - static irqreturn_t sun6i_dma_interrupt(int irq, void *dev_id) { - struct sun6i_dma_dev *sdev = dev_id; - struct sun6i_vchan *vchan; - struct sun6i_pchan *pchan; + struct sdma *sdma = dev_id; + struct sun6i_dma_dev *sdev = sdma_priv(sdma); int i, j, ret = IRQ_NONE; u32 status; @@ -473,395 +244,174 @@ static irqreturn_t sun6i_dma_interrupt(int irq, void *dev_id) if (!status) continue; - dev_dbg(sdev->slave.dev, "DMA irq status %s: 0x%x\n", + dev_dbg(sdma->ddev.dev, "DMA irq status %s: 0x%x\n", i ? "high" : "low", status); writel(status, sdev->base + DMA_IRQ_STAT(i)); for (j = 0; (j < DMA_IRQ_CHAN_NR) && status; j++) { if (status & DMA_IRQ_QUEUE) { - pchan = sdev->pchans + j; - vchan = pchan->vchan; - - if (vchan) { - spin_lock(&vchan->vc.lock); - vchan_cookie_complete(&pchan->desc->vd); - pchan->done = pchan->desc; - spin_unlock(&vchan->vc.lock); - } + struct sdma_channel *schan = sdma->channels + j; + struct sdma_desc *sdesc; + + sdesc = sdma_report(sdma, schan, SDMA_REPORT_TRANSFER); + if (sdesc) + sun6i_dma_channel_start(schan, sdesc); } status = status >> DMA_IRQ_CHAN_WIDTH; } - if (!atomic_read(&sdev->tasklet_shutdown)) - tasklet_schedule(&sdev->task); ret = IRQ_HANDLED; } return ret; } -static struct dma_async_tx_descriptor *sun6i_dma_prep_dma_memcpy( - struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, - size_t len, unsigned long flags) +static int sun6i_dma_lli_init(void *v_lli, void *sreq_priv, + enum sdma_transfer_type type, + enum dma_transfer_direction dir, + dma_addr_t src, + dma_addr_t dst, u32 len, + struct dma_slave_config *config) { - struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(chan->device); - struct sun6i_vchan *vchan = to_sun6i_vchan(chan); - struct sun6i_dma_lli *v_lli; - struct sun6i_desc *txd; - dma_addr_t p_lli; + struct sun6i_dma_lli *lli = v_lli; s8 burst, width; + int ret; - dev_dbg(chan2dev(chan), - "%s; chan: %d, dest: %pad, src: %pad, len: %zu. flags: 0x%08lx\n", - __func__, vchan->vc.chan.chan_id, &dest, &src, len, flags); - - if (!len) - return NULL; - - txd = kzalloc(sizeof(*txd), GFP_NOWAIT); - if (!txd) - return NULL; - - v_lli = dma_pool_alloc(sdev->pool, GFP_NOWAIT, &p_lli); - if (!v_lli) { - dev_err(sdev->slave.dev, "Failed to alloc lli memory\n"); - goto err_txd_free; - } - - v_lli->src = src; - v_lli->dst = dest; - v_lli->len = len; - v_lli->para = NORMAL_WAIT; - - burst = convert_burst(8); - width = convert_buswidth(DMA_SLAVE_BUSWIDTH_4_BYTES); - v_lli->cfg |= DMA_CHAN_CFG_SRC_DRQ(DRQ_SDRAM) | - DMA_CHAN_CFG_DST_DRQ(DRQ_SDRAM) | - DMA_CHAN_CFG_DST_LINEAR_MODE | - DMA_CHAN_CFG_SRC_LINEAR_MODE | - DMA_CHAN_CFG_SRC_BURST(burst) | - DMA_CHAN_CFG_SRC_WIDTH(width) | - DMA_CHAN_CFG_DST_BURST(burst) | - DMA_CHAN_CFG_DST_WIDTH(width); - - sun6i_dma_lli_add(NULL, v_lli, p_lli, txd); - - sun6i_dma_dump_lli(vchan, v_lli); - - return vchan_tx_prep(&vchan->vc, &txd->vd, flags); - -err_txd_free: - kfree(txd); - return NULL; -} - -static struct dma_async_tx_descriptor *sun6i_dma_prep_slave_sg( - struct dma_chan *chan, struct scatterlist *sgl, - unsigned int sg_len, enum dma_transfer_direction dir, - unsigned long flags, void *context) -{ - struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(chan->device); - struct sun6i_vchan *vchan = to_sun6i_vchan(chan); - struct dma_slave_config *sconfig = &vchan->cfg; - struct sun6i_dma_lli *v_lli, *prev = NULL; - struct sun6i_desc *txd; - struct scatterlist *sg; - dma_addr_t p_lli; - int i, ret; - - if (!sgl) - return NULL; - - if (!is_slave_direction(dir)) { - dev_err(chan2dev(chan), "Invalid DMA direction\n"); - return NULL; - } - - txd = kzalloc(sizeof(*txd), GFP_NOWAIT); - if (!txd) - return NULL; - - for_each_sg(sgl, sg, sg_len, i) { - v_lli = dma_pool_alloc(sdev->pool, GFP_NOWAIT, &p_lli); - if (!v_lli) - goto err_lli_free; + ret = sun6i_dma_cfg_lli(lli, src, dst, len, + config); + if (ret) + return ret; + switch (type) { + case SDMA_TRANSFER_MEMCPY: + burst = convert_burst(8); + width = convert_buswidth(DMA_SLAVE_BUSWIDTH_4_BYTES); + + lli->cfg |= DMA_CHAN_CFG_SRC_DRQ(DRQ_SDRAM) | + DMA_CHAN_CFG_DST_DRQ(DRQ_SDRAM) | + DMA_CHAN_CFG_DST_LINEAR_MODE | + DMA_CHAN_CFG_SRC_LINEAR_MODE | + DMA_CHAN_CFG_SRC_BURST(burst) | + DMA_CHAN_CFG_DST_BURST(burst) | + DMA_CHAN_CFG_SRC_WIDTH(width) | + DMA_CHAN_CFG_DST_WIDTH(width); + break; + + case SDMA_TRANSFER_SLAVE: if (dir == DMA_MEM_TO_DEV) { - ret = sun6i_dma_cfg_lli(v_lli, sg_dma_address(sg), - sconfig->dst_addr, sg_dma_len(sg), - sconfig); - if (ret) - goto err_cur_lli_free; - - v_lli->cfg |= DMA_CHAN_CFG_DST_IO_MODE | + lli->cfg |= DMA_CHAN_CFG_DST_IO_MODE | DMA_CHAN_CFG_SRC_LINEAR_MODE | - DMA_CHAN_CFG_SRC_DRQ(DRQ_SDRAM) | - DMA_CHAN_CFG_DST_DRQ(vchan->port); - - dev_dbg(chan2dev(chan), - "%s; chan: %d, dest: %pad, src: %pad, len: %u. flags: 0x%08lx\n", - __func__, vchan->vc.chan.chan_id, - &sconfig->dst_addr, &sg_dma_address(sg), - sg_dma_len(sg), flags); - + DMA_CHAN_CFG_DST_DRQ((u32)sreq_priv) | + DMA_CHAN_CFG_SRC_DRQ(DRQ_SDRAM); } else { - ret = sun6i_dma_cfg_lli(v_lli, sconfig->src_addr, - sg_dma_address(sg), sg_dma_len(sg), - sconfig); - if (ret) - goto err_cur_lli_free; - - v_lli->cfg |= DMA_CHAN_CFG_DST_LINEAR_MODE | + lli->cfg |= DMA_CHAN_CFG_DST_LINEAR_MODE | DMA_CHAN_CFG_SRC_IO_MODE | DMA_CHAN_CFG_DST_DRQ(DRQ_SDRAM) | - DMA_CHAN_CFG_SRC_DRQ(vchan->port); - - dev_dbg(chan2dev(chan), - "%s; chan: %d, dest: %pad, src: %pad, len: %u. flags: 0x%08lx\n", - __func__, vchan->vc.chan.chan_id, - &sg_dma_address(sg), &sconfig->src_addr, - sg_dma_len(sg), flags); + DMA_CHAN_CFG_SRC_DRQ((u32)sreq_priv); } - prev = sun6i_dma_lli_add(prev, v_lli, p_lli, txd); - } - - dev_dbg(chan2dev(chan), "First: %pad\n", &txd->p_lli); - for (prev = txd->v_lli; prev; prev = prev->v_lli_next) - sun6i_dma_dump_lli(vchan, prev); + break; - return vchan_tx_prep(&vchan->vc, &txd->vd, flags); + default: + break; + } -err_cur_lli_free: - dma_pool_free(sdev->pool, v_lli, p_lli); -err_lli_free: - for (prev = txd->v_lli; prev; prev = prev->v_lli_next) - dma_pool_free(sdev->pool, prev, virt_to_phys(prev)); - kfree(txd); - return NULL; + return 0; } -static int sun6i_dma_config(struct dma_chan *chan, - struct dma_slave_config *config) +static bool sun6i_dma_lli_has_next(void *v_lli) { - struct sun6i_vchan *vchan = to_sun6i_vchan(chan); + struct sun6i_dma_lli *lli = v_lli; - memcpy(&vchan->cfg, config, sizeof(*config)); - - return 0; -} + return lli->v_lli_next != NULL; +} -static int sun6i_dma_pause(struct dma_chan *chan) +static void *sun6i_dma_lli_next(void *v_lli) { - struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(chan->device); - struct sun6i_vchan *vchan = to_sun6i_vchan(chan); - struct sun6i_pchan *pchan = vchan->phy; - - dev_dbg(chan2dev(chan), "vchan %p: pause\n", &vchan->vc); - - if (pchan) { - writel(DMA_CHAN_PAUSE_PAUSE, - pchan->base + DMA_CHAN_PAUSE); - } else { - spin_lock(&sdev->lock); - list_del_init(&vchan->node); - spin_unlock(&sdev->lock); - } + struct sun6i_dma_lli *lli = v_lli; - return 0; + return lli->v_lli_next; } -static int sun6i_dma_resume(struct dma_chan *chan) +static size_t sun6i_dma_lli_size(void *v_lli) { - struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(chan->device); - struct sun6i_vchan *vchan = to_sun6i_vchan(chan); - struct sun6i_pchan *pchan = vchan->phy; - unsigned long flags; - - dev_dbg(chan2dev(chan), "vchan %p: resume\n", &vchan->vc); - - spin_lock_irqsave(&vchan->vc.lock, flags); - - if (pchan) { - writel(DMA_CHAN_PAUSE_RESUME, - pchan->base + DMA_CHAN_PAUSE); - } else if (!list_empty(&vchan->vc.desc_issued)) { - spin_lock(&sdev->lock); - list_add_tail(&vchan->node, &sdev->pending); - spin_unlock(&sdev->lock); - } - - spin_unlock_irqrestore(&vchan->vc.lock, flags); + struct sun6i_dma_lli *lli = v_lli; - return 0; + return lli->len; } -static int sun6i_dma_terminate_all(struct dma_chan *chan) +static int sun6i_dma_channel_pause(struct sdma_channel *schan) { - struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(chan->device); - struct sun6i_vchan *vchan = to_sun6i_vchan(chan); - struct sun6i_pchan *pchan = vchan->phy; - unsigned long flags; - LIST_HEAD(head); - - spin_lock(&sdev->lock); - list_del_init(&vchan->node); - spin_unlock(&sdev->lock); - - spin_lock_irqsave(&vchan->vc.lock, flags); - - vchan_get_all_descriptors(&vchan->vc, &head); - - if (pchan) { - writel(DMA_CHAN_ENABLE_STOP, pchan->base + DMA_CHAN_ENABLE); - writel(DMA_CHAN_PAUSE_RESUME, pchan->base + DMA_CHAN_PAUSE); + struct sun6i_dma_dev *sdc = schan->private; - vchan->phy = NULL; - pchan->vchan = NULL; - pchan->desc = NULL; - pchan->done = NULL; - } - - spin_unlock_irqrestore(&vchan->vc.lock, flags); - - vchan_dma_desc_free_list(&vchan->vc, &head); + writel(DMA_CHAN_PAUSE_PAUSE, sdc->base + DMA_CHAN_PAUSE(schan->index)); return 0; } -static enum dma_status sun6i_dma_tx_status(struct dma_chan *chan, - dma_cookie_t cookie, - struct dma_tx_state *state) +static int sun6i_dma_channel_resume(struct sdma_channel *schan) { - struct sun6i_vchan *vchan = to_sun6i_vchan(chan); - struct sun6i_pchan *pchan = vchan->phy; - struct sun6i_dma_lli *lli; - struct virt_dma_desc *vd; - struct sun6i_desc *txd; - enum dma_status ret; - unsigned long flags; - size_t bytes = 0; - - ret = dma_cookie_status(chan, cookie, state); - if (ret == DMA_COMPLETE) - return ret; - - spin_lock_irqsave(&vchan->vc.lock, flags); + struct sun6i_dma_dev *sdc = schan->private; - vd = vchan_find_desc(&vchan->vc, cookie); - txd = to_sun6i_desc(&vd->tx); + writel(DMA_CHAN_PAUSE_RESUME, sdc->base + DMA_CHAN_PAUSE(schan->index)); - if (vd) { - for (lli = txd->v_lli; lli != NULL; lli = lli->v_lli_next) - bytes += lli->len; - } else if (!pchan || !pchan->desc) { - bytes = 0; - } else { - bytes = readl(pchan->base + DMA_CHAN_CUR_CNT); - } - - spin_unlock_irqrestore(&vchan->vc.lock, flags); - - dma_set_residue(state, bytes); - - return ret; + return 0; } -static void sun6i_dma_issue_pending(struct dma_chan *chan) +static int sun6i_dma_channel_terminate(struct sdma_channel *schan) { - struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(chan->device); - struct sun6i_vchan *vchan = to_sun6i_vchan(chan); - unsigned long flags; - - spin_lock_irqsave(&vchan->vc.lock, flags); - - if (vchan_issue_pending(&vchan->vc)) { - spin_lock(&sdev->lock); - - if (!vchan->phy && list_empty(&vchan->node)) { - list_add_tail(&vchan->node, &sdev->pending); - tasklet_schedule(&sdev->task); - dev_dbg(chan2dev(chan), "vchan %p: issued\n", - &vchan->vc); - } + struct sun6i_dma_dev *sdc = schan->private; - spin_unlock(&sdev->lock); - } else { - dev_dbg(chan2dev(chan), "vchan %p: nothing to issue\n", - &vchan->vc); - } - - spin_unlock_irqrestore(&vchan->vc.lock, flags); -} + writel(DMA_CHAN_ENABLE_STOP, sdc->base + DMA_CHAN_ENABLE(schan->index)); + writel(DMA_CHAN_PAUSE_RESUME, sdc->base + DMA_CHAN_PAUSE(schan->index)); -static int sun6i_dma_alloc_chan_resources(struct dma_chan *chan) -{ return 0; } -static void sun6i_dma_free_chan_resources(struct dma_chan *chan) +static size_t sun6i_dma_channel_residue(struct sdma_channel *schan) { - struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(chan->device); - struct sun6i_vchan *vchan = to_sun6i_vchan(chan); - unsigned long flags; - - spin_lock_irqsave(&sdev->lock, flags); - list_del_init(&vchan->node); - spin_unlock_irqrestore(&sdev->lock, flags); + struct sun6i_dma_dev *sdc = schan->private; - vchan_free_chan_resources(&vchan->vc); + return readl(sdc->base + DMA_CHAN_CUR_CNT(schan->index)); } static struct dma_chan *sun6i_dma_of_xlate(struct of_phandle_args *dma_spec, struct of_dma *ofdma) { - struct sun6i_dma_dev *sdev = ofdma->of_dma_data; - struct sun6i_vchan *vchan; + struct sdma *sdma = ofdma->of_dma_data; + struct sun6i_dma_dev *sdev = sdma_priv(sdma); + struct sdma_request *sreq; struct dma_chan *chan; - u8 port = dma_spec->args[0]; + u32 port = dma_spec->args[0]; if (port > sdev->cfg->nr_max_requests) return NULL; - chan = dma_get_any_slave_channel(&sdev->slave); + chan = dma_get_any_slave_channel(&sdma->ddev); if (!chan) return NULL; - vchan = to_sun6i_vchan(chan); - vchan->port = port; + sreq = to_sdma_request(chan); + sreq->private = (void *)port; return chan; } -static inline void sun6i_kill_tasklet(struct sun6i_dma_dev *sdev) -{ - /* Disable all interrupts from DMA */ - writel(0, sdev->base + DMA_IRQ_EN(0)); - writel(0, sdev->base + DMA_IRQ_EN(1)); - - /* Prevent spurious interrupts from scheduling the tasklet */ - atomic_inc(&sdev->tasklet_shutdown); - - /* Make sure we won't have any further interrupts */ - devm_free_irq(sdev->slave.dev, sdev->irq, sdev); - - /* Actually prevent the tasklet from being scheduled */ - tasklet_kill(&sdev->task); -} - -static inline void sun6i_dma_free(struct sun6i_dma_dev *sdev) -{ - int i; - - for (i = 0; i < sdev->cfg->nr_max_vchans; i++) { - struct sun6i_vchan *vchan = &sdev->vchans[i]; - - list_del(&vchan->vc.chan.device_node); - tasklet_kill(&vchan->vc.task); - } -} +static struct sdma_ops sun6i_dma_ops = { + .channel_pause = sun6i_dma_channel_pause, + .channel_residue = sun6i_dma_channel_residue, + .channel_resume = sun6i_dma_channel_resume, + .channel_start = sun6i_dma_channel_start, + .channel_terminate = sun6i_dma_channel_terminate, + + .lli_has_next = sun6i_dma_lli_has_next, + .lli_init = sun6i_dma_lli_init, + .lli_next = sun6i_dma_lli_next, + .lli_queue = sun6i_dma_lli_queue, + .lli_size = sun6i_dma_lli_size, +}; /* * For A31: @@ -904,19 +454,29 @@ static struct of_device_id sun6i_dma_match[] = { static int sun6i_dma_probe(struct platform_device *pdev) { + const struct sun6i_dma_config *cfg; const struct of_device_id *device; struct sun6i_dma_dev *sdc; struct resource *res; - int ret, i; - - sdc = devm_kzalloc(&pdev->dev, sizeof(*sdc), GFP_KERNEL); - if (!sdc) - return -ENOMEM; + struct sdma *sdma; + int ret; device = of_match_device(sun6i_dma_match, &pdev->dev); if (!device) return -ENODEV; - sdc->cfg = device->data; + cfg = device->data; + + sdma = sdma_alloc(&pdev->dev, + cfg->nr_max_channels, + cfg->nr_max_vchans, + sizeof(struct sun6i_dma_lli), + sizeof(*sdc)); + if (IS_ERR(sdma)) + return PTR_ERR(sdma); + + sdc = sdma_priv(sdma); + sdma_set_chan_private(sdma, sdc); + sdc->cfg = cfg; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); sdc->base = devm_ioremap_resource(&pdev->dev, res); @@ -941,75 +501,28 @@ static int sun6i_dma_probe(struct platform_device *pdev) return PTR_ERR(sdc->rstc); } - sdc->pool = dmam_pool_create(dev_name(&pdev->dev), &pdev->dev, - sizeof(struct sun6i_dma_lli), 4, 0); - if (!sdc->pool) { - dev_err(&pdev->dev, "No memory for descriptors dma pool\n"); - return -ENOMEM; - } + platform_set_drvdata(pdev, sdma); - platform_set_drvdata(pdev, sdc); - INIT_LIST_HEAD(&sdc->pending); - spin_lock_init(&sdc->lock); - - dma_cap_set(DMA_PRIVATE, sdc->slave.cap_mask); - dma_cap_set(DMA_MEMCPY, sdc->slave.cap_mask); - dma_cap_set(DMA_SLAVE, sdc->slave.cap_mask); - - INIT_LIST_HEAD(&sdc->slave.channels); - sdc->slave.device_alloc_chan_resources = sun6i_dma_alloc_chan_resources; - sdc->slave.device_free_chan_resources = sun6i_dma_free_chan_resources; - sdc->slave.device_tx_status = sun6i_dma_tx_status; - sdc->slave.device_issue_pending = sun6i_dma_issue_pending; - sdc->slave.device_prep_slave_sg = sun6i_dma_prep_slave_sg; - sdc->slave.device_prep_dma_memcpy = sun6i_dma_prep_dma_memcpy; - sdc->slave.copy_align = 4; - sdc->slave.device_config = sun6i_dma_config; - sdc->slave.device_pause = sun6i_dma_pause; - sdc->slave.device_resume = sun6i_dma_resume; - sdc->slave.device_terminate_all = sun6i_dma_terminate_all; - sdc->slave.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | - BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | - BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); - sdc->slave.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | - BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | - BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); - sdc->slave.directions = BIT(DMA_DEV_TO_MEM) | - BIT(DMA_MEM_TO_DEV); - sdc->slave.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; - sdc->slave.dev = &pdev->dev; - - sdc->pchans = devm_kcalloc(&pdev->dev, sdc->cfg->nr_max_channels, - sizeof(struct sun6i_pchan), GFP_KERNEL); - if (!sdc->pchans) - return -ENOMEM; - - sdc->vchans = devm_kcalloc(&pdev->dev, sdc->cfg->nr_max_vchans, - sizeof(struct sun6i_vchan), GFP_KERNEL); - if (!sdc->vchans) - return -ENOMEM; - - tasklet_init(&sdc->task, sun6i_dma_tasklet, (unsigned long)sdc); - - for (i = 0; i < sdc->cfg->nr_max_channels; i++) { - struct sun6i_pchan *pchan = &sdc->pchans[i]; - - pchan->idx = i; - pchan->base = sdc->base + 0x100 + i * 0x40; - } + dma_cap_set(DMA_PRIVATE, sdma->ddev.cap_mask); + dma_cap_set(DMA_MEMCPY, sdma->ddev.cap_mask); + dma_cap_set(DMA_SLAVE, sdma->ddev.cap_mask); - for (i = 0; i < sdc->cfg->nr_max_vchans; i++) { - struct sun6i_vchan *vchan = &sdc->vchans[i]; - - INIT_LIST_HEAD(&vchan->node); - vchan->vc.desc_free = sun6i_dma_free_desc; - vchan_init(&vchan->vc, &sdc->slave); - } + sdma->ddev.copy_align = 4; + sdma->ddev.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | + BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); + sdma->ddev.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | + BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); + sdma->ddev.directions = BIT(DMA_DEV_TO_MEM) | + BIT(DMA_MEM_TO_DEV); + sdma->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; + sdma->ddev.dev = &pdev->dev; ret = reset_control_deassert(sdc->rstc); if (ret) { dev_err(&pdev->dev, "Couldn't deassert the device from reset\n"); - goto err_chan_free; + goto err_free; } ret = clk_prepare_enable(sdc->clk); @@ -1019,20 +532,20 @@ static int sun6i_dma_probe(struct platform_device *pdev) } ret = devm_request_irq(&pdev->dev, sdc->irq, sun6i_dma_interrupt, 0, - dev_name(&pdev->dev), sdc); + dev_name(&pdev->dev), sdma); if (ret) { dev_err(&pdev->dev, "Cannot request IRQ\n"); goto err_clk_disable; } - ret = dma_async_device_register(&sdc->slave); + ret = sdma_register(sdma, &sun6i_dma_ops); if (ret) { dev_warn(&pdev->dev, "Failed to register DMA engine device\n"); - goto err_irq_disable; + goto err_clk_disable; } ret = of_dma_controller_register(pdev->dev.of_node, sun6i_dma_of_xlate, - sdc); + sdma); if (ret) { dev_err(&pdev->dev, "of_dma_controller_register failed\n"); goto err_dma_unregister; @@ -1050,31 +563,27 @@ static int sun6i_dma_probe(struct platform_device *pdev) return 0; err_dma_unregister: - dma_async_device_unregister(&sdc->slave); -err_irq_disable: - sun6i_kill_tasklet(sdc); + sdma_unregister(sdma); err_clk_disable: clk_disable_unprepare(sdc->clk); err_reset_assert: reset_control_assert(sdc->rstc); -err_chan_free: - sun6i_dma_free(sdc); +err_free: + sdma_free(sdma); + return ret; } static int sun6i_dma_remove(struct platform_device *pdev) { - struct sun6i_dma_dev *sdc = platform_get_drvdata(pdev); + struct sdma *sdma = platform_get_drvdata(pdev); + struct sun6i_dma_dev *sdc = sdma_priv(sdma); of_dma_controller_free(pdev->dev.of_node); - dma_async_device_unregister(&sdc->slave); - - sun6i_kill_tasklet(sdc); - + sdma_unregister(sdma); clk_disable_unprepare(sdc->clk); reset_control_assert(sdc->rstc); - - sun6i_dma_free(sdc); + sdma_free(sdma); return 0; } -- 2.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
