add uart DMA function
cover add uart DMA function
In Mediatek SOCs, the uart can support DMA function.
Base on DMA engine formwork, we add the DMA code to support uart. And put the code under drivers/dma.
This series contains document bindings, Kconfig to control the function enable or not, device tree including interrupt and dma device node, the code of UART DMA function.
Long Cheng (4):
dt-bindings: dma: uart: add uart dma bindings
dmaengine: mtk_uart_dma: add Mediatek uart DMA support
serial: 8250-mtk: add uart DMA support
arm: dts: mt2701: add uart APDMA to device tree
.../devicetree/bindings/dma/8250_mtk_dma.txt | 32 + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 50 + drivers/dma/8250_mtk_dma.c | 1049 ++++++++++++++++++++ drivers/dma/Kconfig | 11 + drivers/dma/Makefile | 1 + drivers/tty/serial/8250/8250_mtk.c | 211 +++- 6 files changed, 1353 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/dma/8250_mtk_dma.txt create mode 100644 drivers/dma/8250_mtk_dma.c
Signature · 1 line
1.7.9.5
PATCH 1/4 dt-bindings: dma: uart: add uart dma bindings
add uart dma bindings
--- .../devicetree/bindings/dma/8250_mtk_dma.txt | 32 ++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Documentation/devicetree/bindings/dma/8250_mtk_dma.txt
Documentation/devicetree/bindings/dma/8250_mtk_dma.txt new file +32 -0
@@ -0,0 +1,32 @@ +* Mediatek UART APDMA Controller + +Required properties: +- compatible should contain: + * "mediatek,mt2712-uart-dma" for MT2712 compatible APDMA + * "mediatek,mt6577-uart-dma" for MT6577 and all of the above + +- reg: The base address of the APDMA register bank. + +- interrupts: A single interrupt specifier. + +- clocks : Must contain an entry for each entry in clock-names. + See ../clocks/clock-bindings.txt for details. +- clock-names: The APDMA clock for register accesses + +Examples: + + apdma: dma-controller@11000380 { + compatible = "mediatek,mt2712-uart-dma"; + reg = <0 0x11000380 0 0x400>; + interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 64 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 65 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 66 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 67 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 68 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 69 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 70 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_AP_DMA>; + clock-names = "apdma"; + #dma-cells = <1>; + };
Rob Herring
maintainerPATCH 1/4 dt-bindings: dma: uart: add uart dma bindings
Quoted 37 lines · Long Cheng
add uart dma bindings
Signed-off-by Long Cheng <[email protected]>--- .../devicetree/bindings/dma/8250_mtk_dma.txt | 32 ++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Documentation/devicetree/bindings/dma/8250_mtk_dma.txtDocumentation/devicetree/bindings/dma/8250_mtk_dma.txt new file +23
-0@@ -0,0 +1,32 @@ +* Mediatek UART APDMA Controller + +Required properties: +- compatible should contain: + * "mediatek,mt2712-uart-dma" for MT2712 compatible APDMA + * "mediatek,mt6577-uart-dma" for MT6577 and all of the above + +- reg: The base address of the APDMA register bank. + +- interrupts: A single interrupt specifier. + +- clocks : Must contain an entry for each entry in clock-names. + See ../clocks/clock-bindings.txt for details. +- clock-names: The APDMA clock for register accesses + +Examples: + + apdma: dma-controller at 11000380 { + compatible = "mediatek,mt2712-uart-dma"; + reg = <0 0x11000380 0 0x400>; + interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 64 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 65 IRQ_TYPE_LEVEL_LOW>,
Documentation/devicetree/bindings/dma/8250_mtk_dma.txt line 32
Quoted 10 lines
Documentation/devicetree/bindings/dma/8250_mtk_dma.txt new file +9
-0+ <GIC_SPI 66 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 67 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 68 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 69 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 70 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_AP_DMA>; + clock-names = "apdma"; + #dma-cells = <1>; + };
Please fix this.
Otherwise,
PATCH 2/4 dmaengine: mtk_uart_dma: add Mediatek uart DMA support
In reply to Long ChengIn DMA engine framework, add 8250 mtk dma to support it.
--- drivers/dma/8250_mtk_dma.c | 1049 ++++++++++++++++++++++++++++++++++++++++++++ drivers/dma/Kconfig | 11 + drivers/dma/Makefile | 1 + 3 files changed, 1061 insertions(+) create mode 100644 drivers/dma/8250_mtk_dma.c
drivers/dma/8250_mtk_dma.c new file +1049 -0
@@ -0,0 +1,1049 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Mediatek 8250 DMA driver. +* +* Copyright (c) 2018 MediaTek Inc. +* Author: Long Cheng <[email protected]> +*/ + +#define pr_fmt (fmt) "8250-mtk-dma: " fmt +#define DRV_NAME "8250-mtk-dma" + +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/dmaengine.h> +#include <linux/dma-mapping.h> +#include <linux/err.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/of_dma.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/spinlock.h> +#include <linux/pm_runtime.h> + +#include "virt-dma.h" + +#define MTK_SDMA_REQUESTS 127 +#define MTK_SDMA_CHANNELS (CONFIG_SERIAL_8250_NR_UARTS * 2) + +#define VFF_RX_INT_FLAG_CLR_B (BIT(0U) | BIT(1U)) +#define VFF_TX_INT_FLAG_CLR_B 0 +#define VFF_RX_INT_EN0_B BIT(0U)/*rx valid size >= vff thre */ +#define VFF_RX_INT_EN1_B BIT(1U) +#define VFF_TX_INT_EN_B BIT(0U)/*tx left size >= vff thre */ +#define VFF_INT_EN_CLR_B 0 +#define VFF_WARM_RST_B BIT(0U) +#define VFF_EN_B BIT(0U) +#define VFF_STOP_B BIT(0U) +#define VFF_STOP_CLR_B 0 +#define VFF_FLUSH_B BIT(0U) +#define VFF_FLUSH_CLR_B 0 +#define VFF_4G_SUPPORT_B BIT(0U) +#define VFF_4G_SUPPORT_CLR_B 0 + +/* interrupt trigger level for tx */ +#define VFF_TX_THRE (n) ((n) * 7 / 8) +/* interrupt trigger level for rx */ +#define VFF_RX_THRE (n) ((n) * 3 / 4) + +#define MTK_DMA_RING_SIZE 0xffffU +/* invert this bit when wrap ring head again*/ +#define MTK_DMA_RING_WRAP 0x10000U + +struct mtk_dmadev { +struct dma_device ddev; +void __iomem *mem_base[MTK_SDMA_CHANNELS ]; +spinlock_t lock;/* dma dev lock */ +struct tasklet_struct task; +struct list_head pending; +struct clk *clk; +unsigned int dma_requests; +bool support_33bits; +unsigned int dma_irq[MTK_SDMA_CHANNELS ]; +struct mtk_chan *lch_map[MTK_SDMA_CHANNELS ]; +}; + +struct mtk_chan { +struct virt_dma_chan vc; +struct list_head node; +struct dma_slave_config cfg; +void __iomem *channel_base; +struct mtk_dma_desc *desc; + +bool paused; +bool requested; + +unsigned int dma_sig; +unsigned int dma_ch; +unsigned int sgidx; +unsigned int remain_size; +unsigned int rx_ptr; + +/*sync*/ +struct completion done;/* dma transfer done */ +spinlock_t lock;/* channel lock */ +atomic_t loopcnt; +atomic_t entry;/* entry count */ +}; + +struct mtk_dma_sg { +dma_addr_t addr; +unsigned int en;/* number of elements (24-bit) */ +unsigned int fn;/* number of frames (16-bit) */ +}; + +struct mtk_dma_desc { +struct virt_dma_desc vd; +enum dma_transfer_direction dir; +dma_addr_t dev_addr; + +unsigned int sglen; +struct mtk_dma_sg sg[0 ]; +}; + +enum { +VFF_INT_FLAG =0x00 , +VFF_INT_EN =0x04 , +VFF_EN =0x08 , +VFF_RST =0x0c , +VFF_STOP =0x10 , +VFF_FLUSH =0x14 , +VFF_ADDR =0x1c , +VFF_LEN =0x24 , +VFF_THRE =0x28 , +VFF_WPT =0x2c , +VFF_RPT =0x30 , +/*TX: the buffer size HW can read. RX: the buffer size SW can read.*/ +VFF_VALID_SIZE =0x3c , +/*TX: the buffer size SW can write. RX: the buffer size HW can write.*/ +VFF_LEFT_SIZE =0x40 , +VFF_DEBUG_STATUS =0x50 , +VFF_4G_SUPPORT =0x54 , +}; + +static bool mtk_dma_filter_fn (struct dma_chan *chan,void *param); +static struct of_dma_filter_info mtk_dma_info = { + .filter_fn = mtk_dma_filter_fn, +}; + +static inline struct mtk_dmadev *to_mtk_dma_dev (struct dma_device *d) +{ + return container_of(d, struct mtk_dmadev, ddev); +} + +static inline struct mtk_chan *to_mtk_dma_chan (struct dma_chan *c) +{ + return container_of(c, struct mtk_chan, vc.chan); +} + +static inline struct mtk_dma_desc *to_mtk_dma_desc + (struct dma_async_tx_descriptor *t) +{ + return container_of(t, struct mtk_dma_desc, vd.tx); +} + +static void mtk_dma_chan_write (struct mtk_chan *c, +unsigned int reg,unsigned int val) +{ +writel (val, c->channel_base + reg); +} + +static unsigned int mtk_dma_chan_read (struct mtk_chan *c,unsigned int reg) +{ +return readl (c->channel_base + reg); +} + +static void mtk_dma_desc_free (struct virt_dma_desc *vd) +{ +struct dma_chan *chan = vd->tx.chan; +struct mtk_chan *c =to_mtk_dma_chan (chan); +unsigned long flags; + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->desc && c->cfg.direction ==DMA_DEV_TO_MEM ) +atomic_dec (&c->entry); + +kfree (c->desc); + c->desc =NULL ; +spin_unlock_irqrestore (&c->vc.lock, flags); +} + +static int mtk_dma_clk_enable (struct mtk_dmadev *mtkd) +{ +int ret; + + ret =clk_prepare_enable (mtkd->clk); +if (ret) { +dev_err (mtkd->ddev.dev,"Couldn't enable the clock\n" ); +return ret; + } + +return 0 ; +} + +static void mtk_dma_clk_disable (struct mtk_dmadev *mtkd) +{ +clk_disable_unprepare (mtkd->clk); +} + +static void mtk_dma_remove_virt_list (dma_cookie_t cookie, +struct virt_dma_chan *vc) +{ +struct virt_dma_desc *vd; + +if (list_empty (&vc->desc_issued) ==0 ) { +list_for_each_entry (vd, &vc->desc_issued, node) { +if (cookie == vd->tx.cookie) { +INIT_LIST_HEAD (&vc->desc_issued); +break ; + } + } + } +} + +static void mtk_dma_tx_flush (struct dma_chan *chan) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); + +if (mtk_dma_chan_read (c,VFF_FLUSH ) ==0U ) { +mtk_dma_chan_write (c,VFF_FLUSH ,VFF_FLUSH_B ); +if (atomic_dec_and_test (&c->loopcnt)) +complete (&c->done); + } +} + +/* +* check whether the dma flush operation is finished or not. +* return 0 for flush success. +* return others for flush timeout. +*/ +static int mtk_dma_check_flush_result (struct dma_chan *chan) +{ +struct timespec start, end; +struct mtk_chan *c =to_mtk_dma_chan (chan); + + start =ktime_to_timespec (ktime_get ()); + +while ((mtk_dma_chan_read (c,VFF_FLUSH ) &VFF_FLUSH_B ) ==VFF_FLUSH_B ) { + end =ktime_to_timespec (ktime_get ()); +if ((end.tv_sec - start.tv_sec) >1 || + ((end.tv_sec - start.tv_sec) ==1 && + end.tv_nsec > start.tv_nsec)) { +dev_err (chan->device->dev, +"[DMA] Polling flush timeout\n" ); +return -1 ; + } + } + +return 0 ; +} + +static void mtk_dma_tx_write (struct dma_chan *chan) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +unsigned int txcount = c->remain_size; +unsigned int len, send, left, wpt, wrap; + +if (atomic_inc_return (&c->entry) >1 ) { +if (vchan_issue_pending (&c->vc) && !c->desc) { +spin_lock (&mtkd->lock); +list_add_tail (&c->node, &mtkd->pending); +spin_unlock (&mtkd->lock); +tasklet_schedule (&mtkd->task); + } + }else { + len =mtk_dma_chan_read (c,VFF_LEN ); +if (mtk_dma_check_flush_result (chan) !=0 ) +return ; + +while ((left =mtk_dma_chan_read (c,VFF_LEFT_SIZE )) >0U ) { + send =min (left, c->remain_size); + wpt =mtk_dma_chan_read (c,VFF_WPT ); + wrap = wpt &MTK_DMA_RING_WRAP ?0U :MTK_DMA_RING_WRAP ; + +if ((wpt & (len -1U )) + send < len) +mtk_dma_chan_write (c,VFF_WPT , wpt + send); +else +mtk_dma_chan_write (c,VFF_WPT , + ((wpt + send) & (len -1U )) + | wrap); + + c->remain_size -= send; +if (c->remain_size ==0U ) +break ; + } + +if (txcount != c->remain_size) { +mtk_dma_chan_write (c,VFF_INT_EN ,VFF_TX_INT_EN_B ); +mtk_dma_tx_flush (chan); + } + } +atomic_dec (&c->entry); +} + +static void mtk_dma_start_tx (struct mtk_chan *c) +{ +if (mtk_dma_chan_read (c,VFF_LEFT_SIZE ) ==0U ) { +pr_info ("%s maybe need fix? @L %d\n" , __func__, __LINE__); +mtk_dma_chan_write (c,VFF_INT_EN ,VFF_TX_INT_EN_B ); + }else { +reinit_completion (&c->done); + +/* inc twice, once for tx_flush, another for tx_interrupt */ +atomic_inc (&c->loopcnt); +atomic_inc (&c->loopcnt); +mtk_dma_tx_write (&c->vc.chan); + } + c->paused = false; +} + +static void mtk_dma_get_rx_size (struct mtk_chan *c) +{ +unsigned int count; +unsigned int rdptr, wrptr, wrreg, rdreg; +unsigned int rx_size =mtk_dma_chan_read (c,VFF_LEN ); + + rdreg =mtk_dma_chan_read (c,VFF_RPT ); + wrreg =mtk_dma_chan_read (c,VFF_WPT ); + rdptr = rdreg &MTK_DMA_RING_SIZE ; + wrptr = wrreg &MTK_DMA_RING_SIZE ; + count = ((rdreg ^ wrreg) &MTK_DMA_RING_WRAP ) ? + (wrptr + rx_size - rdptr) : (wrptr - rdptr); + + c->remain_size = count; + c->rx_ptr = rdptr; + +mtk_dma_chan_write (c,VFF_RPT , wrreg); +} + +static void mtk_dma_start_rx (struct mtk_chan *c) +{ +struct dma_chan *chan = &c->vc.chan; +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_dma_desc *d = c->desc; + +if (mtk_dma_chan_read (c,VFF_VALID_SIZE ) !=0U && + d && d->vd.tx.cookie !=0 ) { +mtk_dma_get_rx_size (c); +mtk_dma_remove_virt_list (d->vd.tx.cookie, &c->vc); +vchan_cookie_complete (&d->vd); + }else { +if (mtk_dma_chan_read (c,VFF_VALID_SIZE ) !=0U ) { +spin_lock (&mtkd->lock); +if (list_empty (&mtkd->pending)) +list_add_tail (&c->node, &mtkd->pending); +spin_unlock (&mtkd->lock); +tasklet_schedule (&mtkd->task); + }else { +if (atomic_read (&c->entry) >0 ) +atomic_set (&c->entry,0 ); + } + } +} + +static void mtk_dma_reset (struct mtk_chan *c) +{ +struct mtk_dmadev *mtkd =to_mtk_dma_dev (c->vc.chan.device); + +mtk_dma_chan_write (c,VFF_ADDR ,0 ); +mtk_dma_chan_write (c,VFF_THRE ,0 ); +mtk_dma_chan_write (c,VFF_LEN ,0 ); +mtk_dma_chan_write (c,VFF_RST ,VFF_WARM_RST_B ); + +while + (mtk_dma_chan_read (c,VFF_EN )); + +if (c->cfg.direction ==DMA_DEV_TO_MEM ) +mtk_dma_chan_write (c,VFF_RPT ,0 ); +else if (c->cfg.direction ==DMA_MEM_TO_DEV ) +mtk_dma_chan_write (c,VFF_WPT ,0 ); +else +dev_info (c->vc.chan.device->dev,"Unknown direction.\n" ); + +if (mtkd->support_33bits) +mtk_dma_chan_write (c,VFF_4G_SUPPORT ,VFF_4G_SUPPORT_CLR_B ); +} + +static void mtk_dma_stop (struct mtk_chan *c) +{ +int polling_cnt; + +mtk_dma_chan_write (c,VFF_FLUSH ,VFF_FLUSH_CLR_B ); + + polling_cnt =0 ; +while ((mtk_dma_chan_read (c,VFF_FLUSH ) &VFF_FLUSH_B ) == +VFF_FLUSH_B ) { + polling_cnt++; +if (polling_cnt >10000 ) { +dev_err (c->vc.chan.device->dev, +"dma stop: polling FLUSH fail, DEBUG=0x%x\n" , +mtk_dma_chan_read (c,VFF_DEBUG_STATUS )); +break ; + } + } + + polling_cnt =0 ; +/*set stop as 1 -> wait until en is 0 -> set stop as 0*/ +mtk_dma_chan_write (c,VFF_STOP ,VFF_STOP_B ); +while (mtk_dma_chan_read (c,VFF_EN )) { + polling_cnt++; +if (polling_cnt >10000 ) { +dev_err (c->vc.chan.device->dev, +"dma stop: polling VFF_EN fail, DEBUG=0x%x\n" , +mtk_dma_chan_read (c,VFF_DEBUG_STATUS )); +break ; + } + } +mtk_dma_chan_write (c,VFF_STOP ,VFF_STOP_CLR_B ); +mtk_dma_chan_write (c,VFF_INT_EN ,VFF_INT_EN_CLR_B ); + +if (c->cfg.direction ==DMA_DEV_TO_MEM ) +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_RX_INT_FLAG_CLR_B ); +else +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_TX_INT_FLAG_CLR_B ); + + c->paused = true; +} + +/* +* We need to deal with 'all channels in-use' +*/ +static void mtk_dma_rx_sched (struct mtk_chan *c) +{ +struct dma_chan *chan = &c->vc.chan; +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); + +if (atomic_read (&c->entry) <1 ) { +mtk_dma_start_rx (c); + }else { +spin_lock (&mtkd->lock); +if (list_empty (&mtkd->pending)) +list_add_tail (&c->node, &mtkd->pending); +spin_unlock (&mtkd->lock); +tasklet_schedule (&mtkd->task); + } +} + +/* +* This callback schedules all pending channels. We could be more +* clever here by postponing allocation of the real DMA channels to +* this point, and freeing them when our virtual channel becomes idle. +* +* We would then need to deal with 'all channels in-use' +*/ +static void mtk_dma_sched (unsigned long data) +{ +struct mtk_dmadev *mtkd = (struct mtk_dmadev *)data; +struct mtk_chan *c; +struct virt_dma_desc *vd; +dma_cookie_t cookie; +LIST_HEAD (head); +unsigned long flags; + +spin_lock_irq (&mtkd->lock); +list_splice_tail_init (&mtkd->pending, &head); +spin_unlock_irq (&mtkd->lock); + +if (list_empty (&head) ==0 ) { + c = list_first_entry(&head, struct mtk_chan, node); + cookie = c->vc.chan.cookie; + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->cfg.direction ==DMA_DEV_TO_MEM ) { +list_del_init (&c->node); +mtk_dma_rx_sched (c); + }else if (c->cfg.direction ==DMA_MEM_TO_DEV ) { + vd =vchan_find_desc (&c->vc, cookie); + + c->desc =to_mtk_dma_desc (&vd->tx); +list_del_init (&c->node); +mtk_dma_start_tx (c); + } +spin_unlock_irqrestore (&c->vc.lock, flags); + } +} + +static int mtk_dma_alloc_chan_resources (struct dma_chan *chan) +{ +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_chan *c =to_mtk_dma_chan (chan); +int ret = -EBUSY ; + +pm_runtime_get_sync (mtkd->ddev.dev); + +if (!mtkd->lch_map[c->dma_ch]) { + c->channel_base = mtkd->mem_base[c->dma_ch]; + mtkd->lch_map[c->dma_ch] = c; + ret =1 ; + } + c->requested = false; +mtk_dma_reset (c); + +return ret; +} + +static void mtk_dma_free_chan_resources (struct dma_chan *chan) +{ +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_chan *c =to_mtk_dma_chan (chan); + +if (c->requested) { + c->requested = false; +free_irq (mtkd->dma_irq[c->dma_ch], chan); + } + +tasklet_kill (&mtkd->task); + + c->channel_base =NULL ; + mtkd->lch_map[c->dma_ch] =NULL ; +vchan_free_chan_resources (&c->vc); + +dev_dbg (mtkd->ddev.dev,"freeing channel for %u\n" , c->dma_sig); + c->dma_sig =0 ; + +pm_runtime_put_sync (mtkd->ddev.dev); +} + +static enum dma_status mtk_dma_tx_status (struct dma_chan *chan, +dma_cookie_t cookie, +struct dma_tx_state *txstate) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +enum dma_status ret; +unsigned long flags; + + ret =dma_cookie_status (chan, cookie, txstate); + +spin_lock_irqsave (&c->vc.lock, flags); +if (ret ==DMA_IN_PROGRESS ) { + c->rx_ptr =mtk_dma_chan_read (c,VFF_RPT ) &MTK_DMA_RING_SIZE ; + txstate->residue = c->rx_ptr; + }else if (ret ==DMA_COMPLETE && c->cfg.direction ==DMA_DEV_TO_MEM ) { + txstate->residue = c->remain_size; + }else { + txstate->residue =0 ; + } +spin_unlock_irqrestore (&c->vc.lock, flags); + +return ret; +} + +static unsigned int mtk_dma_desc_size (struct mtk_dma_desc *d) +{ +struct mtk_dma_sg *sg; +unsigned int i; +unsigned int size; + +for (size = i =0 ; i < d->sglen; i++) { + sg = &d->sg[i]; + size += sg->en * sg->fn; + } +return size; +} + +static struct dma_async_tx_descriptor *mtk_dma_prep_slave_sg + (struct dma_chan *chan,struct scatterlist *sgl, +unsigned int sglen,enum dma_transfer_direction dir, +unsigned long tx_flags,void *context) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct scatterlist *sgent; +struct mtk_dma_desc *d; +dma_addr_t dev_addr; +unsigned int i, j, en, frame_bytes; + + en =1 ; + frame_bytes =1 ; + +if (dir ==DMA_DEV_TO_MEM ) { + dev_addr = c->cfg.src_addr; + }else if (dir ==DMA_MEM_TO_DEV ) { + dev_addr = c->cfg.dst_addr; + }else { +dev_err (chan->device->dev,"bad direction\n" ); +return NULL ; + } + +/* Now allocate and setup the descriptor. */ + d =kzalloc (sizeof (*d) + sglen *sizeof (d->sg[0 ]),GFP_ATOMIC ); +if (!d) +return NULL ; + + d->dir = dir; + d->dev_addr = dev_addr; + + j =0 ; +for_each_sg (sgl, sgent, sglen, i) { + d->sg[j].addr =sg_dma_address (sgent); + d->sg[j].en = en; + d->sg[j].fn =sg_dma_len (sgent) / frame_bytes; + j++; + } + + d->sglen = j; + +if (dir ==DMA_MEM_TO_DEV ) + c->remain_size =mtk_dma_desc_size (d); + +return vchan_tx_prep (&c->vc, &d->vd, tx_flags); +} + +static void mtk_dma_issue_pending (struct dma_chan *chan) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd; +struct virt_dma_desc *vd; +dma_cookie_t cookie; +unsigned long flags; + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->cfg.direction ==DMA_DEV_TO_MEM ) { + cookie = c->vc.chan.cookie; + mtkd =to_mtk_dma_dev (chan->device); +if (vchan_issue_pending (&c->vc) && !c->desc) { + vd =vchan_find_desc (&c->vc, cookie); + c->desc =to_mtk_dma_desc (&vd->tx); +if (atomic_read (&c->entry) >0 ) +atomic_set (&c->entry,0 ); + } + }else if (c->cfg.direction ==DMA_MEM_TO_DEV ) { + cookie = c->vc.chan.cookie; +if (vchan_issue_pending (&c->vc) && !c->desc) { + vd =vchan_find_desc (&c->vc, cookie); + c->desc =to_mtk_dma_desc (&vd->tx); +mtk_dma_start_tx (c); + } + } +spin_unlock_irqrestore (&c->vc.lock, flags); +} + +static irqreturn_t mtk_dma_rx_interrupt (int irq,void *dev_id) +{ +struct dma_chan *chan = (struct dma_chan *)dev_id; +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +unsigned long flags; + +spin_lock_irqsave (&c->vc.lock, flags); +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_RX_INT_FLAG_CLR_B ); + +if (atomic_inc_return (&c->entry) >1 ) { +if (list_empty (&mtkd->pending)) +list_add_tail (&c->node, &mtkd->pending); +tasklet_schedule (&mtkd->task); + }else { +mtk_dma_start_rx (c); + } +spin_unlock_irqrestore (&c->vc.lock, flags); + +return IRQ_HANDLED ; +} + +static irqreturn_t mtk_dma_tx_interrupt (int irq,void *dev_id) +{ +struct dma_chan *chan = (struct dma_chan *)dev_id; +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_dma_desc *d = c->desc; +unsigned long flags; + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->remain_size !=0U ) { +list_add_tail (&c->node, &mtkd->pending); +tasklet_schedule (&mtkd->task); + }else { +mtk_dma_remove_virt_list (d->vd.tx.cookie, &c->vc); +vchan_cookie_complete (&d->vd); + } +spin_unlock_irqrestore (&c->vc.lock, flags); + +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_TX_INT_FLAG_CLR_B ); +if (atomic_dec_and_test (&c->loopcnt)) +complete (&c->done); + +return IRQ_HANDLED ; +} + +static int mtk_dma_slave_config (struct dma_chan *chan, +struct dma_slave_config *cfg) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (c->vc.chan.device); +int ret; + + c->cfg = *cfg; + +if (cfg->direction ==DMA_DEV_TO_MEM ) { +unsigned int rx_len = cfg->src_addr_width *1024 ; + +mtk_dma_chan_write (c,VFF_ADDR , cfg->src_addr); +mtk_dma_chan_write (c,VFF_LEN , rx_len); +mtk_dma_chan_write (c,VFF_THRE ,VFF_RX_THRE (rx_len)); +mtk_dma_chan_write (c, +VFF_INT_EN ,VFF_RX_INT_EN0_B + |VFF_RX_INT_EN1_B ); +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_RX_INT_FLAG_CLR_B ); +mtk_dma_chan_write (c,VFF_EN ,VFF_EN_B ); + +if (!c->requested) { +atomic_set (&c->entry,0 ); + c->requested = true; + ret =request_irq (mtkd->dma_irq[c->dma_ch], + mtk_dma_rx_interrupt, +IRQF_TRIGGER_NONE , +DRV_NAME , chan); +if (ret <0 ) { +dev_err (chan->device->dev,"Can't request rx dma IRQ\n" ); +return -EINVAL ; + } + } + }else if (cfg->direction ==DMA_MEM_TO_DEV ) { +unsigned int tx_len = cfg->dst_addr_width *1024 ; + +mtk_dma_chan_write (c,VFF_ADDR , cfg->dst_addr); +mtk_dma_chan_write (c,VFF_LEN , tx_len); +mtk_dma_chan_write (c,VFF_THRE ,VFF_TX_THRE (tx_len)); +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_TX_INT_FLAG_CLR_B ); +mtk_dma_chan_write (c,VFF_EN ,VFF_EN_B ); + +if (!c->requested) { + c->requested = true; + ret =request_irq (mtkd->dma_irq[c->dma_ch], + mtk_dma_tx_interrupt, +IRQF_TRIGGER_NONE , +DRV_NAME , chan); +if (ret <0 ) { +dev_err (chan->device->dev,"Can't request tx dma IRQ\n" ); +return -EINVAL ; + } + } + }else { +dev_info (chan->device->dev,"Unknown direction!\n" ); + } + +if (mtkd->support_33bits) +mtk_dma_chan_write (c,VFF_4G_SUPPORT ,VFF_4G_SUPPORT_B ); + +if (mtk_dma_chan_read (c,VFF_EN ) !=VFF_EN_B ) { +dev_err (chan->device->dev, +"config dma dir[%d] fail\n" , cfg->direction); +return -EINVAL ; + } + +return 0 ; +} + +static int mtk_dma_terminate_all (struct dma_chan *chan) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +unsigned long flags; +LIST_HEAD (head); + +if (atomic_read (&c->loopcnt) !=0 ) +wait_for_completion (&c->done); + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->desc) { +mtk_dma_remove_virt_list (c->desc->vd.tx.cookie, &c->vc); +spin_unlock_irqrestore (&c->vc.lock, flags); + +mtk_dma_desc_free (&c->desc->vd); + +spin_lock_irqsave (&c->vc.lock, flags); +if (!c->paused) { +list_del_init (&c->node); +mtk_dma_stop (c); + } + } +vchan_get_all_descriptors (&c->vc, &head); +spin_unlock_irqrestore (&c->vc.lock, flags); + +vchan_dma_desc_free_list (&c->vc, &head); + +return 0 ; +} + +static int mtk_dma_device_pause (struct dma_chan *chan) +{ +/* Pause/Resume only allowed with cyclic mode */ +return -EINVAL ; +} + +static int mtk_dma_device_resume (struct dma_chan *chan) +{ +/* Pause/Resume only allowed with cyclic mode */ +return -EINVAL ; +} + +static int mtk_dma_chan_init (struct mtk_dmadev *mtkd) +{ +struct mtk_chan *c; + + c =devm_kzalloc (mtkd->ddev.dev,sizeof (*c),GFP_KERNEL ); +if (!c) +return -ENOMEM ; + + c->vc.desc_free = mtk_dma_desc_free; +vchan_init (&c->vc, &mtkd->ddev); +spin_lock_init (&c->lock); +INIT_LIST_HEAD (&c->node); + +init_completion (&c->done); +atomic_set (&c->loopcnt,0 ); +atomic_set (&c->entry,0 ); + +return 0 ; +} + +static void mtk_dma_free (struct mtk_dmadev *mtkd) +{ +tasklet_kill (&mtkd->task); +while (list_empty (&mtkd->ddev.channels) ==0 ) { +struct mtk_chan *c =list_first_entry (&mtkd->ddev.channels, + struct mtk_chan, vc.chan.device_node); + +list_del (&c->vc.chan.device_node); +tasklet_kill (&c->vc.task); +devm_kfree (mtkd->ddev.dev, c); + } +} + +static const struct of_device_id mtk_uart_dma_match[] = { + { .compatible ="mediatek,mt6577-uart-dma" , }, + {/* sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, mtk_uart_dma_match); + +static int mtk_dma_probe (struct platform_device *pdev) +{ +struct mtk_dmadev *mtkd; +struct resource *res; +unsigned int i; +int rc; + + mtkd =devm_kzalloc (&pdev->dev,sizeof (*mtkd),GFP_KERNEL ); +if (!mtkd) +return -ENOMEM ; + +for (i =0 ; i <MTK_SDMA_CHANNELS ; i++) { + res =platform_get_resource (pdev,IORESOURCE_MEM , i); +if (!res) +return -ENODEV ; + mtkd->mem_base[i] =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (mtkd->mem_base[i])) +return PTR_ERR (mtkd->mem_base[i]); + } + +/* request irq */ +for (i =0 ; i <MTK_SDMA_CHANNELS ; i++) { + mtkd->dma_irq[i] =platform_get_irq (pdev, i); +if ((int )mtkd->dma_irq[i] <0 ) { +dev_err (&pdev->dev,"failed to get IRQ[%d]\n" , i); +return -EINVAL ; + } + } + + mtkd->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (mtkd->clk)) { +dev_err (&pdev->dev,"No clock specified\n" ); +return PTR_ERR (mtkd->clk); + } + +if (of_property_read_bool (pdev->dev.of_node,"dma-33bits" )) { +dev_info (&pdev->dev,"Support dma 33bits\n" ); + mtkd->support_33bits = true; + } + +if (mtkd->support_33bits) + rc =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (33 )); +else + rc =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 )); +if (rc) +return rc; + +dma_cap_set (DMA_SLAVE , mtkd->ddev.cap_mask); + mtkd->ddev.device_alloc_chan_resources = mtk_dma_alloc_chan_resources; + mtkd->ddev.device_free_chan_resources = mtk_dma_free_chan_resources; + mtkd->ddev.device_tx_status = mtk_dma_tx_status; + mtkd->ddev.device_issue_pending = mtk_dma_issue_pending; + mtkd->ddev.device_prep_slave_sg = mtk_dma_prep_slave_sg; + mtkd->ddev.device_config = mtk_dma_slave_config; + mtkd->ddev.device_pause = mtk_dma_device_pause; + mtkd->ddev.device_resume = mtk_dma_device_resume; + mtkd->ddev.device_terminate_all = mtk_dma_terminate_all; + mtkd->ddev.src_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_1_BYTE ); + mtkd->ddev.dst_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_1_BYTE ); + mtkd->ddev.directions =BIT (DMA_DEV_TO_MEM ) |BIT (DMA_MEM_TO_DEV ); + mtkd->ddev.residue_granularity =DMA_RESIDUE_GRANULARITY_SEGMENT ; + mtkd->ddev.dev = &pdev->dev; +INIT_LIST_HEAD (&mtkd->ddev.channels); +INIT_LIST_HEAD (&mtkd->pending); + +spin_lock_init (&mtkd->lock); +tasklet_init (&mtkd->task, mtk_dma_sched, (unsigned long )mtkd); + + mtkd->dma_requests =MTK_SDMA_REQUESTS ; +if (of_property_read_u32 (pdev->dev.of_node, +"dma-requests" , &mtkd->dma_requests) !=0 ) { +dev_info (&pdev->dev, +"Missing dma-requests property, using %u.\n" , +MTK_SDMA_REQUESTS ); + } + +for (i =0 ; i <MTK_SDMA_CHANNELS ; i++) { + rc =mtk_dma_chan_init (mtkd); +if (rc) + goto err_no_dma; + } + +pm_runtime_enable (&pdev->dev); +pm_runtime_set_active (&pdev->dev); + + rc =dma_async_device_register (&mtkd->ddev); +if (rc) { +dev_warn (&pdev->dev,"fail to register DMA device: %d\n" , rc); +mtk_dma_clk_disable (mtkd); + goto err_no_dma; + } + +platform_set_drvdata (pdev, mtkd); + +if (pdev->dev.of_node) { + mtk_dma_info.dma_cap = mtkd->ddev.cap_mask; + +/* Device-tree DMA controller registration */ + rc =of_dma_controller_register (pdev->dev.of_node, + of_dma_simple_xlate, + &mtk_dma_info); +if (rc) { +dev_warn (&pdev->dev,"fail to register DMA controller\n" ); +dma_async_device_unregister (&mtkd->ddev); +mtk_dma_clk_disable (mtkd); + goto err_no_dma; + } + } + +return rc; + +err_no_dma: +mtk_dma_free (mtkd); +return rc; +} + +static int mtk_dma_remove (struct platform_device *pdev) +{ +struct mtk_dmadev *mtkd =platform_get_drvdata (pdev); + +if (pdev->dev.of_node) +of_dma_controller_free (pdev->dev.of_node); + +pm_runtime_disable (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev); + +dma_async_device_unregister (&mtkd->ddev); + +mtk_dma_free (mtkd); + +return 0 ; +} + +#ifdef CONFIG_PM_SLEEP +static int mtk_dma_suspend (struct device *dev) +{ +struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + +if (!pm_runtime_suspended (dev)) +mtk_dma_clk_disable (mtkd); + +return 0 ; +} + +static int mtk_dma_resume (struct device *dev) +{ +int ret; +struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + +if (!pm_runtime_suspended (dev)) { + ret =mtk_dma_clk_enable (mtkd); +if (ret) { +dev_info (dev,"fail to enable clk: %d\n" , ret); +return ret; + } + } + +return 0 ; +} + +static int mtk_dma_runtime_suspend (struct device *dev) +{ +struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + +mtk_dma_clk_disable (mtkd); + +return 0 ; +} + +static int mtk_dma_runtime_resume (struct device *dev) +{ +int ret; +struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + + ret =mtk_dma_clk_enable (mtkd); +if (ret) { +dev_warn (dev,"fail to enable clk: %d\n" , ret); +return ret; + } + +return 0 ; +} + +#endif /* CONFIG_PM_SLEEP */ + +static const struct dev_pm_ops mtk_dma_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(mtk_dma_suspend, mtk_dma_resume) +SET_RUNTIME_PM_OPS (mtk_dma_runtime_suspend, + mtk_dma_runtime_resume,NULL ) +}; + +static struct platform_driver mtk_dma_driver = { + .probe = mtk_dma_probe, + .remove = mtk_dma_remove, + .driver = { + .name ="8250-mtk-dma" , + .pm = &mtk_dma_pm_ops, + .of_match_table =of_match_ptr (mtk_uart_dma_match), + }, +}; + +static bool mtk_dma_filter_fn (struct dma_chan *chan,void *param) +{ +if (chan->device->dev->driver == &mtk_dma_driver.driver) { +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_chan *c =to_mtk_dma_chan (chan); +unsigned int req = *(unsigned int *)param; + +if (req <= mtkd->dma_requests) { + c->dma_sig = req; + c->dma_ch = req; +return true; + } + } +return false; +} + +static int mtk_dma_init (void ) +{ +return platform_driver_register (&mtk_dma_driver); +} +subsys_initcall (mtk_dma_init); + +static void __exit mtk_dma_exit(void) +{ +platform_driver_unregister (&mtk_dma_driver); +} +module_exit (mtk_dma_exit);
drivers/dma/Kconfig +11 -0
@@ -151,6 +151,17 @@ config DMA_JZ4780 If you have a board based on such a SoC and wish to use DMA for devices which can use the DMA controller, say Y or M here. +config DMA_MTK_UART + tristate "MediaTek SoCs APDMA support for UART" + depends on OF + select DMA_ENGINE + select DMA_VIRTUAL_CHANNELS + help + Support for the UART DMA engine found on MediaTek MTK SoCs. + when 8250 mtk uart is enabled, and if you want to using DMA, + you can enable the config. the DMA engine just only be used + with MediaTek Socs. + config DMA_SA11X0 tristate "SA-11x0 DMA support" depends on ARCH_SA1100 || COMPILE_TEST
drivers/dma/Makefile +1 -0
@@ -24,6 +24,7 @@ obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o obj-$(CONFIG_DMA_BCM2835) += bcm2835-dma.o obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o obj-$(CONFIG_DMA_JZ4780) += dma-jz4780.o +obj-$(CONFIG_DMA_MTK_UART) += 8250_mtk_dma.o obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o obj-$(CONFIG_DMA_SUN4I) += sun4i-dma.o obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o
PATCH 2/4 dmaengine: mtk_uart_dma: add Mediatek uart DMA support
Hi,
Quoted 7 lines · Long Cheng
In DMA engine framework, add 8250 mtk dma to support it.
Signed-off-by Long Cheng <[email protected]>--- drivers/dma/8250_mtk_dma.c | 1049 ++++++++++++++++++++++++++++++++++++++++++++ drivers/dma/Kconfig | 11 + drivers/dma/Makefile | 1 +
the driver should be moved to driver/dma/mediatek
Quoted 9 lines
3 files changed, 1061 insertions(+) create mode 100644 drivers/dma/8250_mtk_dma.cdrivers/dma/8250_mtk_dma.c new file +0
-0
drivers/dma/8250_mtk_dma.c line 9
Quoted 9 lines
drivers/dma/8250_mtk_dma.c new file +9
-0@@ -0,0 +1,1049 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Mediatek 8250 DMA driver. +* +* Copyright (c) 2018 MediaTek Inc. +* Author: Long Cheng <[email protected]> +*/ + +#define pr_fmt (fmt) "8250-mtk-dma: " fmt
pr_fmt can be removed since no place is called with pr_fmt
drivers/dma/8250_mtk_dma.c line 11
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+#define DRV_NAME "8250-mtk-dma" +
use KBUILD_MODNAME instead
Quoted 9 lines
drivers/dma/8250_mtk_dma.c new file +9
-0+#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/dmaengine.h> +#include <linux/dma-mapping.h> +#include <linux/err.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/list.h> +#include <linux/module.h>
drivers/dma/8250_mtk_dma.c line 30
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+#include <linux/of_dma.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/spinlock.h> +#include <linux/pm_runtime.h> + +#include "virt-dma.h" + +#define MTK_SDMA_REQUESTS 127
name it as MTK_SDMA_DEFAULT_REQUESTS seems to be more readable
drivers/dma/8250_mtk_dma.c line 31
Quoted 1 line
drivers/dma/8250_mtk_dma.c new file +1
-0+#define MTK_SDMA_CHANNELS (CONFIG_SERIAL_8250_NR_UARTS * 2)
total number of the channels should depend on the capability the hardware provides, it should be detected by the device tree
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ +#define VFF_RX_INT_FLAG_CLR_B (BIT(0U) | BIT(1U)) +#define VFF_TX_INT_FLAG_CLR_B 0 +#define VFF_RX_INT_EN0_B BIT(0U)/*rx valid size >= vff thre */ +#define VFF_RX_INT_EN1_B BIT(1U) +#define VFF_TX_INT_EN_B BIT(0U)/*tx left size >= vff thre */
drivers/dma/8250_mtk_dma.c line 47
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+#define VFF_INT_EN_CLR_B 0 +#define VFF_WARM_RST_B BIT(0U) +#define VFF_EN_B BIT(0U) +#define VFF_STOP_B BIT(0U) +#define VFF_STOP_CLR_B 0 +#define VFF_FLUSH_B BIT(0U) +#define VFF_FLUSH_CLR_B 0 +#define VFF_4G_SUPPORT_B BIT(0U) +#define VFF_4G_SUPPORT_CLR_B 0 +
all postfix U can be removed, and register offset placed along with the bit definition would be good to read
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+/* interrupt trigger level for tx */ +#define VFF_TX_THRE (n) ((n) * 7 / 8) +/* interrupt trigger level for rx */ +#define VFF_RX_THRE (n) ((n) * 3 / 4)
drivers/dma/8250_mtk_dma.c line 61
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ +#define MTK_DMA_RING_SIZE 0xffffU +/* invert this bit when wrap ring head again*/ +#define MTK_DMA_RING_WRAP 0x10000U + +struct mtk_dmadev { +struct dma_device ddev; +void __iomem *mem_base[MTK_SDMA_CHANNELS ]; +spinlock_t lock;/* dma dev lock */ +struct tasklet_struct task;
tasklet should be removed in general in order to allow the task as soon as possible to be process you could refer to mtk_hsdma.c I made in drivers/dma/mediatek/ first
drivers/dma/8250_mtk_dma.c line 67
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+struct list_head pending; +struct clk *clk; +unsigned int dma_requests; +bool support_33bits; +unsigned int dma_irq[MTK_SDMA_CHANNELS ]; +struct mtk_chan *lch_map[MTK_SDMA_CHANNELS ];
why is the map required? do you offer any way for that the channel would be assigned or managed on the runtime?
drivers/dma/8250_mtk_dma.c line 74
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+}; + +struct mtk_chan { +struct virt_dma_chan vc; +struct list_head node; +struct dma_slave_config cfg; +void __iomem *channel_base;
channel_base can be renamed to base since the member is located at mtk_chan
drivers/dma/8250_mtk_dma.c line 77
Quoted 3 lines
drivers/dma/8250_mtk_dma.c new file +3
-0+struct mtk_dma_desc *desc; + +bool paused;
I don't think the variable paused since it doesn't support pause function
drivers/dma/8250_mtk_dma.c line 90
Quoted 13 lines
drivers/dma/8250_mtk_dma.c new file +13
-0+bool requested; + +unsigned int dma_sig; +unsigned int dma_ch; +unsigned int sgidx; +unsigned int remain_size; +unsigned int rx_ptr; + +/*sync*/ +struct completion done;/* dma transfer done */ +spinlock_t lock;/* channel lock */ +atomic_t loopcnt; +atomic_t entry;/* entry count */
Why the two atomic variables is introduced? they make the whole logic flow a little bit hard to understand. In general, the generic dma_virtual_channels can support the most dma engines for how descriptors on each channel being managed.
You should check it first how list vc->desc_allocated, vc->desc_submitted and vc->desc_issued being maintained and really think if it's also suitable to the dmaengine. You could refer to mtk-hsdma.c I made in drivers/dma/mediatek/ first. The driver totally reuses these vc lists..
drivers/dma/8250_mtk_dma.c line 103
Quoted 13 lines
drivers/dma/8250_mtk_dma.c new file +13
-0+}; + +struct mtk_dma_sg { +dma_addr_t addr; +unsigned int en;/* number of elements (24-bit) */ +unsigned int fn;/* number of frames (16-bit) */ +}; + +struct mtk_dma_desc { +struct virt_dma_desc vd; +enum dma_transfer_direction dir; +dma_addr_t dev_addr; +
I don't see dir, dev_addr being used in code flow? or I missed something ?
Quoted 14 lines
drivers/dma/8250_mtk_dma.c new file +14
-0+unsigned int sglen; +struct mtk_dma_sg sg[0 ]; +}; + +enum { +VFF_INT_FLAG =0x00 , +VFF_INT_EN =0x04 , +VFF_EN =0x08 , +VFF_RST =0x0c , +VFF_STOP =0x10 , +VFF_FLUSH =0x14 , +VFF_ADDR =0x1c , +VFF_LEN =0x24 , +VFF_THRE =0x28 ,
drivers/dma/8250_mtk_dma.c line 127
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+VFF_WPT =0x2c , +VFF_RPT =0x30 , +/*TX: the buffer size HW can read. RX: the buffer size SW can read.*/ +VFF_VALID_SIZE =0x3c , +/*TX: the buffer size SW can write. RX: the buffer size HW can write.*/ +VFF_LEFT_SIZE =0x40 , +VFF_DEBUG_STATUS =0x50 , + VFF_4G_SUPPORT = 0x54, +}; +
Add register definition with #define and move them near the bit field definition.
Quoted 35 lines
drivers/dma/8250_mtk_dma.c new file +35
-0+static bool mtk_dma_filter_fn (struct dma_chan *chan,void *param); +static struct of_dma_filter_info mtk_dma_info = { + .filter_fn = mtk_dma_filter_fn, +}; + +static inline struct mtk_dmadev *to_mtk_dma_dev (struct dma_device *d) +{ + return container_of(d, struct mtk_dmadev, ddev); +} + +static inline struct mtk_chan *to_mtk_dma_chan (struct dma_chan *c) +{ + return container_of(c, struct mtk_chan, vc.chan); +} + +static inline struct mtk_dma_desc *to_mtk_dma_desc + (struct dma_async_tx_descriptor *t) +{ + return container_of(t, struct mtk_dma_desc, vd.tx); +} + +static void mtk_dma_chan_write (struct mtk_chan *c, +unsigned int reg,unsigned int val) +{ +writel (val, c->channel_base + reg); +} + +static unsigned int mtk_dma_chan_read (struct mtk_chan *c,unsigned int reg) +{ +return readl (c->channel_base + reg); +} + +static void mtk_dma_desc_free (struct virt_dma_desc *vd) +{ +struct dma_chan *chan = vd->tx.chan;
drivers/dma/8250_mtk_dma.c line 172
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+struct mtk_chan *c =to_mtk_dma_chan (chan); +unsigned long flags; + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->desc && c->cfg.direction ==DMA_DEV_TO_MEM ) +atomic_dec (&c->entry); + +kfree (c->desc); + c->desc =NULL ; +spin_unlock_irqrestore (&c->vc.lock, flags);
The lock should not be necessary and try to make *_desc_free be as simple as possible.
In general, the function is being only to free specific memory about the vd. It should be done by kfree(container_of(vd, struct mtk_apdma_vdesc, vd)); And don't need to care what detail the channel and direction is.
Quoted 19 lines
drivers/dma/8250_mtk_dma.c new file +19
-0+} + +static int mtk_dma_clk_enable (struct mtk_dmadev *mtkd) +{ +int ret; + + ret =clk_prepare_enable (mtkd->clk); +if (ret) { +dev_err (mtkd->ddev.dev,"Couldn't enable the clock\n" ); +return ret; + } + +return 0 ; +} + +static void mtk_dma_clk_disable (struct mtk_dmadev *mtkd) +{ +clk_disable_unprepare (mtkd->clk); +}
drivers/dma/8250_mtk_dma.c line 201
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ +static void mtk_dma_remove_virt_list (dma_cookie_t cookie, +struct virt_dma_chan *vc) +{ +struct virt_dma_desc *vd; + +if (list_empty (&vc->desc_issued) ==0 ) { +list_for_each_entry (vd, &vc->desc_issued, node) { +if (cookie == vd->tx.cookie) { +INIT_LIST_HEAD (&vc->desc_issued);
Why force to reinit list desc_issued? that is enqueued by core layer. They are expected to be configured into the hardware by the driver in sequence and then dequeued from the list when the descriptor is totally setting done by the driver or completed by the hardware.
drivers/dma/8250_mtk_dma.c line 214
Quoted 13 lines
drivers/dma/8250_mtk_dma.c new file +13
-0+break ; + } + } + } +} + +static void mtk_dma_tx_flush (struct dma_chan *chan) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); + +if (mtk_dma_chan_read (c,VFF_FLUSH ) ==0U ) { +mtk_dma_chan_write (c,VFF_FLUSH ,VFF_FLUSH_B ); +if (atomic_dec_and_test (&c->loopcnt))
I really think depending on atomic complete a synchronization is a tricky thing. Can we have another elegant way to let synchronization become good to read and easy to maintain?
Or you could refer to mtk_hsdma.c I made in drivers/dma/mediatek/ first, the similar synchronization is also being done here.
Quoted 14 lines
drivers/dma/8250_mtk_dma.c new file +14
-0+complete (&c->done); + } +} + +/* +* check whether the dma flush operation is finished or not. +* return 0 for flush success. +* return others for flush timeout. +*/ +static int mtk_dma_check_flush_result (struct dma_chan *chan) +{ +struct timespec start, end; +struct mtk_chan *c =to_mtk_dma_chan (chan); +
drivers/dma/8250_mtk_dma.c line 238
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ start =ktime_to_timespec (ktime_get ()); + +while ((mtk_dma_chan_read (c,VFF_FLUSH ) &VFF_FLUSH_B ) ==VFF_FLUSH_B ) { + end =ktime_to_timespec (ktime_get ()); +if ((end.tv_sec - start.tv_sec) >1 || + ((end.tv_sec - start.tv_sec) ==1 && + end.tv_nsec > start.tv_nsec)) { +dev_err (chan->device->dev, +"[DMA] Polling flush timeout\n" ); +return -1 ;
You can check readx_poll_timeout and related APIs instead of the open coding.
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+ } + } + +return 0 ;
drivers/dma/8250_mtk_dma.c line 252
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+} + +static void mtk_dma_tx_write (struct dma_chan *chan) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +unsigned int txcount = c->remain_size; +unsigned int len, send, left, wpt, wrap; + +if (atomic_inc_return (&c->entry) >1 ) {
atomic variable again. Can you explain more about what the branches (if and else) are doing for ? Let's see if they can be replaced by more elegant ways
Quoted 15 lines
drivers/dma/8250_mtk_dma.c new file +15
-0+if (vchan_issue_pending (&c->vc) && !c->desc) { +spin_lock (&mtkd->lock); +list_add_tail (&c->node, &mtkd->pending); +spin_unlock (&mtkd->lock); +tasklet_schedule (&mtkd->task); + } + }else { + len =mtk_dma_chan_read (c,VFF_LEN ); +if (mtk_dma_check_flush_result (chan) !=0 ) +return ; + +while ((left =mtk_dma_chan_read (c,VFF_LEFT_SIZE )) >0U ) { + send =min (left, c->remain_size); + wpt =mtk_dma_chan_read (c,VFF_WPT ); + wrap = wpt &MTK_DMA_RING_WRAP ?0U :MTK_DMA_RING_WRAP ;
drivers/dma/8250_mtk_dma.c line 277
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ +if ((wpt & (len -1U )) + send < len) +mtk_dma_chan_write (c,VFF_WPT , wpt + send); +else +mtk_dma_chan_write (c,VFF_WPT , + ((wpt + send) & (len -1U )) + | wrap); + + c->remain_size -= send; +if (c->remain_size ==0U )
the if condition can be moved to the the beginning while condition
drivers/dma/8250_mtk_dma.c line 282
Quoted 5 lines
drivers/dma/8250_mtk_dma.c new file +5
-0+break ; + } + +if (txcount != c->remain_size) { +mtk_dma_chan_write (c,VFF_INT_EN ,VFF_TX_INT_EN_B );
why need to enable interrupt to trigger the next?
drivers/dma/8250_mtk_dma.c line 292
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+mtk_dma_tx_flush (chan); + } + } +atomic_dec (&c->entry); +} + +static void mtk_dma_start_tx (struct mtk_chan *c) +{ +if (mtk_dma_chan_read (c,VFF_LEFT_SIZE ) ==0U ) { +pr_info ("%s maybe need fix? @L %d\n" , __func__, __LINE__);
the debug message can be removed
drivers/dma/8250_mtk_dma.c line 293
Quoted 1 line
drivers/dma/8250_mtk_dma.c new file +1
-0+mtk_dma_chan_write (c,VFF_INT_EN ,VFF_TX_INT_EN_B );
what is the step for?
drivers/dma/8250_mtk_dma.c line 299
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ }else { +reinit_completion (&c->done); + +/* inc twice, once for tx_flush, another for tx_interrupt */ +atomic_inc (&c->loopcnt); +atomic_inc (&c->loopcnt);
if you have two events for which some point wants to wait, why not create two two completions for them?
drivers/dma/8250_mtk_dma.c line 310
Quoted 11 lines
drivers/dma/8250_mtk_dma.c new file +11
-0+mtk_dma_tx_write (&c->vc.chan); + } + c->paused = false; +} + +static void mtk_dma_get_rx_size (struct mtk_chan *c) +{ +unsigned int count; +unsigned int rdptr, wrptr, wrreg, rdreg; +unsigned int rx_size =mtk_dma_chan_read (c,VFF_LEN ); +
Sort all declarations in reversed Xmas tree, even along with all occurrences in the other functions
Quoted 14 lines
drivers/dma/8250_mtk_dma.c new file +14
-0+ rdreg =mtk_dma_chan_read (c,VFF_RPT ); + wrreg =mtk_dma_chan_read (c,VFF_WPT ); + rdptr = rdreg &MTK_DMA_RING_SIZE ; + wrptr = wrreg &MTK_DMA_RING_SIZE ; + count = ((rdreg ^ wrreg) &MTK_DMA_RING_WRAP ) ? + (wrptr + rx_size - rdptr) : (wrptr - rdptr); + + c->remain_size = count; + c->rx_ptr = rdptr; + +mtk_dma_chan_write (c,VFF_RPT , wrreg); +} + +static void mtk_dma_start_rx (struct mtk_chan *c)
drivers/dma/8250_mtk_dma.c line 334
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+{ +struct dma_chan *chan = &c->vc.chan; +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_dma_desc *d = c->desc; + +if (mtk_dma_chan_read (c,VFF_VALID_SIZE ) !=0U && + d && d->vd.tx.cookie !=0 ) { +mtk_dma_get_rx_size (c); +mtk_dma_remove_virt_list (d->vd.tx.cookie, &c->vc); +vchan_cookie_complete (&d->vd);
please make vchan_cookie_complete in a completion handler such as a completion ISR, not in a start handler.
drivers/dma/8250_mtk_dma.c line 344
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ }else { +if (mtk_dma_chan_read (c,VFF_VALID_SIZE ) !=0U ) { +spin_lock (&mtkd->lock); +if (list_empty (&mtkd->pending)) +list_add_tail (&c->node, &mtkd->pending); +spin_unlock (&mtkd->lock); +tasklet_schedule (&mtkd->task); + }else { +if (atomic_read (&c->entry) >0 ) +atomic_set (&c->entry,0 );
I am not not clear about the magical reset. could you explain more?
Quoted 5 lines
drivers/dma/8250_mtk_dma.c new file +5
-0+ } + } +} + +static void mtk_dma_reset (struct mtk_chan *c)
drivers/dma/8250_mtk_dma.c line 359
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+{ +struct mtk_dmadev *mtkd =to_mtk_dma_dev (c->vc.chan.device); + +mtk_dma_chan_write (c,VFF_ADDR ,0 ); +mtk_dma_chan_write (c,VFF_THRE ,0 ); +mtk_dma_chan_write (c,VFF_LEN ,0 ); +mtk_dma_chan_write (c,VFF_RST ,VFF_WARM_RST_B ); + +while + (mtk_dma_chan_read (c,VFF_EN ));
add a timeout, otherwise it would get a hang possibly. you can check readx_poll_timeout and related APIs to add a timeout.
drivers/dma/8250_mtk_dma.c line 366
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+ +if (c->cfg.direction ==DMA_DEV_TO_MEM ) +mtk_dma_chan_write (c,VFF_RPT ,0 ); +else if (c->cfg.direction ==DMA_MEM_TO_DEV ) +mtk_dma_chan_write (c,VFF_WPT ,0 ); +else +dev_info (c->vc.chan.device->dev,"Unknown direction.\n" );
is it possible to happen?
Quoted 12 lines
drivers/dma/8250_mtk_dma.c new file +12
-0+ +if (mtkd->support_33bits) +mtk_dma_chan_write (c,VFF_4G_SUPPORT ,VFF_4G_SUPPORT_CLR_B ); +} + +static void mtk_dma_stop (struct mtk_chan *c) +{ +int polling_cnt; + +mtk_dma_chan_write (c,VFF_FLUSH ,VFF_FLUSH_CLR_B ); + + polling_cnt =0 ;
drivers/dma/8250_mtk_dma.c line 388
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+while ((mtk_dma_chan_read (c,VFF_FLUSH ) &VFF_FLUSH_B ) == +VFF_FLUSH_B ) { + polling_cnt++; +if (polling_cnt >10000 ) { +dev_err (c->vc.chan.device->dev, +"dma stop: polling FLUSH fail, DEBUG=0x%x\n" , +mtk_dma_chan_read (c,VFF_DEBUG_STATUS )); +break ; + } + }
You can check readx_poll_timeout and related APIs to make the fucntion more readable
drivers/dma/8250_mtk_dma.c line 401
Quoted 13 lines
drivers/dma/8250_mtk_dma.c new file +13
-0+ + polling_cnt =0 ; +/*set stop as 1 -> wait until en is 0 -> set stop as 0*/ +mtk_dma_chan_write (c,VFF_STOP ,VFF_STOP_B ); +while (mtk_dma_chan_read (c,VFF_EN )) { + polling_cnt++; +if (polling_cnt >10000 ) { +dev_err (c->vc.chan.device->dev, +"dma stop: polling VFF_EN fail, DEBUG=0x%x\n" , +mtk_dma_chan_read (c,VFF_DEBUG_STATUS )); +break ; + } + }
You can check readx_poll_timeout and related APIs to make the function more readable.
drivers/dma/8250_mtk_dma.c line 410
Quoted 9 lines
drivers/dma/8250_mtk_dma.c new file +9
-0+mtk_dma_chan_write (c,VFF_STOP ,VFF_STOP_CLR_B ); +mtk_dma_chan_write (c,VFF_INT_EN ,VFF_INT_EN_CLR_B ); + +if (c->cfg.direction ==DMA_DEV_TO_MEM ) +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_RX_INT_FLAG_CLR_B ); +else +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_TX_INT_FLAG_CLR_B ); + + c->paused = true;
It's a stop, not a pause
Quoted 8 lines
drivers/dma/8250_mtk_dma.c new file +8
-0+} + +/* +* We need to deal with 'all channels in-use' +*/ +static void mtk_dma_rx_sched (struct mtk_chan *c) +{ +struct dma_chan *chan = &c->vc.chan;
drivers/dma/8250_mtk_dma.c line 428
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); + +if (atomic_read (&c->entry) <1 ) { +mtk_dma_start_rx (c); + }else { +spin_lock (&mtkd->lock); +if (list_empty (&mtkd->pending)) +list_add_tail (&c->node, &mtkd->pending); +spin_unlock (&mtkd->lock); +tasklet_schedule (&mtkd->task);
I'm not clear why mixing start rx and tasklet rx here. In general, please make all tx/rx job as soon as poosible.
you can refer to the mtk_hsdma.c I made.
Quoted 14 lines
drivers/dma/8250_mtk_dma.c new file +14
-0+ } +} + +/* +* This callback schedules all pending channels. We could be more +* clever here by postponing allocation of the real DMA channels to +* this point, and freeing them when our virtual channel becomes idle. +* +* We would then need to deal with 'all channels in-use' +*/ +static void mtk_dma_sched (unsigned long data) +{ +struct mtk_dmadev *mtkd = (struct mtk_dmadev *)data; +struct mtk_chan *c;
drivers/dma/8250_mtk_dma.c line 452
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+struct virt_dma_desc *vd; +dma_cookie_t cookie; +LIST_HEAD (head); +unsigned long flags; + +spin_lock_irq (&mtkd->lock); +list_splice_tail_init (&mtkd->pending, &head); +spin_unlock_irq (&mtkd->lock); + +if (list_empty (&head) ==0 ) {
!list_empty
drivers/dma/8250_mtk_dma.c line 456
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+ c = list_first_entry(&head, struct mtk_chan, node); + cookie = c->vc.chan.cookie; + +spin_lock_irqsave (&c->vc.lock, flags);
head is a local list so the lock is not neccessary
drivers/dma/8250_mtk_dma.c line 458
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+if (c->cfg.direction ==DMA_DEV_TO_MEM ) { +list_del_init (&c->node);
why not use list_dec version
drivers/dma/8250_mtk_dma.c line 465
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+mtk_dma_rx_sched (c); + }else if (c->cfg.direction ==DMA_MEM_TO_DEV ) { + vd =vchan_find_desc (&c->vc, cookie); + + c->desc =to_mtk_dma_desc (&vd->tx); +list_del_init (&c->node); +mtk_dma_start_tx (c);
why is direct call for tx and tasklet for rx?
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ } +spin_unlock_irqrestore (&c->vc.lock, flags); + } +} + +static int mtk_dma_alloc_chan_resources (struct dma_chan *chan)
drivers/dma/8250_mtk_dma.c line 481
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+{ +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_chan *c =to_mtk_dma_chan (chan); +int ret = -EBUSY ; + +pm_runtime_get_sync (mtkd->ddev.dev); + +if (!mtkd->lch_map[c->dma_ch]) { + c->channel_base = mtkd->mem_base[c->dma_ch]; + mtkd->lch_map[c->dma_ch] = c;
keep lch_map in mtkd is not necessary. instead, I think we can keep all information required by the physical channel inside mtk_chan, not exported to the whole dma engine.
drivers/dma/8250_mtk_dma.c line 482
Quoted 1 line
drivers/dma/8250_mtk_dma.c new file +1
-0+ ret =1 ;
why returning 1 here?
Quoted 12 lines
drivers/dma/8250_mtk_dma.c new file +12
-0+ } + c->requested = false; +mtk_dma_reset (c); + +return ret; +} + +static void mtk_dma_free_chan_resources (struct dma_chan *chan) +{ +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_chan *c =to_mtk_dma_chan (chan); +
drivers/dma/8250_mtk_dma.c line 504
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+if (c->requested) { + c->requested = false; +free_irq (mtkd->dma_irq[c->dma_ch], chan); + } + +tasklet_kill (&mtkd->task); + + c->channel_base =NULL ; + mtkd->lch_map[c->dma_ch] =NULL ; +vchan_free_chan_resources (&c->vc);
I think we should call mtk_dma_terminate first to free all descriptors and then free the other channel resouce in the function.
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ +dev_dbg (mtkd->ddev.dev,"freeing channel for %u\n" , c->dma_sig); + c->dma_sig =0 ; + +pm_runtime_put_sync (mtkd->ddev.dev); +}
drivers/dma/8250_mtk_dma.c line 520
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ +static enum dma_status mtk_dma_tx_status (struct dma_chan *chan, +dma_cookie_t cookie, +struct dma_tx_state *txstate) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +enum dma_status ret; +unsigned long flags; + + ret =dma_cookie_status (chan, cookie, txstate);
consider txstate null case and directly return when the descriptor is complete, such as
ret = dma_cookie_status(c, cookie, txstate); if (ret == DMA_COMPLETE || !txstate) return ret;
drivers/dma/8250_mtk_dma.c line 525
Quoted 5 lines
drivers/dma/8250_mtk_dma.c new file +5
-0+ +spin_lock_irqsave (&c->vc.lock, flags); +if (ret ==DMA_IN_PROGRESS ) { + c->rx_ptr =mtk_dma_chan_read (c,VFF_RPT ) &MTK_DMA_RING_SIZE ; + txstate->residue = c->rx_ptr;
are you sure all descriptors DMA_IN_PROCESS all be processed by hardware ?
drivers/dma/8250_mtk_dma.c line 527
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+ }else if (ret ==DMA_COMPLETE && c->cfg.direction ==DMA_DEV_TO_MEM ) { + txstate->residue = c->remain_size;
why is residue not zero when dma is complete ?
drivers/dma/8250_mtk_dma.c line 530
Quoted 3 lines
drivers/dma/8250_mtk_dma.c new file +3
-0+ }else { + txstate->residue =0 ; + }
setup ->residue by dma_set_residue
drivers/dma/8250_mtk_dma.c line 532
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+spin_unlock_irqrestore (&c->vc.lock, flags); +
spin_lock can be dropped
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+return ret; +} + +static unsigned int mtk_dma_desc_size (struct mtk_dma_desc *d)
drivers/dma/8250_mtk_dma.c line 546
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+{ +struct mtk_dma_sg *sg; +unsigned int i; +unsigned int size; + +for (size = i =0 ; i < d->sglen; i++) { + sg = &d->sg[i]; + size += sg->en * sg->fn; + } +return size;
drop the function definition, see the below reason.
drivers/dma/8250_mtk_dma.c line 558
Quoted 12 lines
drivers/dma/8250_mtk_dma.c new file +12
-0+} + +static struct dma_async_tx_descriptor *mtk_dma_prep_slave_sg + (struct dma_chan *chan,struct scatterlist *sgl, +unsigned int sglen,enum dma_transfer_direction dir, +unsigned long tx_flags,void *context) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct scatterlist *sgent; +struct mtk_dma_desc *d; +dma_addr_t dev_addr; +unsigned int i, j, en, frame_bytes;
save the variable frame_bytes an en, it's always kept as 1 during the function call
drivers/dma/8250_mtk_dma.c line 568
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ + en =1 ; + frame_bytes =1 ; + +if (dir ==DMA_DEV_TO_MEM ) { + dev_addr = c->cfg.src_addr; + }else if (dir ==DMA_MEM_TO_DEV ) { + dev_addr = c->cfg.dst_addr; + }else { +dev_err (chan->device->dev,"bad direction\n" );
the case seems never happens because the device registers the capability it can support to.
drivers/dma/8250_mtk_dma.c line 578
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+return NULL ; + } + +/* Now allocate and setup the descriptor. */ + d =kzalloc (sizeof (*d) + sglen *sizeof (d->sg[0 ]),GFP_ATOMIC ); +if (!d) +return NULL ; + + d->dir = dir; + d->dev_addr = dev_addr;
when and where is the d->dev_addr being used?
drivers/dma/8250_mtk_dma.c line 591
Quoted 13 lines
drivers/dma/8250_mtk_dma.c new file +13
-0+ + j =0 ; +for_each_sg (sgl, sgent, sglen, i) { + d->sg[j].addr =sg_dma_address (sgent); + d->sg[j].en = en; + d->sg[j].fn =sg_dma_len (sgent) / frame_bytes; + j++; + } + + d->sglen = j; + +if (dir ==DMA_MEM_TO_DEV ) + c->remain_size =mtk_dma_desc_size (d);
function mtk_dma_desc_size can be dropped since the function is only used once and the result can be accumulated by for_each_sg
Quoted 20 lines
drivers/dma/8250_mtk_dma.c new file +20
-0+return vchan_tx_prep (&c->vc, &d->vd, tx_flags); +} + +static void mtk_dma_issue_pending (struct dma_chan *chan) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd; +struct virt_dma_desc *vd; +dma_cookie_t cookie; +unsigned long flags; + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->cfg.direction ==DMA_DEV_TO_MEM ) { + cookie = c->vc.chan.cookie; + mtkd =to_mtk_dma_dev (chan->device); +if (vchan_issue_pending (&c->vc) && !c->desc) { + vd =vchan_find_desc (&c->vc, cookie); + c->desc =to_mtk_dma_desc (&vd->tx); +if (atomic_read (&c->entry) >0 ) +atomic_set (&c->entry,0 );
drivers/dma/8250_mtk_dma.c
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ } + }else if (c->cfg.direction ==DMA_MEM_TO_DEV ) { + cookie = c->vc.chan.cookie; +if (vchan_issue_pending (&c->vc) && !c->desc) { + vd =vchan_find_desc (&c->vc, cookie); + c->desc =to_mtk_dma_desc (&vd->tx); +mtk_dma_start_tx (c); + } + } +spin_unlock_irqrestore (&c->vc.lock, flags)
in general, we have to dump all vc->desc_issued into the hw as soon as possible. how is the other descriptors except for the cookie stands for ?
Quoted 10 lines
;
drivers/dma/8250_mtk_dma.c new file +9
-0+} + +static irqreturn_t mtk_dma_rx_interrupt (int irq,void *dev_id) +{ +struct dma_chan *chan = (struct dma_chan *)dev_id; +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +unsigned long flags; +
drivers/dma/8250_mtk_dma.c line 641
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+spin_lock_irqsave (&c->vc.lock, flags); +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_RX_INT_FLAG_CLR_B ); + +if (atomic_inc_return (&c->entry) >1 ) { +if (list_empty (&mtkd->pending)) +list_add_tail (&c->node, &mtkd->pending); +tasklet_schedule (&mtkd->task); + }else { +mtk_dma_start_rx (c); + }
what's the reason making rx into direct call or tasklet in some case?
Quoted 31 lines
drivers/dma/8250_mtk_dma.c new file +31
-0+spin_unlock_irqrestore (&c->vc.lock, flags); + +return IRQ_HANDLED ; +} + +static irqreturn_t mtk_dma_tx_interrupt (int irq,void *dev_id) +{ +struct dma_chan *chan = (struct dma_chan *)dev_id; +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_dma_desc *d = c->desc; +unsigned long flags; + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->remain_size !=0U ) { +list_add_tail (&c->node, &mtkd->pending); +tasklet_schedule (&mtkd->task); + }else { +mtk_dma_remove_virt_list (d->vd.tx.cookie, &c->vc); +vchan_cookie_complete (&d->vd); + } +spin_unlock_irqrestore (&c->vc.lock, flags); + +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_TX_INT_FLAG_CLR_B ); +if (atomic_dec_and_test (&c->loopcnt)) +complete (&c->done); + +return IRQ_HANDLED ; +} + +static int mtk_dma_slave_config(struct dma_chan *chan,
drivers/dma/8250_mtk_dma.c line 682
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ struct dma_slave_config *cfg) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (c->vc.chan.device); +int ret; + + c->cfg = *cfg; + +if (cfg->direction ==DMA_DEV_TO_MEM ) { +unsigned int rx_len = cfg->src_addr_width *1024 ;
the dma eingine only supports DMA_SLAVE_BUSWIDTH_1_BYTE, why do we need to consider any other src_addr_width here ?
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+ +mtk_dma_chan_write (c,VFF_ADDR , cfg->src_addr); +mtk_dma_chan_write (c,VFF_LEN , rx_len); +mtk_dma_chan_write (c,VFF_THRE ,VFF_RX_THRE (rx_len)); +mtk_dma_chan_write (c, +VFF_INT_EN ,VFF_RX_INT_EN0_B + |VFF_RX_INT_EN1_B );
drivers/dma/8250_mtk_dma.c line 707
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_RX_INT_FLAG_CLR_B ); +mtk_dma_chan_write (c,VFF_EN ,VFF_EN_B ); + +if (!c->requested) { +atomic_set (&c->entry,0 ); + c->requested = true; + ret = request_irq(mtkd->dma_irq[c->dma_ch], + mtk_dma_rx_interrupt, + IRQF_TRIGGER_NONE, +
move the request_irq to driver probe stage, it can be manage by the core such irq affinity
drivers/dma/8250_mtk_dma.c line 707
Quoted 9 lines
DRV_NAME, chan);drivers/dma/8250_mtk_dma.c new file +8
-0+if (ret <0 ) { +dev_err (chan->device->dev,"Can't request rx dma IRQ\n" ); +return -EINVAL ; + } + } + }else if (cfg->direction ==DMA_MEM_TO_DEV ) { +unsigned int tx_len = cfg->dst_addr_width *1024 ; +
the dma eingine only supports DMA_SLAVE_BUSWIDTH_1_BYTE, why do we need to consider any other src_addr_width here ?
drivers/dma/8250_mtk_dma.c line 719
Quoted 12 lines
drivers/dma/8250_mtk_dma.c new file +12
-0+mtk_dma_chan_write (c,VFF_ADDR , cfg->dst_addr); +mtk_dma_chan_write (c,VFF_LEN , tx_len); +mtk_dma_chan_write (c,VFF_THRE ,VFF_TX_THRE (tx_len)); +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_TX_INT_FLAG_CLR_B ); +mtk_dma_chan_write (c,VFF_EN ,VFF_EN_B ); + +if (!c->requested) { + c->requested = true; + ret =request_irq (mtkd->dma_irq[c->dma_ch], + mtk_dma_tx_interrupt, +IRQF_TRIGGER_NONE , +DRV_NAME , chan);
move the request_irq to driver probe stage, it can be manage by the core such irq affinity
drivers/dma/8250_mtk_dma.c line 726
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+if (ret <0 ) { +dev_err (chan->device->dev,"Can't request tx dma IRQ\n" ); +return -EINVAL ; + } + } + }else { +dev_info (chan->device->dev,"Unknown direction!\n" );
remove the the unnecessary log
drivers/dma/8250_mtk_dma.c line 732
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ } + +if (mtkd->support_33bits) +mtk_dma_chan_write (c,VFF_4G_SUPPORT ,VFF_4G_SUPPORT_B ); + +if (mtk_dma_chan_read (c,VFF_EN ) !=VFF_EN_B ) {
when is the condition being satisfied ?
Quoted 18 lines
drivers/dma/8250_mtk_dma.c new file +18
-0+dev_err (chan->device->dev, +"config dma dir[%d] fail\n" , cfg->direction); +return -EINVAL ; + } + +return 0 ; +} + +static int mtk_dma_terminate_all (struct dma_chan *chan) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +unsigned long flags; +LIST_HEAD (head); + +if (atomic_read (&c->loopcnt) !=0 ) +wait_for_completion (&c->done); + +spin_lock_irqsave (&c->vc.lock, flags);
drivers/dma/8250_mtk_dma.c line 760
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+if (c->desc) { +mtk_dma_remove_virt_list (c->desc->vd.tx.cookie, &c->vc); +spin_unlock_irqrestore (&c->vc.lock, flags); + +mtk_dma_desc_free (&c->desc->vd); + +spin_lock_irqsave (&c->vc.lock, flags); +if (!c->paused) { +list_del_init (&c->node); +mtk_dma_stop (c);
I think split logic between descriptors recycle and channel stop would be good.
drivers/dma/8250_mtk_dma.c line 766
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ } + } +vchan_get_all_descriptors (&c->vc, &head); +spin_unlock_irqrestore (&c->vc.lock, flags); + +vchan_dma_desc_free_list (&c->vc, &head);
Can you tell more about the situation for vc->desc_allocated, vc->desc_submitted and vc->desc_issued when the function is being called ? Which list do the descriptors hardware is processing stay on?
drivers/dma/8250_mtk_dma.c line 775
Quoted 9 lines
drivers/dma/8250_mtk_dma.c new file +9
-0+ +return 0 ; +} + +static int mtk_dma_device_pause (struct dma_chan *chan) +{ +/* Pause/Resume only allowed with cyclic mode */ +return -EINVAL ; +}
I guess we don't nodde to register the dumb pause handler
drivers/dma/8250_mtk_dma.c line 781
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ +static int mtk_dma_device_resume (struct dma_chan *chan) +{ +/* Pause/Resume only allowed with cyclic mode */ +return -EINVAL ; +}
I guess we don't nodde to register the dumb resume handler
drivers/dma/8250_mtk_dma.c line 784
Quoted 3 lines
drivers/dma/8250_mtk_dma.c new file +3
-0+ +static int mtk_dma_chan_init (struct mtk_dmadev *mtkd) +{
Directly span the function in the driver probe is good to know how many channels are request and how large size its memory being allocated.
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+struct mtk_chan *c; + + c =devm_kzalloc (mtkd->ddev.dev,sizeof (*c),GFP_KERNEL ); +if (!c)
drivers/dma/8250_mtk_dma.c line 798
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+return -ENOMEM ; + + c->vc.desc_free = mtk_dma_desc_free; +vchan_init (&c->vc, &mtkd->ddev); +spin_lock_init (&c->lock); +INIT_LIST_HEAD (&c->node); + +init_completion (&c->done); +atomic_set (&c->loopcnt,0 ); +atomic_set (&c->entry,0 );
I really don't like to magic atomic variable. It would make it's harder to track each descriptors usage either pending or active in the dma engine.
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+ +return 0 ; +} +
drivers/dma/8250_mtk_dma.c line 812
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+static void mtk_dma_free (struct mtk_dmadev *mtkd) +{ +tasklet_kill (&mtkd->task); +while (list_empty (&mtkd->ddev.channels) ==0 ) { +struct mtk_chan *c =list_first_entry (&mtkd->ddev.channels, + struct mtk_chan, vc.chan.device_node); + +list_del (&c->vc.chan.device_node); +tasklet_kill (&c->vc.task); +devm_kfree (mtkd->ddev.dev, c);
devm_kfree isn't be called explicitly in the driver, it would be taken care when driver is unloaded by the core.
Quoted 20 lines
drivers/dma/8250_mtk_dma.c new file +20
-0+ } +} + +static const struct of_device_id mtk_uart_dma_match[] = { + { .compatible ="mediatek,mt6577-uart-dma" , }, + {/* sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, mtk_uart_dma_match); + +static int mtk_dma_probe (struct platform_device *pdev) +{ +struct mtk_dmadev *mtkd; +struct resource *res; +unsigned int i; +int rc; + + mtkd =devm_kzalloc (&pdev->dev,sizeof (*mtkd),GFP_KERNEL ); +if (!mtkd) +return -ENOMEM ; +
drivers/dma/8250_mtk_dma.c line 842
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+for (i =0 ; i <MTK_SDMA_CHANNELS ; i++) { + res =platform_get_resource (pdev,IORESOURCE_MEM , i); +if (!res) +return -ENODEV ; + mtkd->mem_base[i] =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (mtkd->mem_base[i])) +return PTR_ERR (mtkd->mem_base[i]); + } + +/* request irq */
remove the comment that is not identical to the implementation as below code snippet
drivers/dma/8250_mtk_dma.c line 845
Quoted 3 lines
drivers/dma/8250_mtk_dma.c new file +3
-0+for (i =0 ; i <MTK_SDMA_CHANNELS ; i++) { + mtkd->dma_irq[i] =platform_get_irq (pdev, i); +if ((int )mtkd->dma_irq[i] <0 ) {
the cast seems not necessary
drivers/dma/8250_mtk_dma.c line 851
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+dev_err (&pdev->dev,"failed to get IRQ[%d]\n" , i); +return -EINVAL ; + } + } + + mtkd->clk =devm_clk_get (&pdev->dev,NULL );
assign a name to the "apdma" per the binding you adds
Quoted 16 lines
drivers/dma/8250_mtk_dma.c new file +16
-0+if (IS_ERR (mtkd->clk)) { +dev_err (&pdev->dev,"No clock specified\n" ); +return PTR_ERR (mtkd->clk); + } + +if (of_property_read_bool (pdev->dev.of_node,"dma-33bits" )) { +dev_info (&pdev->dev,"Support dma 33bits\n" ); + mtkd->support_33bits = true; + } + +if (mtkd->support_33bits) + rc =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (33 )); +else + rc =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 )); +if (rc) +return rc;
drivers/dma/8250_mtk_dma.c line 877
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ +dma_cap_set (DMA_SLAVE , mtkd->ddev.cap_mask); + mtkd->ddev.device_alloc_chan_resources = mtk_dma_alloc_chan_resources; + mtkd->ddev.device_free_chan_resources = mtk_dma_free_chan_resources; + mtkd->ddev.device_tx_status = mtk_dma_tx_status; + mtkd->ddev.device_issue_pending = mtk_dma_issue_pending; + mtkd->ddev.device_prep_slave_sg = mtk_dma_prep_slave_sg; + mtkd->ddev.device_config = mtk_dma_slave_config; + mtkd->ddev.device_pause = mtk_dma_device_pause; + mtkd->ddev.device_resume = mtk_dma_device_resume;
Is it possible that we don't register pause and resume handler if the dma engine cannot support to?
Quoted 5 lines
drivers/dma/8250_mtk_dma.c new file +5
-0+ mtkd->ddev.device_terminate_all = mtk_dma_terminate_all; + mtkd->ddev.src_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_1_BYTE ); + mtkd->ddev.dst_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_1_BYTE ); + mtkd->ddev.directions =BIT (DMA_DEV_TO_MEM ) |BIT (DMA_MEM_TO_DEV ); + mtkd->ddev.residue_granularity =DMA_RESIDUE_GRANULARITY_SEGMENT ;
drivers/dma/8250_mtk_dma.c line 892
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ mtkd->ddev.dev = &pdev->dev; +INIT_LIST_HEAD (&mtkd->ddev.channels); +INIT_LIST_HEAD (&mtkd->pending); + +spin_lock_init (&mtkd->lock); +tasklet_init (&mtkd->task, mtk_dma_sched, (unsigned long )mtkd); + + mtkd->dma_requests =MTK_SDMA_REQUESTS ; +if (of_property_read_u32 (pdev->dev.of_node, +"dma-requests" , &mtkd->dma_requests) !=0 ) {
extra "! = 0" can be dropped in the condition check
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+dev_info (&pdev->dev, +"Missing dma-requests property, using %u.\n" , +MTK_SDMA_REQUESTS ); + } + +for (i =0 ; i <MTK_SDMA_CHANNELS ; i++) { + rc =mtk_dma_chan_init (mtkd);
drivers/dma/8250_mtk_dma.c line 909
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+if (rc) + goto err_no_dma; + } + +pm_runtime_enable (&pdev->dev); +pm_runtime_set_active (&pdev->dev); + + rc =dma_async_device_register (&mtkd->ddev); +if (rc) { +dev_warn (&pdev->dev,"fail to register DMA device: %d\n" , rc);
drop the debug log
drivers/dma/8250_mtk_dma.c
Quoted 1 line
drivers/dma/8250_mtk_dma.c new file +1
-0+mtk_dma_clk_disable (mtkd);
move the undo jobs at the tail of the function to error handling clean
drivers/dma/8250_mtk_dma.c line 916
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ goto err_no_dma; + } + +platform_set_drvdata (pdev, mtkd); + +if (pdev->dev.of_node) {
you don't need that since all mtk drivers are dt based
drivers/dma/8250_mtk_dma.c line 924
Quoted 8 lines
drivers/dma/8250_mtk_dma.c new file +8
-0+ mtk_dma_info.dma_cap = mtkd->ddev.cap_mask; + +/* Device-tree DMA controller registration */ + rc =of_dma_controller_register (pdev->dev.of_node, + of_dma_simple_xlate, + &mtk_dma_info); +if (rc) { +dev_warn (&pdev->dev,"fail to register DMA controller\n" );
drop the debug log
drivers/dma/8250_mtk_dma.c
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+dma_async_device_unregister (&mtkd->ddev); +mtk_dma_clk_disable (mtkd);
move the undo jobs at the tail of the function to make error handling clean
Quoted 14 lines
drivers/dma/8250_mtk_dma.c new file +14
-0+ goto err_no_dma; + } + } + +return rc; + +err_no_dma: +mtk_dma_free (mtkd); +return rc; +} + +static int mtk_dma_remove (struct platform_device *pdev) +{ +struct mtk_dmadev *mtkd =platform_get_drvdata (pdev);
drivers/dma/8250_mtk_dma.c line 950
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ +if (pdev->dev.of_node) +of_dma_controller_free (pdev->dev.of_node); + +pm_runtime_disable (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev); + +dma_async_device_unregister (&mtkd->ddev); + +mtk_dma_free (mtkd);
Extra task in the remove handler is needed to add here such as ensure that VC tasks being killed, disable hardware and its interrupts and wait for pending ISRs task all done.
Quoted 14 lines
drivers/dma/8250_mtk_dma.c new file +14
-0+ +return 0 ; +} + +#ifdef CONFIG_PM_SLEEP +static int mtk_dma_suspend (struct device *dev) +{ +struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + +if (!pm_runtime_suspended (dev)) +mtk_dma_clk_disable (mtkd); + +return 0 ; +}
drivers/dma/8250_mtk_dma.c line 974
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ +static int mtk_dma_resume (struct device *dev) +{ +int ret; +struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + +if (!pm_runtime_suspended (dev)) { + ret =mtk_dma_clk_enable (mtkd); +if (ret) { +dev_info (dev,"fail to enable clk: %d\n" , ret);
get rid of the debug message
Quoted 14 lines
drivers/dma/8250_mtk_dma.c new file +14
-0+return ret; + } + } + +return 0 ; +} + +static int mtk_dma_runtime_suspend (struct device *dev) +{ +struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + +mtk_dma_clk_disable (mtkd); + +return 0 ;
drivers/dma/8250_mtk_dma.c line 998
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+} + +static int mtk_dma_runtime_resume (struct device *dev) +{ +int ret; +struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + + ret =mtk_dma_clk_enable (mtkd); +if (ret) { +dev_warn (dev,"fail to enable clk: %d\n" , ret);
get rid of the debug message
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+return ret; + } + +return 0 ; +} +
drivers/dma/8250_mtk_dma.c line 1014
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+#endif /* CONFIG_PM_SLEEP */ + +static const struct dev_pm_ops mtk_dma_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(mtk_dma_suspend, mtk_dma_resume) +SET_RUNTIME_PM_OPS (mtk_dma_runtime_suspend, + mtk_dma_runtime_resume,NULL ) +}; + +static struct platform_driver mtk_dma_driver = { + .probe = mtk_dma_probe,
mtk_apdma_uart_probe? I guess apdma is a real name for the dma engine
drivers/dma/8250_mtk_dma.c line 1015
Quoted 1 line
drivers/dma/8250_mtk_dma.c new file +1
-0+ .remove = mtk_dma_remove,
mtk_apdma_uart_remove? same reason as the above
drivers/dma/8250_mtk_dma.c line 1017
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+ .driver = { + .name = "8250-mtk-dma",
.name = KBUILD_MODNAME,
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ .pm = &mtk_dma_pm_ops, + .of_match_table = of_match_ptr(mtk_uart_dma_match), + }, +}; + +static bool mtk_dma_filter_fn (struct dma_chan *chan,void *param) +{ +if (chan->device->dev->driver == &mtk_dma_driver.driver) { +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_chan *c =to_mtk_dma_chan (chan);
drivers/dma/8250_mtk_dma.c line 1037
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+unsigned int req = *(unsigned int *)param; + +if (req <= mtkd->dma_requests) { + c->dma_sig = req; + c->dma_ch = req; +return true; + } + } +return false; +}
I really wonder if the filter fn is necessary stuff made here but I am not fully sure.
Can you look into more about of_dma_controller_register and its usage to see if the generic call satisfies your need?
drivers/dma/8250_mtk_dma.c line 1049
Quoted 12 lines
drivers/dma/8250_mtk_dma.c new file +12
-0+ +static int mtk_dma_init (void ) +{ +return platform_driver_register (&mtk_dma_driver); +} +subsys_initcall (mtk_dma_init); + +static void __exit mtk_dma_exit(void) +{ +platform_driver_unregister (&mtk_dma_driver); +} +module_exit (mtk_dma_exit);
Use module_platform_driver instead and then add more information for the module such as MODULE_DESCRIPTION, MODULE_AUTHOR, MODULE_LICENSE.
Quoted 27 lines
drivers/dma/Kconfig +11
-0@@ -151,6 +151,17 @@ config DMA_JZ4780 If you have a board based on such a SoC and wish to use DMA for devices which can use the DMA controller, say Y or M here. +config DMA_MTK_UART + tristate "MediaTek SoCs APDMA support for UART" + depends on OF + select DMA_ENGINE + select DMA_VIRTUAL_CHANNELS + help + Support for the UART DMA engine found on MediaTek MTK SoCs. + when 8250 mtk uart is enabled, and if you want to using DMA, + you can enable the config. the DMA engine just only be used + with MediaTek Socs. + config DMA_SA11X0 tristate "SA-11x0 DMA support" depends on ARCH_SA1100 || COMPILE_TESTdrivers/dma/Makefile +0
-0
drivers/dma/Makefile obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o · line 27
Quoted 4 lines
drivers/dma/Makefile +1
-0@@ -24,6 +24,7 @@ obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o obj-$(CONFIG_DMA_BCM2835) += bcm2835-dma.o obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o obj-$(CONFIG_DMA_JZ4780) += dma-jz4780.o +obj-$(CONFIG_DMA_MTK_UART) += 8250_mtk_dma.o
move Makefile update to drivers/dma/mediatek
Quoted 3 lines
drivers/dma/Makefile +0
-0obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o obj-$(CONFIG_DMA_SUN4I) += sun4i-dma.o obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o
PATCH 2/4 dmaengine: mtk_uart_dma: add Mediatek uart DMA support
Quoted 5 lines · Sean Wang
Hi,
Quoted 2 lines · Long Cheng
In DMA engine framework, add 8250 mtk dma to support it.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Long Cheng <[email protected]>--- drivers/dma/8250_mtk_dma.c | 1049 ++++++++++++++++++++++++++++++++++++++++++++ drivers/dma/Kconfig | 11 + drivers/dma/Makefile | 1 +the driver should be moved to driver/dma/mediatek
ok, i will move these.
Quoted 13 lines
Quoted 13 lines
3 files changed, 1061 insertions(+) create mode 100644 drivers/dma/8250_mtk_dma.cdrivers/dma/8250_mtk_dma.c new file +3
-0@@ -0,0 +1,1049 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Mediatek 8250 DMA driver.
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 9
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+* +* Copyright (c) 2018 MediaTek Inc. +* Author: Long Cheng <[email protected]> +*/ + +#define pr_fmt (fmt) "8250-mtk-dma: " fmt
pr_fmtcan be removed since no place is called withpr_fmt
OK, i will remove it.
Quoted 5 lines
drivers/dma/8250_mtk_dma.c line 11
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+#define DRV_NAME "8250-mtk-dma" +use
KBUILD_MODNAMEinstead
OK, i will modify it.
Quoted 14 lines
Quoted 14 lines
drivers/dma/8250_mtk_dma.c new file +13
-0+#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/dmaengine.h> +#include <linux/dma-mapping.h> +#include <linux/err.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/of_dma.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/slab.h>
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 30
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+#include <linux/spinlock.h> +#include <linux/pm_runtime.h> + +#include "virt-dma.h" + +#define MTK_SDMA_REQUESTS 127name it as
MTK_SDMA_DEFAULT_REQUESTSseems to be more readable
OK, i will modify it.
Quoted 4 lines
drivers/dma/8250_mtk_dma.c line 31
Quoted 1 line
drivers/dma/8250_mtk_dma.c new file +1
-0+#define MTK_SDMA_CHANNELS (CONFIG_SERIAL_8250_NR_UARTS * 2)total number of the channels should depend on the capability the hardware provides, it should be detected by the device tree
in kernel config, CONFIG_SERIAL_8250_NR_UARTS is uart port numbers. i think that maybe it's OK.
Quoted 10 lines
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ +#define VFF_RX_INT_FLAG_CLR_B (BIT(0U) | BIT(1U)) +#define VFF_TX_INT_FLAG_CLR_B 0 +#define VFF_RX_INT_EN0_B BIT(0U)/*rx valid size >= vff thre */ +#define VFF_RX_INT_EN1_B BIT(1U) +#define VFF_TX_INT_EN_B BIT(0U)/*tx left size >= vff thre */ +#define VFF_INT_EN_CLR_B 0 +#define VFF_WARM_RST_B BIT(0U) +#define VFF_EN_B BIT(0U) +#define VFF_STOP_B BIT(0U)
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 47
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+#define VFF_STOP_CLR_B 0 +#define VFF_FLUSH_B BIT(0U) +#define VFF_FLUSH_CLR_B 0 +#define VFF_4G_SUPPORT_B BIT(0U) +#define VFF_4G_SUPPORT_CLR_B 0 +all postfix U can be removed, and register offset placed along with the bit definition would be good to read
OK, I will modify these.
Quoted 9 lines
Quoted 9 lines
drivers/dma/8250_mtk_dma.c new file +9
-0+/* interrupt trigger level for tx */ +#define VFF_TX_THRE (n) ((n) * 7 / 8) +/* interrupt trigger level for rx */ +#define VFF_RX_THRE (n) ((n) * 3 / 4) + +#define MTK_DMA_RING_SIZE 0xffffU +/* invert this bit when wrap ring head again*/ +#define MTK_DMA_RING_WRAP 0x10000U +
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 61
Quoted 5 lines
drivers/dma/8250_mtk_dma.c new file +5
-0+struct mtk_dmadev { +struct dma_device ddev; +void __iomem *mem_base[MTK_SDMA_CHANNELS ]; +spinlock_t lock;/* dma dev lock */ +struct tasklet_struct task;tasklet should be removed in general in order to allow the task as soon as possible to be process you could refer to
mtk_hsdma.cI made indrivers/dma/mediatek/first
there are many data transfer, and UART is low speed devices. So add the tasklet to process data.
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 67
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+struct list_head pending; +struct clk *clk; +unsigned int dma_requests; +bool support_33bits; +unsigned int dma_irq[MTK_SDMA_CHANNELS ]; +struct mtk_chan *lch_map[MTK_SDMA_CHANNELS ];why is the map required? do you offer any way for that the channel would be assigned or managed on the runtime?
just for record channel. maybe need rename.
Quoted 10 lines
drivers/dma/8250_mtk_dma.c line 74
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+}; + +struct mtk_chan { +struct virt_dma_chan vc; +struct list_head node; +struct dma_slave_config cfg; +void __iomem *channel_base;
channel_basecan be renamed to base since the member is located atmtk_chan
OK, i will modify it.
Quoted 6 lines
drivers/dma/8250_mtk_dma.c line 77
Quoted 3 lines
drivers/dma/8250_mtk_dma.c new file +3
-0+struct mtk_dma_desc *desc; + +bool paused;I don't think the variable paused since it doesn't support pause function
it's used to terminate. maybe rename to stop. if you think it's better.
Quoted 17 lines
drivers/dma/8250_mtk_dma.c line 90
Quoted 13 lines
drivers/dma/8250_mtk_dma.c new file +13
-0+bool requested; + +unsigned int dma_sig; +unsigned int dma_ch; +unsigned int sgidx; +unsigned int remain_size; +unsigned int rx_ptr; + +/*sync*/ +struct completion done;/* dma transfer done */ +spinlock_t lock;/* channel lock */ +atomic_t loopcnt; +atomic_t entry;/* entry count */ Why the two atomic variables is introduced? they make the whole logic flow a little bit hard to understand. In general, the generic
dma_virtual_channelscan support the most dma engines for how descriptors on each channel being managed.
Quoted 4 lines
You should check it first how list
vc->desc_allocated,vc->desc_submittedandvc->desc_issuedbeing maintained and really think if it's also suitable to the dmaengine. You could refer tomtk-hsdma.cI made indrivers/dma/mediatek/first. The driver totally reuses these vc lists..
entry, for data don't lost, if entry > 1, run tasket schedule. loopcnt, for tx, make sure that all data send.
Quoted 7 lines
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+}; + +struct mtk_dma_sg { +dma_addr_t addr; +unsigned int en;/* number of elements (24-bit) */ +unsigned int fn;/* number of frames (16-bit) */ +};
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 103
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ +struct mtk_dma_desc { +struct virt_dma_desc vd; +enum dma_transfer_direction dir; +dma_addr_t dev_addr; +I don't see dir,
dev_addrbeing used in code flow? or I missed something ?
i will remove it.
Quoted 18 lines
Quoted 18 lines
drivers/dma/8250_mtk_dma.c new file +18
-0+unsigned int sglen; +struct mtk_dma_sg sg[0 ]; +}; + +enum { +VFF_INT_FLAG =0x00 , +VFF_INT_EN =0x04 , +VFF_EN =0x08 , +VFF_RST =0x0c , +VFF_STOP =0x10 , +VFF_FLUSH =0x14 , +VFF_ADDR =0x1c , +VFF_LEN =0x24 , +VFF_THRE =0x28 , +VFF_WPT =0x2c , +VFF_RPT =0x30 , +/*TX: the buffer size HW can read. RX: the buffer size SW can read.*/ +VFF_VALID_SIZE =0x3c ,
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 127
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+/*TX: the buffer size SW can write. RX: the buffer size HW can write.*/ +VFF_LEFT_SIZE =0x40 , +VFF_DEBUG_STATUS =0x50 , + VFF_4G_SUPPORT = 0x54, +}; +Add register definition with #define and move them near the bit field definition.
OK.
Quoted 50 lines
Quoted 37 lines
drivers/dma/8250_mtk_dma.c new file +35
-0+static bool mtk_dma_filter_fn (struct dma_chan *chan,void *param); +static struct of_dma_filter_info mtk_dma_info = { + .filter_fn = mtk_dma_filter_fn, +}; + +static inline struct mtk_dmadev *to_mtk_dma_dev (struct dma_device *d) +{ + return container_of(d, struct mtk_dmadev, ddev); +} + +static inline struct mtk_chan *to_mtk_dma_chan (struct dma_chan *c) +{ + return container_of(c, struct mtk_chan, vc.chan); +} + +static inline struct mtk_dma_desc *to_mtk_dma_desc + (struct dma_async_tx_descriptor *t) +{ + return container_of(t, struct mtk_dma_desc, vd.tx); +} + +static void mtk_dma_chan_write (struct mtk_chan *c, +unsigned int reg,unsigned int val) +{ +writel (val, c->channel_base + reg); +} + +static unsigned int mtk_dma_chan_read (struct mtk_chan *c,unsigned int reg) +{ +return readl (c->channel_base + reg); +} + +static void mtk_dma_desc_free (struct virt_dma_desc *vd) +{ +struct dma_chan *chan = vd->tx.chan;drivers/dma/8250_mtk_dma.c line 172
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+struct mtk_chan *c =to_mtk_dma_chan (chan); +unsigned long flags; + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->desc && c->cfg.direction ==DMA_DEV_TO_MEM ) +atomic_dec (&c->entry); + +kfree (c->desc); + c->desc =NULL ; +spin_unlock_irqrestore (&c->vc.lock, flags);The lock should not be necessary and try to make
*_desc_freebe as simple as possible.
Quoted 3 lines
In general, the function is being only to free specific memory about the vd. It should be done by
kfree(container_of(vd, struct mtk_apdma_vdesc, vd)); And don't need to care what detail the channel and direction is.
i remember that if no the lock, maybe will crash. it's timing issue with 'mtk_dma_terminate_all'. So i think that maybe can keep it.
Quoted 24 lines
Quoted 24 lines
drivers/dma/8250_mtk_dma.c new file +24
-0+} + +static int mtk_dma_clk_enable (struct mtk_dmadev *mtkd) +{ +int ret; + + ret =clk_prepare_enable (mtkd->clk); +if (ret) { +dev_err (mtkd->ddev.dev,"Couldn't enable the clock\n" ); +return ret; + } + +return 0 ; +} + +static void mtk_dma_clk_disable (struct mtk_dmadev *mtkd) +{ +clk_disable_unprepare (mtkd->clk); +} + +static void mtk_dma_remove_virt_list (dma_cookie_t cookie, +struct virt_dma_chan *vc) +{ +struct virt_dma_desc *vd;
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 201
Quoted 5 lines
drivers/dma/8250_mtk_dma.c new file +5
-0+ +if (list_empty (&vc->desc_issued) ==0 ) { +list_for_each_entry (vd, &vc->desc_issued, node) { +if (cookie == vd->tx.cookie) { +INIT_LIST_HEAD (&vc->desc_issued);Why force to reinit list
desc_issued? that is enqueued by core layer. They are expected to be configured into the hardware by the driver in sequence and then dequeued from the list when the descriptor is totally setting done by the driver or completed by the hardware.
long time issue. i just remember that if no this, in vchan_cookie_complete have some problem.
Quoted 17 lines
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +3
-0+break ; + } + }drivers/dma/8250_mtk_dma.c line 214
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ } +} + +static void mtk_dma_tx_flush (struct dma_chan *chan) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); + +if (mtk_dma_chan_read (c,VFF_FLUSH ) ==0U ) { +mtk_dma_chan_write (c,VFF_FLUSH ,VFF_FLUSH_B ); +if (atomic_dec_and_test (&c->loopcnt))I really think depending on atomic complete a synchronization is a tricky thing. Can we have another elegant way to let synchronization become good to read and easy to maintain?
Quoted 2 lines
Or you could refer to
mtk_hsdma.cI made indrivers/dma/mediatek/first, the similar synchronization is also being done here.
uart is low speed device. So synchronization is not good
Quoted 18 lines
Quoted 18 lines
drivers/dma/8250_mtk_dma.c new file +18
-0+complete (&c->done); + } +} + +/* +* check whether the dma flush operation is finished or not. +* return 0 for flush success. +* return others for flush timeout. +*/ +static int mtk_dma_check_flush_result (struct dma_chan *chan) +{ +struct timespec start, end; +struct mtk_chan *c =to_mtk_dma_chan (chan); + + start =ktime_to_timespec (ktime_get ()); + +while ((mtk_dma_chan_read (c,VFF_FLUSH ) &VFF_FLUSH_B ) ==VFF_FLUSH_B ) { + end =ktime_to_timespec (ktime_get ());
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 238
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+if ((end.tv_sec - start.tv_sec) >1 || + ((end.tv_sec - start.tv_sec) ==1 && + end.tv_nsec > start.tv_nsec)) { +dev_err (chan->device->dev, +"[DMA] Polling flush timeout\n" ); +return -1 ;You can check
readx_poll_timeoutand related APIs instead of the open coding.
OK, i can check it.
Quoted 8 lines
Quoted 8 lines
drivers/dma/8250_mtk_dma.c new file +8
-0+ } + } + +return 0 ; +} + +static void mtk_dma_tx_write (struct dma_chan *chan) +{
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 252
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +unsigned int txcount = c->remain_size; +unsigned int len, send, left, wpt, wrap; + +if (atomic_inc_return (&c->entry) >1 ) {atomic variable again. Can you explain more about what the branches (if and else) are doing for ? Let's see if they can be replaced by more elegant ways
first data don't transfer complete. another data come, we need move the data to tasklet schedule.
Quoted 20 lines
Quoted 20 lines
drivers/dma/8250_mtk_dma.c new file +19
-0+if (vchan_issue_pending (&c->vc) && !c->desc) { +spin_lock (&mtkd->lock); +list_add_tail (&c->node, &mtkd->pending); +spin_unlock (&mtkd->lock); +tasklet_schedule (&mtkd->task); + } + }else { + len =mtk_dma_chan_read (c,VFF_LEN ); +if (mtk_dma_check_flush_result (chan) !=0 ) +return ; + +while ((left =mtk_dma_chan_read (c,VFF_LEFT_SIZE )) >0U ) { + send =min (left, c->remain_size); + wpt =mtk_dma_chan_read (c,VFF_WPT ); + wrap = wpt &MTK_DMA_RING_WRAP ?0U :MTK_DMA_RING_WRAP ; + +if ((wpt & (len -1U )) + send < len) +mtk_dma_chan_write (c,VFF_WPT , wpt + send); +else
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 277
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+mtk_dma_chan_write (c,VFF_WPT , + ((wpt + send) & (len -1U )) + | wrap); + + c->remain_size -= send; +if (c->remain_size ==0U )the if condition can be moved to the the beginning while condition
OK, i will modify it
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 282
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +5
-0+break ; + } + +if (txcount != c->remain_size) { +mtk_dma_chan_write (c,VFF_INT_EN ,VFF_TX_INT_EN_B );why need to enable interrupt to trigger the next?
the dma buffer is ring buffer. So we will confirm that all data send. and confirm that the data trigger done or not.
Quoted 13 lines
drivers/dma/8250_mtk_dma.c line 292
Quoted 11 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+mtk_dma_tx_flush (chan); + } + } +atomic_dec (&c->entry); +} + +static void mtk_dma_start_tx (struct mtk_chan *c) +{ +if (mtk_dma_chan_read (c,VFF_LEFT_SIZE ) ==0U ) { +pr_info ("%s maybe need fix? @L %d\n" , __func__, __LINE__);the debug message can be removed
ok, i will remove it.
Quoted 4 lines
drivers/dma/8250_mtk_dma.c line 293
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +1
-0+mtk_dma_chan_write (c,VFF_INT_EN ,VFF_TX_INT_EN_B );what is the step for?
enable DMA interrupt.
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 299
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ }else { +reinit_completion (&c->done); + +/* inc twice, once for tx_flush, another for tx_interrupt */ +atomic_inc (&c->loopcnt); +atomic_inc (&c->loopcnt);if you have two events for which some point wants to wait, why not create two two completions for them?
it's confirm that TX done. i can use other APIs instead of this.
Quoted 15 lines
drivers/dma/8250_mtk_dma.c line 310
Quoted 12 lines
drivers/dma/8250_mtk_dma.c new file +11
-0+mtk_dma_tx_write (&c->vc.chan); + } + c->paused = false; +} + +static void mtk_dma_get_rx_size (struct mtk_chan *c) +{ +unsigned int count; +unsigned int rdptr, wrptr, wrreg, rdreg; +unsigned int rx_size =mtk_dma_chan_read (c,VFF_LEN ); +Sort all declarations in reversed Xmas tree, even along with all occurrences in the other functions
OK, i will modify it.
Quoted 18 lines
Quoted 18 lines
drivers/dma/8250_mtk_dma.c new file +18
-0+ rdreg =mtk_dma_chan_read (c,VFF_RPT ); + wrreg =mtk_dma_chan_read (c,VFF_WPT ); + rdptr = rdreg &MTK_DMA_RING_SIZE ; + wrptr = wrreg &MTK_DMA_RING_SIZE ; + count = ((rdreg ^ wrreg) &MTK_DMA_RING_WRAP ) ? + (wrptr + rx_size - rdptr) : (wrptr - rdptr); + + c->remain_size = count; + c->rx_ptr = rdptr; + +mtk_dma_chan_write (c,VFF_RPT , wrreg); +} + +static void mtk_dma_start_rx (struct mtk_chan *c) +{ +struct dma_chan *chan = &c->vc.chan; +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_dma_desc *d = c->desc;
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 334
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ +if (mtk_dma_chan_read (c,VFF_VALID_SIZE ) !=0U && + d && d->vd.tx.cookie !=0 ) { +mtk_dma_get_rx_size (c); +mtk_dma_remove_virt_list (d->vd.tx.cookie, &c->vc); +vchan_cookie_complete (&d->vd);please make
vchan_cookie_completein a completion handler such as a completion ISR, not in a start handler.
the function is called by RX interrupt or rx schedule. can't remove it.
Quoted 13 lines
drivers/dma/8250_mtk_dma.c line 344
Quoted 11 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ }else { +if (mtk_dma_chan_read (c,VFF_VALID_SIZE ) !=0U ) { +spin_lock (&mtkd->lock); +if (list_empty (&mtkd->pending)) +list_add_tail (&c->node, &mtkd->pending); +spin_unlock (&mtkd->lock); +tasklet_schedule (&mtkd->task); + }else { +if (atomic_read (&c->entry) >0 ) +atomic_set (&c->entry,0 );I am not not clear about the magical reset. could you explain more?
in the case, maybe no RX data in RX DMA buffer, So set to 0.
Quoted 10 lines
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +9
-0+ } + } +} + +static void mtk_dma_reset (struct mtk_chan *c) +{ +struct mtk_dmadev *mtkd =to_mtk_dma_dev (c->vc.chan.device); + +mtk_dma_chan_write (c,VFF_ADDR ,0 );
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 359
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+mtk_dma_chan_write (c,VFF_THRE ,0 ); +mtk_dma_chan_write (c,VFF_LEN ,0 ); +mtk_dma_chan_write (c,VFF_RST ,VFF_WARM_RST_B ); + +while + (mtk_dma_chan_read (c,VFF_EN ));add a timeout, otherwise it would get a hang possibly. you can check
readx_poll_timeoutand related APIs to add a timeout.
OK, i can modify it.
Quoted 11 lines
drivers/dma/8250_mtk_dma.c line 366
Quoted 8 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+ +if (c->cfg.direction ==DMA_DEV_TO_MEM ) +mtk_dma_chan_write (c,VFF_RPT ,0 ); +else if (c->cfg.direction ==DMA_MEM_TO_DEV ) +mtk_dma_chan_write (c,VFF_WPT ,0 ); +else +dev_info (c->vc.chan.device->dev,"Unknown direction.\n" );is it possible to happen?
when first init, it's happen. it's debug log, i can remove it.
Quoted 16 lines
Quoted 16 lines
drivers/dma/8250_mtk_dma.c new file +16
-0+ +if (mtkd->support_33bits) +mtk_dma_chan_write (c,VFF_4G_SUPPORT ,VFF_4G_SUPPORT_CLR_B ); +} + +static void mtk_dma_stop (struct mtk_chan *c) +{ +int polling_cnt; + +mtk_dma_chan_write (c,VFF_FLUSH ,VFF_FLUSH_CLR_B ); + + polling_cnt =0 ; +while ((mtk_dma_chan_read (c,VFF_FLUSH ) &VFF_FLUSH_B ) == +VFF_FLUSH_B ) { + polling_cnt++; +if (polling_cnt >10000 ) {
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 388
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+dev_err (c->vc.chan.device->dev, +"dma stop: polling FLUSH fail, DEBUG=0x%x\n" , +mtk_dma_chan_read (c,VFF_DEBUG_STATUS )); +break ; + } + }You can check
readx_poll_timeoutand related APIs to make the fucntion more readable
ok, i will check it.
Quoted 17 lines
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +3
-0+ + polling_cnt =0 ; +/*set stop as 1 -> wait until en is 0 -> set stop as 0*/ drivers/dma/8250_mtk_dma.c line 401
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+mtk_dma_chan_write (c,VFF_STOP ,VFF_STOP_B ); +while (mtk_dma_chan_read (c,VFF_EN )) { + polling_cnt++; +if (polling_cnt >10000 ) { +dev_err (c->vc.chan.device->dev, +"dma stop: polling VFF_EN fail, DEBUG=0x%x\n" , +mtk_dma_chan_read (c,VFF_DEBUG_STATUS )); +break ; + } + }You can check
readx_poll_timeoutand related APIs to make the function more readable.
ok, i will check it.
Quoted 11 lines
drivers/dma/8250_mtk_dma.c line 410
Quoted 9 lines
drivers/dma/8250_mtk_dma.c new file +9
-0+mtk_dma_chan_write (c,VFF_STOP ,VFF_STOP_CLR_B ); +mtk_dma_chan_write (c,VFF_INT_EN ,VFF_INT_EN_CLR_B ); + +if (c->cfg.direction ==DMA_DEV_TO_MEM ) +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_RX_INT_FLAG_CLR_B ); +else +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_TX_INT_FLAG_CLR_B ); + + c->paused = true;It's a stop, not a pause
yes. So maybe i can rename it.
Quoted 22 lines
Quoted 9 lines
drivers/dma/8250_mtk_dma.c new file +8
-0+} + +/* +* We need to deal with 'all channels in-use' +*/ +static void mtk_dma_rx_sched (struct mtk_chan *c) +{ +struct dma_chan *chan = &c->vc.chan;drivers/dma/8250_mtk_dma.c line 428
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); + +if (atomic_read (&c->entry) <1 ) { +mtk_dma_start_rx (c); + }else { +spin_lock (&mtkd->lock); +if (list_empty (&mtkd->pending)) +list_add_tail (&c->node, &mtkd->pending); +spin_unlock (&mtkd->lock); +tasklet_schedule (&mtkd->task);I'm not clear why mixing start rx and tasklet rx here. In general, please make all tx/rx job as soon as poosible.
Quoted 2 lines
you can refer to the
mtk_hsdma.cI made.
TX/RX is slow. It's Hw behavior, So need tasklet
Quoted 18 lines
Quoted 18 lines
drivers/dma/8250_mtk_dma.c new file +18
-0+ } +} + +/* +* This callback schedules all pending channels. We could be more +* clever here by postponing allocation of the real DMA channels to +* this point, and freeing them when our virtual channel becomes idle. +* +* We would then need to deal with 'all channels in-use' +*/ +static void mtk_dma_sched (unsigned long data) +{ +struct mtk_dmadev *mtkd = (struct mtk_dmadev *)data; +struct mtk_chan *c; +struct virt_dma_desc *vd; +dma_cookie_t cookie; +LIST_HEAD (head); +unsigned long flags;
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 452
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ +spin_lock_irq (&mtkd->lock); +list_splice_tail_init (&mtkd->pending, &head); +spin_unlock_irq (&mtkd->lock); + +if (list_empty (&head) ==0 ) {!list_empty
Ok, i will modify it.
Quoted 7 lines
drivers/dma/8250_mtk_dma.c line 456
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+ c = list_first_entry(&head, struct mtk_chan, node); + cookie = c->vc.chan.cookie; + +spin_lock_irqsave (&c->vc.lock, flags);head is a local list so the lock is not neccessary
channel 'c' is relate of VC. long time ago, add this, maybe to fix crash. So i suggest to keep it.
Quoted 4 lines
drivers/dma/8250_mtk_dma.c line 458
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+if (c->cfg.direction ==DMA_DEV_TO_MEM ) { +list_del_init (&c->node);why not use
list_decversion
what's API?
Quoted 10 lines
drivers/dma/8250_mtk_dma.c line 465
Quoted 8 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+mtk_dma_rx_sched (c); + }else if (c->cfg.direction ==DMA_MEM_TO_DEV ) { + vd =vchan_find_desc (&c->vc, cookie); + + c->desc =to_mtk_dma_desc (&vd->tx); +list_del_init (&c->node); +mtk_dma_start_tx (c);why is direct call for tx and tasklet for rx?
if RX interrupt too many, need confirm data right, So add rx schedule. TX data no the case.
Quoted 11 lines
Quoted 11 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ } +spin_unlock_irqrestore (&c->vc.lock, flags); + } +} + +static int mtk_dma_alloc_chan_resources (struct dma_chan *chan) +{ +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_chan *c =to_mtk_dma_chan (chan); +int ret = -EBUSY ;
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 481
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ +pm_runtime_get_sync (mtkd->ddev.dev); + +if (!mtkd->lch_map[c->dma_ch]) { + c->channel_base = mtkd->mem_base[c->dma_ch]; + mtkd->lch_map[c->dma_ch] = c;keep
lch_mapin mtkd is not necessary. instead, I think we can keep all information required by the physical channel insidemtk_chan, not exported to the whole dma engine.
just record the channel. maybe rename.
Quoted 5 lines
drivers/dma/8250_mtk_dma.c line 482
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +1
-0+ ret =1 ;why returning 1 here?
one channel is requested successfully.
Quoted 16 lines
Quoted 16 lines
drivers/dma/8250_mtk_dma.c new file +16
-0+ } + c->requested = false; +mtk_dma_reset (c); + +return ret; +} + +static void mtk_dma_free_chan_resources (struct dma_chan *chan) +{ +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_chan *c =to_mtk_dma_chan (chan); + +if (c->requested) { + c->requested = false; +free_irq (mtkd->dma_irq[c->dma_ch], chan); + }
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 504
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ +tasklet_kill (&mtkd->task); + + c->channel_base =NULL ; + mtkd->lch_map[c->dma_ch] =NULL ; +vchan_free_chan_resources (&c->vc);I think we should call
mtk_dma_terminatefirst to free all descriptors and then free the other channel resouce in the function.
mtk_dma terminate called by Dmaengine
Quoted 20 lines
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ +dev_dbg (mtkd->ddev.dev,"freeing channel for %u\n" , c->dma_sig); + c->dma_sig =0 ; + +pm_runtime_put_sync (mtkd->ddev.dev); +}drivers/dma/8250_mtk_dma.c line 520
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ +static enum dma_status mtk_dma_tx_status (struct dma_chan *chan, +dma_cookie_t cookie, +struct dma_tx_state *txstate) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +enum dma_status ret; +unsigned long flags; + + ret =dma_cookie_status (chan, cookie, txstate);consider txstate null case and directly return when the descriptor is complete, such as
Quoted 4 lines
ret = dma_cookie_status(c, cookie, txstate); if (ret == DMA_COMPLETE || !txstate) return ret;
OK, i will check it.
Quoted 7 lines
drivers/dma/8250_mtk_dma.c line 525
Quoted 5 lines
drivers/dma/8250_mtk_dma.c new file +5
-0+ +spin_lock_irqsave (&c->vc.lock, flags); +if (ret ==DMA_IN_PROGRESS ) { + c->rx_ptr =mtk_dma_chan_read (c,VFF_RPT ) &MTK_DMA_RING_SIZE ; + txstate->residue = c->rx_ptr;are you sure all descriptors
DMA_IN_PROCESSall be processed by hardware ?
no, but it's not matter
Quoted 5 lines
drivers/dma/8250_mtk_dma.c line 527
Quoted 3 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+ }else if (ret ==DMA_COMPLETE && c->cfg.direction ==DMA_DEV_TO_MEM ) { + txstate->residue = c->remain_size;why is residue not zero when dma is complete ?
the size is that move DMA to tty memory.
Quoted 7 lines
drivers/dma/8250_mtk_dma.c line 530
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +3
-0+ }else { + txstate->residue =0 ; + }setup ->residue by
dma_set_residue
ok, i will modify it
Quoted 22 lines
drivers/dma/8250_mtk_dma.c line 532
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+spin_unlock_irqrestore (&c->vc.lock, flags); +
spin_lockcan be droppedQuoted 4 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+return ret; +} + +static unsigned int mtk_dma_desc_size (struct mtk_dma_desc *d)drivers/dma/8250_mtk_dma.c line 546
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+{ +struct mtk_dma_sg *sg; +unsigned int i; +unsigned int size; + +for (size = i =0 ; i < d->sglen; i++) { + sg = &d->sg[i]; + size += sg->en * sg->fn; + } +return size;drop the function definition, see the below reason.
Quoted 15 lines
drivers/dma/8250_mtk_dma.c line 558
Quoted 12 lines
drivers/dma/8250_mtk_dma.c new file +12
-0+} + +static struct dma_async_tx_descriptor *mtk_dma_prep_slave_sg + (struct dma_chan *chan,struct scatterlist *sgl, +unsigned int sglen,enum dma_transfer_direction dir, +unsigned long tx_flags,void *context) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct scatterlist *sgent; +struct mtk_dma_desc *d; +dma_addr_t dev_addr; +unsigned int i, j, en, frame_bytes;save the variable
frame_bytesan en, it's always kept as 1 during the function call
ok, i will modity it.
Quoted 4 lines
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+ + en =1 ; + frame_bytes =1 ; +
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 568
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+if (dir ==DMA_DEV_TO_MEM ) { + dev_addr = c->cfg.src_addr; + }else if (dir ==DMA_MEM_TO_DEV ) { + dev_addr = c->cfg.dst_addr; + }else { +dev_err (chan->device->dev,"bad direction\n" );the case seems never happens because the device registers the capability it can support to.
yes. for strict, add it.
Quoted 4 lines
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+return NULL ; + } + +/* Now allocate and setup the descriptor. */
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 578
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ d =kzalloc (sizeof (*d) + sglen *sizeof (d->sg[0 ]),GFP_ATOMIC ); +if (!d) +return NULL ; + + d->dir = dir; + d->dev_addr = dev_addr;when and where is the
d->dev_addrbeing used?
ok, i will remove it.
Quoted 7 lines
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+ + j =0 ; +for_each_sg (sgl, sgent, sglen, i) { + d->sg[j].addr =sg_dma_address (sgent); + d->sg[j].en = en; + d->sg[j].fn =sg_dma_len (sgent) / frame_bytes; + j++;
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 591
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ } + + d->sglen = j; + +if (dir ==DMA_MEM_TO_DEV ) + c->remain_size =mtk_dma_desc_size (d);function
mtk_dma_desc_sizecan be dropped since the function is only used once and the result can be accumulated byfor_each_sg
ok i will modify it.
Quoted 26 lines
Quoted 26 lines
drivers/dma/8250_mtk_dma.c new file +25
-0+return vchan_tx_prep (&c->vc, &d->vd, tx_flags); +} + +static void mtk_dma_issue_pending (struct dma_chan *chan) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd; +struct virt_dma_desc *vd; +dma_cookie_t cookie; +unsigned long flags; + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->cfg.direction ==DMA_DEV_TO_MEM ) { + cookie = c->vc.chan.cookie; + mtkd =to_mtk_dma_dev (chan->device); +if (vchan_issue_pending (&c->vc) && !c->desc) { + vd =vchan_find_desc (&c->vc, cookie); + c->desc =to_mtk_dma_desc (&vd->tx); +if (atomic_read (&c->entry) >0 ) +atomic_set (&c->entry,0 ); + } + }else if (c->cfg.direction ==DMA_MEM_TO_DEV ) { + cookie = c->vc.chan.cookie; +if (vchan_issue_pending (&c->vc) && !c->desc) { + vd =vchan_find_desc (&c->vc, cookie);
Quoted 9 lines
drivers/dma/8250_mtk_dma.c
Quoted 5 lines
drivers/dma/8250_mtk_dma.c new file +5
-0+ c->desc =to_mtk_dma_desc (&vd->tx); +mtk_dma_start_tx (c); + } + } +spin_unlock_irqrestore (&c->vc.lock, flags)in general, we have to dump all
vc->desc_issuedinto the hw as soon as possible. how is the other descriptors except for the cookie stands for ?
sorry, i don't know what's mean. would you like tell me more info.
Quoted 14 lines
Quoted 14 lines
;
drivers/dma/8250_mtk_dma.c new file +13
-0+} + +static irqreturn_t mtk_dma_rx_interrupt (int irq,void *dev_id) +{ +struct dma_chan *chan = (struct dma_chan *)dev_id; +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +unsigned long flags; + +spin_lock_irqsave (&c->vc.lock, flags); +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_RX_INT_FLAG_CLR_B ); + +if (atomic_inc_return (&c->entry) >1 ) {
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 641
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+if (list_empty (&mtkd->pending)) +list_add_tail (&c->node, &mtkd->pending); +tasklet_schedule (&mtkd->task); + }else { +mtk_dma_start_rx (c); + }what's the reason making rx into direct call or tasklet in some case?
the rx is asynchronous. if rx interrupt too much, we need call tasklet
Quoted 36 lines
Quoted 36 lines
drivers/dma/8250_mtk_dma.c new file +35
-0+spin_unlock_irqrestore (&c->vc.lock, flags); + +return IRQ_HANDLED ; +} + +static irqreturn_t mtk_dma_tx_interrupt (int irq,void *dev_id) +{ +struct dma_chan *chan = (struct dma_chan *)dev_id; +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_dma_desc *d = c->desc; +unsigned long flags; + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->remain_size !=0U ) { +list_add_tail (&c->node, &mtkd->pending); +tasklet_schedule (&mtkd->task); + }else { +mtk_dma_remove_virt_list (d->vd.tx.cookie, &c->vc); +vchan_cookie_complete (&d->vd); + } +spin_unlock_irqrestore (&c->vc.lock, flags); + +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_TX_INT_FLAG_CLR_B ); +if (atomic_dec_and_test (&c->loopcnt)) +complete (&c->done); + +return IRQ_HANDLED ; +} + +static int mtk_dma_slave_config (struct dma_chan *chan, +struct dma_slave_config *cfg) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +struct mtk_dmadev *mtkd =to_mtk_dma_dev (c->vc.chan.device);
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 682
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+int ret; + + c->cfg = *cfg; + +if (cfg->direction ==DMA_DEV_TO_MEM ) { +unsigned int rx_len = cfg->src_addr_width *1024 ;the dma eingine only supports
DMA_SLAVE_BUSWIDTH_1_BYTE, why do we need to consider any othersrc_addr_widthhere ?
define trigger level to hw
Quoted 11 lines
Quoted 11 lines
drivers/dma/8250_mtk_dma.c new file +11
-0+ +mtk_dma_chan_write (c,VFF_ADDR , cfg->src_addr); +mtk_dma_chan_write (c,VFF_LEN , rx_len); +mtk_dma_chan_write (c,VFF_THRE ,VFF_RX_THRE (rx_len)); +mtk_dma_chan_write (c, +VFF_INT_EN ,VFF_RX_INT_EN0_B + |VFF_RX_INT_EN1_B ); +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_RX_INT_FLAG_CLR_B ); +mtk_dma_chan_write (c,VFF_EN ,VFF_EN_B ); + +if (!c->requested) {
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 707
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+atomic_set (&c->entry,0 ); + c->requested = true; + ret = request_irq(mtkd->dma_irq[c->dma_ch], + mtk_dma_rx_interrupt, + IRQF_TRIGGER_NONE, +move the
request_irqto driver probe stage, it can be manage by the core such irq affinity
probe seem run one times. we need control it.
Quoted 12 lines
drivers/dma/8250_mtk_dma.c line 707
Quoted 9 lines
DRV_NAME, chan);drivers/dma/8250_mtk_dma.c new file +8
-0+if (ret <0 ) { +dev_err (chan->device->dev,"Can't request rx dma IRQ\n" ); +return -EINVAL ; + } + } + }else if (cfg->direction ==DMA_MEM_TO_DEV ) { +unsigned int tx_len = cfg->dst_addr_width *1024 ; +the dma eingine only supports
DMA_SLAVE_BUSWIDTH_1_BYTE, why do we need to consider any othersrc_addr_widthhere ?
define trigger level to hw
Quoted 6 lines
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+mtk_dma_chan_write (c,VFF_ADDR , cfg->dst_addr); +mtk_dma_chan_write (c,VFF_LEN , tx_len); +mtk_dma_chan_write (c,VFF_THRE ,VFF_TX_THRE (tx_len)); +mtk_dma_chan_write (c,VFF_INT_FLAG ,VFF_TX_INT_FLAG_CLR_B ); +mtk_dma_chan_write (c,VFF_EN ,VFF_EN_B ); +
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 719
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+if (!c->requested) { + c->requested = true; + ret =request_irq (mtkd->dma_irq[c->dma_ch], + mtk_dma_tx_interrupt, +IRQF_TRIGGER_NONE , +DRV_NAME , chan);move the
request_irqto driver probe stage, it can be manage by the core such irq affinity
probe seem run one times. we need control it.
Quoted 10 lines
drivers/dma/8250_mtk_dma.c line 726
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +7
-0+if (ret <0 ) { +dev_err (chan->device->dev,"Can't request tx dma IRQ\n" ); +return -EINVAL ; + } + } + }else { +dev_info (chan->device->dev,"Unknown direction!\n" );remove the the unnecessary log
ok, i will remove it
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 732
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ } + +if (mtkd->support_33bits) +mtk_dma_chan_write (c,VFF_4G_SUPPORT ,VFF_4G_SUPPORT_B ); + +if (mtk_dma_chan_read (c,VFF_EN ) !=VFF_EN_B ) {when is the condition being satisfied ?
make sure that hw is OK. maybe the case can't to enter. just for debug, if any err happened.
Quoted 23 lines
Quoted 23 lines
drivers/dma/8250_mtk_dma.c new file +23
-0+dev_err (chan->device->dev, +"config dma dir[%d] fail\n" , cfg->direction); +return -EINVAL ; + } + +return 0 ; +} + +static int mtk_dma_terminate_all (struct dma_chan *chan) +{ +struct mtk_chan *c =to_mtk_dma_chan (chan); +unsigned long flags; +LIST_HEAD (head); + +if (atomic_read (&c->loopcnt) !=0 ) +wait_for_completion (&c->done); + +spin_lock_irqsave (&c->vc.lock, flags); +if (c->desc) { +mtk_dma_remove_virt_list (c->desc->vd.tx.cookie, &c->vc); +spin_unlock_irqrestore (&c->vc.lock, flags); + +mtk_dma_desc_free (&c->desc->vd);
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 760
Quoted 5 lines
drivers/dma/8250_mtk_dma.c new file +5
-0+ +spin_lock_irqsave (&c->vc.lock, flags); +if (!c->paused) { +list_del_init (&c->node); +mtk_dma_stop (c);I think split logic between descriptors recycle and channel stop would be good.
maybe. can i keep it?
Quoted 12 lines
drivers/dma/8250_mtk_dma.c line 766
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ } + } +vchan_get_all_descriptors (&c->vc, &head); +spin_unlock_irqrestore (&c->vc.lock, flags); + +vchan_dma_desc_free_list (&c->vc, &head);Can you tell more about the situation for
vc->desc_allocated,vc->desc_submittedandvc->desc_issuedwhen the function is being called ? Which list do the descriptors hardware is processing stay on?
wait_for_completion(&c->done), these parameters has list init.
Quoted 11 lines
drivers/dma/8250_mtk_dma.c line 775
Quoted 9 lines
drivers/dma/8250_mtk_dma.c new file +9
-0+ +return 0 ; +} + +static int mtk_dma_device_pause (struct dma_chan *chan) +{ +/* Pause/Resume only allowed with cyclic mode */ +return -EINVAL ; +}I guess we don't nodde to register the dumb pause handler
yes, just match dma engine. i can remove it.
Quoted 10 lines
drivers/dma/8250_mtk_dma.c line 781
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ +static int mtk_dma_device_resume (struct dma_chan *chan) +{ +/* Pause/Resume only allowed with cyclic mode */ +return -EINVAL ; +}I guess we don't nodde to register the dumb resume handler
yes, just match dma engine. i can remove it.
Quoted 5 lines
drivers/dma/8250_mtk_dma.c line 784
Quoted 3 lines
drivers/dma/8250_mtk_dma.c new file +3
-0+ +static int mtk_dma_chan_init (struct mtk_dmadev *mtkd) +{Directly span the function in the driver probe is good to know how many channels are request and how large size its memory being allocated.
ok. i can remove the function. and move the code to probe.
Quoted 17 lines
Quoted 5 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+struct mtk_chan *c; + + c =devm_kzalloc (mtkd->ddev.dev,sizeof (*c),GFP_KERNEL ); +if (!c)drivers/dma/8250_mtk_dma.c line 798
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+return -ENOMEM ; + + c->vc.desc_free = mtk_dma_desc_free; +vchan_init (&c->vc, &mtkd->ddev); +spin_lock_init (&c->lock); +INIT_LIST_HEAD (&c->node); + +init_completion (&c->done); +atomic_set (&c->loopcnt,0 ); +atomic_set (&c->entry,0 );I really don't like to magic atomic variable. It would make it's harder to track each descriptors usage either pending or active in the dma engine.
i see, but need to control the follow.
Quoted 42 lines
Quoted 5 lines
drivers/dma/8250_mtk_dma.c new file +4
-0+ +return 0 ; +} +drivers/dma/8250_mtk_dma.c line 812
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+static void mtk_dma_free (struct mtk_dmadev *mtkd) +{ +tasklet_kill (&mtkd->task); +while (list_empty (&mtkd->ddev.channels) ==0 ) { +struct mtk_chan *c =list_first_entry (&mtkd->ddev.channels, + struct mtk_chan, vc.chan.device_node); + +list_del (&c->vc.chan.device_node); +tasklet_kill (&c->vc.task); +devm_kfree (mtkd->ddev.dev, c);
devm_kfreeisn't be called explicitly in the driver, it would be taken care when driver is unloaded by the core.Quoted 24 lines
drivers/dma/8250_mtk_dma.c new file +24
-0+ } +} + +static const struct of_device_id mtk_uart_dma_match[] = { + { .compatible ="mediatek,mt6577-uart-dma" , }, + {/* sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, mtk_uart_dma_match); + +static int mtk_dma_probe (struct platform_device *pdev) +{ +struct mtk_dmadev *mtkd; +struct resource *res; +unsigned int i; +int rc; + + mtkd =devm_kzalloc (&pdev->dev,sizeof (*mtkd),GFP_KERNEL ); +if (!mtkd) +return -ENOMEM ; + +for (i =0 ; i <MTK_SDMA_CHANNELS ; i++) { + res =platform_get_resource (pdev,IORESOURCE_MEM , i); +if (!res) +return -ENODEV ;
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 842
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ mtkd->mem_base[i] =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (mtkd->mem_base[i])) +return PTR_ERR (mtkd->mem_base[i]); + } + +/* request irq */ remove the comment that is not identical to the implementation as below code snippet
ok, i will remove it.
Quoted 6 lines
drivers/dma/8250_mtk_dma.c line 845
Quoted 4 lines
drivers/dma/8250_mtk_dma.c new file +3
-0+for (i =0 ; i <MTK_SDMA_CHANNELS ; i++) { + mtkd->dma_irq[i] =platform_get_irq (pdev, i); +if ((int )mtkd->dma_irq[i] <0 ) {the cast seems not necessary
if device tree error, we can know what's err.
Quoted 30 lines
drivers/dma/8250_mtk_dma.c line 851
Quoted 7 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+dev_err (&pdev->dev,"failed to get IRQ[%d]\n" , i); +return -EINVAL ; + } + } + + mtkd->clk =devm_clk_get (&pdev->dev,NULL );assign a name to the "apdma" per the binding you adds
Quoted 20 lines
drivers/dma/8250_mtk_dma.c new file +20
-0+if (IS_ERR (mtkd->clk)) { +dev_err (&pdev->dev,"No clock specified\n" ); +return PTR_ERR (mtkd->clk); + } + +if (of_property_read_bool (pdev->dev.of_node,"dma-33bits" )) { +dev_info (&pdev->dev,"Support dma 33bits\n" ); + mtkd->support_33bits = true; + } + +if (mtkd->support_33bits) + rc =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (33 )); +else + rc =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 )); +if (rc) +return rc; + +dma_cap_set (DMA_SLAVE , mtkd->ddev.cap_mask); + mtkd->ddev.device_alloc_chan_resources = mtk_dma_alloc_chan_resources; + mtkd->ddev.device_free_chan_resources = mtk_dma_free_chan_resources;
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 877
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ mtkd->ddev.device_tx_status = mtk_dma_tx_status; + mtkd->ddev.device_issue_pending = mtk_dma_issue_pending; + mtkd->ddev.device_prep_slave_sg = mtk_dma_prep_slave_sg; + mtkd->ddev.device_config = mtk_dma_slave_config; + mtkd->ddev.device_pause = mtk_dma_device_pause; + mtkd->ddev.device_resume = mtk_dma_device_resume;Is it possible that we don't register pause and resume handler if the dma engine cannot support to?
ok, i will remove it
Quoted 10 lines
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +9
-0+ mtkd->ddev.device_terminate_all = mtk_dma_terminate_all; + mtkd->ddev.src_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_1_BYTE ); + mtkd->ddev.dst_addr_widths =BIT (DMA_SLAVE_BUSWIDTH_1_BYTE ); + mtkd->ddev.directions =BIT (DMA_DEV_TO_MEM ) |BIT (DMA_MEM_TO_DEV ); + mtkd->ddev.residue_granularity =DMA_RESIDUE_GRANULARITY_SEGMENT ; + mtkd->ddev.dev = &pdev->dev; +INIT_LIST_HEAD (&mtkd->ddev.channels); +INIT_LIST_HEAD (&mtkd->pending); +
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 892
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+spin_lock_init (&mtkd->lock); +tasklet_init (&mtkd->task, mtk_dma_sched, (unsigned long )mtkd); + + mtkd->dma_requests =MTK_SDMA_REQUESTS ; +if (of_property_read_u32 (pdev->dev.of_node, +"dma-requests" , &mtkd->dma_requests) !=0 ) {extra "! = 0" can be dropped in the condition check
ok, i will remove it.
Quoted 12 lines
Quoted 12 lines
drivers/dma/8250_mtk_dma.c new file +11
-0+dev_info (&pdev->dev, +"Missing dma-requests property, using %u.\n" , +MTK_SDMA_REQUESTS ); + } + +for (i =0 ; i <MTK_SDMA_CHANNELS ; i++) { + rc =mtk_dma_chan_init (mtkd); +if (rc) + goto err_no_dma; + } +
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 909
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+pm_runtime_enable (&pdev->dev); +pm_runtime_set_active (&pdev->dev); + + rc =dma_async_device_register (&mtkd->ddev); +if (rc) { +dev_warn (&pdev->dev,"fail to register DMA device: %d\n" , rc);drop the debug log
ok, i will remove it
Quoted 5 lines
drivers/dma/8250_mtk_dma.c
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +1
-0+mtk_dma_clk_disable (mtkd);move the undo jobs at the tail of the function to error handling clean
ok, i will modify
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 916
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+ goto err_no_dma; + } + +platform_set_drvdata (pdev, mtkd); + +if (pdev->dev.of_node) {you don't need that since all mtk drivers are dt based
you are right. for strict, i just suggest that keep it.
Quoted 11 lines
drivers/dma/8250_mtk_dma.c line 924
Quoted 9 lines
drivers/dma/8250_mtk_dma.c new file +8
-0+ mtk_dma_info.dma_cap = mtkd->ddev.cap_mask; + +/* Device-tree DMA controller registration */ + rc =of_dma_controller_register (pdev->dev.of_node, + of_dma_simple_xlate, + &mtk_dma_info); +if (rc) { +dev_warn (&pdev->dev,"fail to register DMA controller\n" );drop the debug log
ok, i will remove it.
Quoted 6 lines
drivers/dma/8250_mtk_dma.c
Quoted 3 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+dma_async_device_unregister (&mtkd->ddev); +mtk_dma_clk_disable (mtkd);move the undo jobs at the tail of the function to make error handling clean
Ok, i will modify it.
Quoted 18 lines
Quoted 18 lines
drivers/dma/8250_mtk_dma.c new file +18
-0+ goto err_no_dma; + } + } + +return rc; + +err_no_dma: +mtk_dma_free (mtkd); +return rc; +} + +static int mtk_dma_remove (struct platform_device *pdev) +{ +struct mtk_dmadev *mtkd =platform_get_drvdata (pdev); + +if (pdev->dev.of_node) +of_dma_controller_free (pdev->dev.of_node); +
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 950
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+pm_runtime_disable (&pdev->dev); +pm_runtime_put_noidle (&pdev->dev); + +dma_async_device_unregister (&mtkd->ddev); + +mtk_dma_free (mtkd);Extra task in the remove handler is needed to add here such as ensure that VC tasks being killed, disable hardware and its interrupts and wait for pending ISRs task all done.
before the function, terminate all function will be called, i remember. in terminate_all function, do this.
Quoted 19 lines
Quoted 19 lines
drivers/dma/8250_mtk_dma.c new file +18
-0+ +return 0 ; +} + +#ifdef CONFIG_PM_SLEEP +static int mtk_dma_suspend (struct device *dev) +{ +struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + +if (!pm_runtime_suspended (dev)) +mtk_dma_clk_disable (mtkd); + +return 0 ; +} + +static int mtk_dma_resume (struct device *dev) +{ +int ret;
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 974
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + +if (!pm_runtime_suspended (dev)) { + ret =mtk_dma_clk_enable (mtkd); +if (ret) { +dev_info (dev,"fail to enable clk: %d\n" , ret);get rid of the debug message
ok, i will remove it.
Quoted 18 lines
Quoted 18 lines
drivers/dma/8250_mtk_dma.c new file +18
-0+return ret; + } + } + +return 0 ; +} + +static int mtk_dma_runtime_suspend (struct device *dev) +{ +struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + +mtk_dma_clk_disable (mtkd); + +return 0 ; +} + +static int mtk_dma_runtime_resume (struct device *dev) +{
Quoted 9 lines
drivers/dma/8250_mtk_dma.c line 998
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+int ret; +struct mtk_dmadev *mtkd =dev_get_drvdata (dev); + + ret =mtk_dma_clk_enable (mtkd); +if (ret) { +dev_warn (dev,"fail to enable clk: %d\n" , ret);get rid of the debug message
ok, i will remove it.
Quoted 10 lines
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ return ret; + } + +return 0 ; +} + +#endif /* CONFIG_PM_SLEEP */ + +static const struct dev_pm_ops mtk_dma_pm_ops = { +SET_SYSTEM_SLEEP_PM_OPS (mtk_dma_suspend, mtk_dma_resume)
Quoted 8 lines
drivers/dma/8250_mtk_dma.c line 1014
Quoted 6 lines
drivers/dma/8250_mtk_dma.c new file +6
-0+SET_RUNTIME_PM_OPS (mtk_dma_runtime_suspend, + mtk_dma_runtime_resume,NULL ) +}; + +static struct platform_driver mtk_dma_driver = { + .probe = mtk_dma_probe,
mtk_apdma_uart_probe? I guess apdma is a real name for the dma engine
yes. i can modify it.
Quoted 4 lines
drivers/dma/8250_mtk_dma.c line 1015
Quoted 2 lines
drivers/dma/8250_mtk_dma.c new file +1
-0+ .remove = mtk_dma_remove,
mtk_apdma_uart_remove? same reason as the above
yes. i can modify it.
Quoted 6 lines
drivers/dma/8250_mtk_dma.c line 1017
Quoted 3 lines
drivers/dma/8250_mtk_dma.c new file +2
-0+ .driver = { + .name = "8250-mtk-dma",.name =
KBUILD_MODNAME,
OK, i will modify it.
Quoted 23 lines
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+ .pm = &mtk_dma_pm_ops, + .of_match_table = of_match_ptr(mtk_uart_dma_match), + }, +}; + +static bool mtk_dma_filter_fn (struct dma_chan *chan,void *param) +{ +if (chan->device->dev->driver == &mtk_dma_driver.driver) { +struct mtk_dmadev *mtkd =to_mtk_dma_dev (chan->device); +struct mtk_chan *c =to_mtk_dma_chan (chan);drivers/dma/8250_mtk_dma.c line 1037
Quoted 10 lines
drivers/dma/8250_mtk_dma.c new file +10
-0+unsigned int req = *(unsigned int *)param; + +if (req <= mtkd->dma_requests) { + c->dma_sig = req; + c->dma_ch = req; +return true; + } + } +return false; +}I really wonder if the filter fn is necessary stuff made here but I am not fully sure.
Quoted 1 line
Can you look into more about
of_dma_controller_registerand its usage to see if the generic call satisfies your need?
i will the function record the dma channel.
Quoted 16 lines
drivers/dma/8250_mtk_dma.c line 1049
Quoted 13 lines
drivers/dma/8250_mtk_dma.c new file +12
-0+ +static int mtk_dma_init (void ) +{ +return platform_driver_register (&mtk_dma_driver); +} +subsys_initcall (mtk_dma_init); + +static void __exit mtk_dma_exit(void) +{ +platform_driver_unregister (&mtk_dma_driver); +} +module_exit (mtk_dma_exit);Use
module_platform_driverinstead and then add more information for the module such asMODULE_DESCRIPTION,MODULE_AUTHOR,MODULE_LICENSE.
ok, i will modify it.
Quoted 25 lines
Quoted 25 lines
drivers/dma/Kconfig +11
-0@@ -151,6 +151,17 @@ config DMA_JZ4780 If you have a board based on such a SoC and wish to use DMA for devices which can use the DMA controller, say Y or M here. +config DMA_MTK_UART + tristate "MediaTek SoCs APDMA support for UART" + depends on OF + select DMA_ENGINE + select DMA_VIRTUAL_CHANNELS + help + Support for the UART DMA engine found on MediaTek MTK SoCs. + when 8250 mtk uart is enabled, and if you want to using DMA, + you can enable the config. the DMA engine just only be used + with MediaTek Socs. + config DMA_SA11X0 tristate "SA-11x0 DMA support" depends on ARCH_SA1100 || COMPILE_TESTdrivers/dma/Makefile +0
-1--- a/drivers/dma/Makefile
Quoted 9 lines
drivers/dma/Makefile obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o · line 27
Quoted 6 lines
+++ b/drivers/dma/Makefile
drivers/dma/Makefile +1
-0@@ -24,6 +24,7 @@ obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o obj-$(CONFIG_DMA_BCM2835) += bcm2835-dma.o obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o obj-$(CONFIG_DMA_JZ4780) += dma-jz4780.o +obj-$(CONFIG_DMA_MTK_UART) += 8250_mtk_dma.omove
Makefileupdate todrivers/dma/mediatek
OK. i will modify it.
Quoted 5 lines
Quoted 3 lines
drivers/dma/Makefile +0
-0obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o obj-$(CONFIG_DMA_SUN4I) += sun4i-dma.o obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o
PATCH 3/4 serial: 8250-mtk: add uart DMA support
In reply to Long ChengModify uart register to support DMA function.
--- drivers/tty/serial/8250/8250_mtk.c | 211 +++++++++++++++++++++++++++++++++++- 1 file changed, 210 insertions(+), 1 deletion(-)
drivers/tty/serial/8250/8250_mtk.c +210 -1
@@ -14,6 +14,10 @@#include <linux/pm_runtime.h> #include <linux/serial_8250.h> #include <linux/serial_reg.h> +#include <linux/console.h> +#include <linux/dma-mapping.h> +#include <linux/tty.h> +#include <linux/tty_flip.h> #include "8250.h"
@@ -22,12 +26,173 @@#define UART_MTK_SAMPLE_POINT 0x0b/* Sample point register */ #define MTK_UART_RATE_FIX 0x0d/* UART Rate Fix Register */ +#define MTK_UART_DMA_EN 0x13/* DMA Enable register */ +#define MTK_UART_DMA_EN_TX 0x2 +#define MTK_UART_DMA_EN_RX 0x5 + +#define MTK_UART_TX_SIZE UART_XMIT_SIZE +#define MTK_UART_RX_SIZE 0x8000 +#define MTK_UART_TX_TRIGGER 1 +#define MTK_UART_RX_TRIGGER MTK_UART_RX_SIZE + +#ifdef CONFIG_SERIAL_8250_DMA +enum dma_rx_status { +DMA_RX_START =0 , +DMA_RX_RUNNING =1 , +DMA_RX_SHUTDOWN =2 , +}; +#endif +struct mtk8250_data {int line; +unsigned int rx_pos;struct clk *uart_clk;struct clk *bus_clk; +struct uart_8250_dma *dma; +#ifdef CONFIG_SERIAL_8250_DMA +enum dma_rx_status rx_status; +#endif }; +#ifdef CONFIG_SERIAL_8250_DMA +static void mtk8250_rx_dma (struct uart_8250_port *up); + +static void mtk8250_dma_rx_complete (void *param) +{ +struct uart_8250_port *up = param; +struct uart_8250_dma *dma = up->dma; +struct mtk8250_data *data = up->port.private_data; +struct tty_port *tty_port = &up->port.state->port; +struct dma_tx_state state; +unsigned char *ptr; +int copied; + +dma_sync_single_for_cpu (dma->rxchan->device->dev, dma->rx_addr, + dma->rx_size,DMA_FROM_DEVICE ); + +dmaengine_tx_status (dma->rxchan, dma->rx_cookie, &state); +dmaengine_terminate_all (dma->rxchan); + +if (data->rx_status ==DMA_RX_SHUTDOWN ) +return ; + +if ((data->rx_pos + state.residue) <= dma->rx_size) { + ptr = (unsigned char *)(data->rx_pos + dma->rx_buf); + copied =tty_insert_flip_string (tty_port, ptr, state.residue); + }else { + ptr = (unsigned char *)(data->rx_pos + dma->rx_buf); + copied =tty_insert_flip_string (tty_port, ptr, + dma->rx_size - data->rx_pos); + ptr = (unsigned char *)(dma->rx_buf); + copied +=tty_insert_flip_string (tty_port, ptr, + data->rx_pos + state.residue - dma->rx_size); + } + up->port.icount.rx += copied; + +tty_flip_buffer_push (tty_port); + +mtk8250_rx_dma (up); +} + +static void mtk8250_rx_dma (struct uart_8250_port *up) +{ +struct uart_8250_dma *dma = up->dma; +struct mtk8250_data *data = up->port.private_data; +struct dma_async_tx_descriptor *desc; +struct dma_tx_state state; + + desc =dmaengine_prep_slave_single (dma->rxchan, dma->rx_addr, + dma->rx_size,DMA_DEV_TO_MEM , +DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); +if (!desc) { +pr_err ("failed to prepare rx slave single\n" ); +return ; + } + + desc->callback = mtk8250_dma_rx_complete; + desc->callback_param = up; + + dma->rx_cookie =dmaengine_submit (desc); + +dmaengine_tx_status (dma->rxchan, dma->rx_cookie, &state); + data->rx_pos = state.residue; + +dma_sync_single_for_device (dma->rxchan->device->dev, dma->rx_addr, + dma->rx_size,DMA_FROM_DEVICE ); + +dma_async_issue_pending (dma->rxchan); +} + +static void mtk8250_dma_enable (struct uart_8250_port *up) +{ +struct uart_8250_dma *dma = up->dma; +struct mtk8250_data *data = up->port.private_data; +int lcr =serial_in (up,UART_LCR ); + +if (data->rx_status !=DMA_RX_START ) +return ; + + dma->rxconf.direction =DMA_DEV_TO_MEM ; + dma->rxconf.src_addr_width = dma->rx_size /1024 ; + dma->rxconf.src_addr = dma->rx_addr; + + dma->txconf.direction =DMA_MEM_TO_DEV ; + dma->txconf.dst_addr_width =MTK_UART_TX_SIZE /1024 ; + dma->txconf.dst_addr = dma->tx_addr; + +serial_out (up,UART_FCR ,UART_FCR_ENABLE_FIFO |UART_FCR_CLEAR_RCVR | +UART_FCR_CLEAR_XMIT ); +serial_out (up,MTK_UART_DMA_EN , +MTK_UART_DMA_EN_RX |MTK_UART_DMA_EN_TX ); + +serial_out (up,UART_LCR ,UART_LCR_CONF_MODE_B ); +serial_out (up,UART_EFR ,UART_EFR_ECB ); +serial_out (up,UART_LCR , lcr); + +if (dmaengine_slave_config (dma->rxchan, &dma->rxconf) !=0 ) +pr_err ("failed to configure rx dma channel\n" ); +if (dmaengine_slave_config (dma->txchan, &dma->txconf) !=0 ) +pr_err ("failed to configure tx dma channel\n" ); + + data->rx_status =DMA_RX_RUNNING ; + data->rx_pos =0 ; +mtk8250_rx_dma (up); +} +#endif + +static int mtk8250_startup (struct uart_port *port) +{ +#ifdef CONFIG_SERIAL_8250_DMA +struct uart_8250_port *up =up_to_u8250p (port); +struct mtk8250_data *data = port->private_data; + +/* disable DMA for console */ +if (uart_console (port)) + up->dma =NULL ; + +if (up->dma) { + data->rx_status =DMA_RX_START ; +uart_circ_clear (&port->state->xmit); + } +#endif +memset (&port->icount,0 ,sizeof (port->icount)); + +return serial8250_do_startup (port); +} + +static void mtk8250_shutdown (struct uart_port *port) +{ +#ifdef CONFIG_SERIAL_8250_DMA +struct uart_8250_port *up =up_to_u8250p (port); +struct mtk8250_data *data = port->private_data; + +if (up->dma) + data->rx_status =DMA_RX_SHUTDOWN ; +#endif + +return serial8250_do_shutdown (port); +} +static void mtk8250_set_termios (struct uart_port *port,struct ktermios *termios,struct ktermios *old)
@@ -36,6 +201,17 @@ struct mtk8250_data {unsigned long flags;unsigned int baud, quot; +#ifdef CONFIG_SERIAL_8250_DMA +if (up->dma) { +if (uart_console (port)) { +devm_kfree (up->port.dev, up->dma); + up->dma =NULL ; + }else { +mtk8250_dma_enable (up); + } + } +#endif +serial8250_do_set_termios (port, termios, old);/*
@@ -143,9 +319,20 @@ static int __maybe_unused mtk8250_runtime_resume(struct device *dev)pm_runtime_put_sync_suspend (port->dev); } +#ifdef CONFIG_SERIAL_8250_DMA +static bool mtk8250_dma_filter (struct dma_chan *chan,void *param) +{ +return false; +} +#endif +static int mtk8250_probe_of (struct platform_device *pdev,struct uart_port *p,struct mtk8250_data *data) { +#ifdef CONFIG_SERIAL_8250_DMA +int dmacnt; +#endif + data->uart_clk =devm_clk_get (&pdev->dev,"baud" );if (IS_ERR (data->uart_clk)) {/*
@@ -162,7 +349,23 @@ static int mtk8250_probe_of(struct platform_device *pdev, struct uart_port *p, } data->bus_clk =devm_clk_get (&pdev->dev,"bus" ); -return PTR_ERR_OR_ZERO (data->bus_clk); +if (IS_ERR (data->bus_clk)) +return PTR_ERR (data->bus_clk); + + data->dma =NULL ; +#ifdef CONFIG_SERIAL_8250_DMA + dmacnt =of_property_count_strings (pdev->dev.of_node,"dma-names" ); +if (dmacnt ==2 ) { + data->dma =devm_kzalloc (&pdev->dev,sizeof (*data->dma), +GFP_KERNEL ); + data->dma->fn = mtk8250_dma_filter; + data->dma->rx_size =MTK_UART_RX_SIZE ; + data->dma->rxconf.src_maxburst =MTK_UART_RX_TRIGGER ; + data->dma->txconf.dst_maxburst =MTK_UART_TX_TRIGGER ; + } +#endif + +return 0 ; }static int mtk8250_probe (struct platform_device *pdev)
@@ -204,8 +407,14 @@ static int mtk8250_probe(struct platform_device *pdev) uart.port.iotype =UPIO_MEM32 ; uart.port.regshift =2 ; uart.port.private_data = data; + uart.port.shutdown = mtk8250_shutdown; + uart.port.startup = mtk8250_startup; uart.port.set_termios = mtk8250_set_termios; uart.port.uartclk =clk_get_rate (data->uart_clk); +#ifdef CONFIG_SERIAL_8250_DMA +if (data->dma) + uart.dma = data->dma; +#endif /* Disable Rate Fix function */ writel(0x0, uart.port.membase +
PATCH 4/4 arm: dts: mt2701: add uart APDMA to device tree
In reply to Long Cheng1. add uart APDMA controller device node
2. add uart 0/1/2/3 DMA function
3. uart0 is console, So disable DMA
4. enable uart2 port to test DMA function.
--- arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 50 +++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
arch/arm64/boot/dts/mediatek/mt2712e.dtsi +50 -0
@@ -299,6 +299,9 @@ interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_LOW>; clocks = <&baud_clk>, <&sys_clk>; clock-names = "baud", "bus"; + dmas = <&apdma 10 + &apdma 11>; + dma-names = "tx", "rx"; status = "disabled"; };
@@ -366,6 +369,38 @@ status = "disabled"; }; + apdma: dma-controller@11000400 { + compatible = "mediatek,mt2712-uart-dma", + "mediatek,mt6577-uart-dma"; + reg = <0 0x11000400 0 0x80>, + <0 0x11000480 0 0x80>, + <0 0x11000500 0 0x80>, + <0 0x11000580 0 0x80>, + <0 0x11000600 0 0x80>, + <0 0x11000680 0 0x80>, + <0 0x11000700 0 0x80>, + <0 0x11000780 0 0x80>, + <0 0x11000800 0 0x80>, + <0 0x11000880 0 0x80>, + <0 0x11000900 0 0x80>, + <0 0x11000980 0 0x80>; + interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 104 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 105 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 106 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 107 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 108 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 109 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 110 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 111 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 112 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 113 IRQ_TYPE_LEVEL_LOW>, + <GIC_SPI 114 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_AP_DMA>; + clock-names = "apdma"; + #dma-cells = <1>; + }; + uart0: serial@11002000 { compatible = "mediatek,mt2712-uart", "mediatek,mt6577-uart";
@@ -373,6 +408,9 @@ interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_LOW>; clocks = <&baud_clk>, <&sys_clk>; clock-names = "baud", "bus"; + dmas = <&apdma 0 + &apdma 1>; + dma-names = "tx", "rx"; status = "disabled"; };
@@ -383,6 +421,9 @@ interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_LOW>; clocks = <&baud_clk>, <&sys_clk>; clock-names = "baud", "bus"; + dmas = <&apdma 2 + &apdma 3>; + dma-names = "tx", "rx"; status = "disabled"; };
@@ -393,6 +434,9 @@ interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_LOW>; clocks = <&baud_clk>, <&sys_clk>; clock-names = "baud", "bus"; + dmas = <&apdma 4 + &apdma 5>; + dma-names = "tx", "rx"; status = "disabled"; };
@@ -403,6 +447,9 @@ interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_LOW>; clocks = <&baud_clk>, <&sys_clk>; clock-names = "baud", "bus"; + dmas = <&apdma 6 + &apdma 7>; + dma-names = "tx", "rx"; status = "disabled"; };
@@ -503,6 +550,9 @@ interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_LOW>; clocks = <&baud_clk>, <&sys_clk>; clock-names = "baud", "bus"; + dmas = <&apdma 8 + &apdma 9>; + dma-names = "tx", "rx"; status = "disabled"; };