Enable designware PCI EP EDMA locally
Subsystems (4)
v5 cover Enable designware PCI EP EDMA locally
Default Designware EDMA just probe remotely at host side. This patch allow EDMA driver can probe at EP side.
1. Clean up patch
dmaengine: dw-edma: Detach the private data and chip info structures
dmaengine: dw-edma: remove unused field irq in struct dw_edma_chip
dmaengine: dw-edma: change rg_region to reg_base in struct
dmaengine: dw-edma: rename wr(rd)_ch_cnt to ll_wr(rd)_cnt in struct
2. Enhance EDMA driver to allow prode eDMA at EP side
dmaengine: dw-edma: Add support for chip specific flags
dmaengine: dw-edma: Add DW_EDMA_CHIP_32BIT_DBI for chip specific flags
3. Bugs fix at EDMA driver when probe eDMA at EP side
dmaengine: dw-edma: Fix programming the source & dest addresses for ep
dmaengine: dw-edma: Don't rely on the deprecated "direction" member
4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: functions/pci-epf-test: Support PCI controller DMA
5. Using imx8dxl to do test, but some EP functions still have not upstream yet. So below patch show how probe eDMA driver at EP controller driver.
https://lore.kernel.org/linux-pci/20220309120149.GB134091@thinkpad/T/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097
Frank Li (7):
dmaengine: dw-edma: Detach the private data and chip info structures
dmaengine: dw-edma: remove unused field irq in struct dw_edma_chip
dmaengine: dw-edma: change rg_region to reg_base in struct
dw_edma_chip
dmaengine: dw-edma: rename wr(rd)_ch_cnt to ll_wr(rd)_cnt in struct
dw_edma_chip
dmaengine: dw-edma: Add support for chip specific flags
dmaengine: dw-edma: Add DW_EDMA_CHIP_32BIT_DBI for chip specific flags
PCI: endpoint: functions/pci-epf-test: Support PCI controller DMA
Manivannan Sadhasivam (2):
dmaengine: dw-edma: Fix programming the source & dest addresses for ep
dmaengine: dw-edma: Don't rely on the deprecated "direction" member
drivers/dma/dw-edma/dw-edma-core.c | 131 +++++++++++------- drivers/dma/dw-edma/dw-edma-core.h | 32 +---- drivers/dma/dw-edma/dw-edma-pcie.c | 83 +++++------ drivers/dma/dw-edma/dw-edma-v0-core.c | 46 +++--- drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 10 +- drivers/pci/endpoint/functions/pci-epf-test.c | 108 +++++++++++++-- include/linux/dma/edma.h | 56 +++++++- 7 files changed, 298 insertions(+), 168 deletions(-)
Signature · 1 line
2.24.0.rc1
PATCH v5 1/9 dmaengine: dw-edma: Detach the private data and chip info structures
"struct dw_edma_chip" contains an internal structure "struct dw_edma" that is used by the eDMA core internally. This structure should not be touched by the eDMA controller drivers themselves. But currently, the eDMA controller drivers like "dw-edma-pci" allocates and populates this internal structure then passes it on to eDMA core. The eDMA core further populates the structure and uses it. This is wrong!
Hence, move all the "struct dw_edma" specifics from controller drivers to the eDMA core.
---
Change from v4 to v5
- Move chip->nr_irqs before allocate dw_edma
Change from v3 to v4
- Accept most suggestions of Serge Semin
Change from v2 to v3
- none
Change from v1 to v2
- rework commit message
- remove duplicate field in struct dw_edma
drivers/dma/dw-edma/dw-edma-core.c | 82 +++++++++++++----------- drivers/dma/dw-edma/dw-edma-core.h | 32 +-------- drivers/dma/dw-edma/dw-edma-pcie.c | 82 ++++++++++-------------- drivers/dma/dw-edma/dw-edma-v0-core.c | 24 +++---- drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 10 +-- include/linux/dma/edma.h | 44 +++++++++++++ 6 files changed, 143 insertions(+), 131 deletions(-)
drivers/dma/dw-edma/dw-edma-core.c +45 -37
@@ -65,7 +65,7 @@ static struct dw_edma_burst *dw_edma_alloc_burst(struct dw_edma_chunk *chunk)static struct dw_edma_chunk *dw_edma_alloc_chunk (struct dw_edma_desc *desc) {struct dw_edma_chan *chan = desc->chan; -struct dw_edma *dw = chan->chip->dw; +struct dw_edma_chip *chip = chan->dw->chip;struct dw_edma_chunk *chunk; chunk =kzalloc (sizeof (*chunk),GFP_NOWAIT );
@@ -82,11 +82,11 @@ static struct dw_edma_chunk *dw_edma_alloc_chunk(struct dw_edma_desc *desc)*/ chunk->cb = !(desc->chunks_alloc %2 );if (chan->dir ==EDMA_DIR_WRITE ) { - chunk->ll_region.paddr = dw->ll_region_wr[chan->id].paddr; - chunk->ll_region.vaddr = dw->ll_region_wr[chan->id].vaddr; + chunk->ll_region.paddr = chip->ll_region_wr[chan->id].paddr; + chunk->ll_region.vaddr = chip->ll_region_wr[chan->id].vaddr; }else { - chunk->ll_region.paddr = dw->ll_region_rd[chan->id].paddr; - chunk->ll_region.vaddr = dw->ll_region_rd[chan->id].vaddr; + chunk->ll_region.paddr = chip->ll_region_rd[chan->id].paddr; + chunk->ll_region.vaddr = chip->ll_region_rd[chan->id].vaddr; }if (desc->chunk) {
@@ -664,7 +664,7 @@ static int dw_edma_alloc_chan_resources(struct dma_chan *dchan)if (chan->status !=EDMA_ST_IDLE )return -EBUSY ; -pm_runtime_get (chan->chip->dev); +pm_runtime_get (chan->dw->chip->dev);return 0 ; }
@@ -686,7 +686,7 @@ static void dw_edma_free_chan_resources(struct dma_chan *dchan)cpu_relax (); } -pm_runtime_put (chan->chip->dev); +pm_runtime_put (chan->dw->chip->dev); } static int dw_edma_channel_setup(struct dw_edma_chip *chip, bool write,
@@ -718,7 +718,7 @@ static int dw_edma_channel_setup(struct dw_edma_chip *chip, bool write, }INIT_LIST_HEAD (&dma->channels); -for (j =0 ; (alloc || dw->nr_irqs ==1 ) && j < cnt; j++, i++) { +for (j =0 ; (alloc || chip->nr_irqs ==1 ) && j < cnt; j++, i++) { chan = &dw->chan[i]; dt_region =devm_kzalloc (dev,sizeof (*dt_region),GFP_KERNEL );
@@ -727,7 +727,7 @@ static int dw_edma_channel_setup(struct dw_edma_chip *chip, bool write, chan->vc.chan.private = dt_region; - chan->chip = chip; + chan->dw = dw; chan->id = j; chan->dir = write ?EDMA_DIR_WRITE :EDMA_DIR_READ ; chan->configured = false;
@@ -735,15 +735,15 @@ static int dw_edma_channel_setup(struct dw_edma_chip *chip, bool write, chan->status =EDMA_ST_IDLE ;if (write) - chan->ll_max = (dw->ll_region_wr[j].sz /EDMA_LL_SZ ); + chan->ll_max = (chip->ll_region_wr[j].sz /EDMA_LL_SZ );else - chan->ll_max = (dw->ll_region_rd[j].sz /EDMA_LL_SZ ); + chan->ll_max = (chip->ll_region_rd[j].sz /EDMA_LL_SZ ); chan->ll_max -=1 ;dev_vdbg (dev,"L. List:\tChannel %s[%u] max_cnt=%u\n" , write ?"write" :"read" , j, chan->ll_max); -if (dw->nr_irqs ==1 ) +if (chip->nr_irqs ==1 ) pos =0 ;else pos = off_alloc + (j % alloc);
@@ -767,13 +767,13 @@ static int dw_edma_channel_setup(struct dw_edma_chip *chip, bool write,vchan_init (&chan->vc, dma);if (write) { - dt_region->paddr = dw->dt_region_wr[j].paddr; - dt_region->vaddr = dw->dt_region_wr[j].vaddr; - dt_region->sz = dw->dt_region_wr[j].sz; + dt_region->paddr = chip->dt_region_wr[j].paddr; + dt_region->vaddr = chip->dt_region_wr[j].vaddr; + dt_region->sz = chip->dt_region_wr[j].sz; }else { - dt_region->paddr = dw->dt_region_rd[j].paddr; - dt_region->vaddr = dw->dt_region_rd[j].vaddr; - dt_region->sz = dw->dt_region_rd[j].sz; + dt_region->paddr = chip->dt_region_rd[j].paddr; + dt_region->vaddr = chip->dt_region_rd[j].vaddr; + dt_region->sz = chip->dt_region_rd[j].sz; }dw_edma_v0_core_device_config (chan);
@@ -840,16 +840,16 @@ static int dw_edma_irq_request(struct dw_edma_chip *chip, ch_cnt = dw->wr_ch_cnt + dw->rd_ch_cnt; -if (dw->nr_irqs <1 ) +if (chip->nr_irqs <1 )return -EINVAL ; -if (dw->nr_irqs ==1 ) { +if (chip->nr_irqs ==1 ) {/* Common IRQ shared among all channels */ - irq = dw->ops->irq_vector (dev,0 ); + irq = chip->ops->irq_vector (dev,0 ); err =request_irq (irq, dw_edma_interrupt_common,IRQF_SHARED , dw->name, &dw->irq[0 ]);if (err) { - dw->nr_irqs =0 ; + chip->nr_irqs =0 ;return err; }
@@ -857,7 +857,7 @@ static int dw_edma_irq_request(struct dw_edma_chip *chip,get_cached_msi_msg (irq, &dw->irq[0 ].msi); }else {/* Distribute IRQs equally among all channels */ -int tmp = dw->nr_irqs; +int tmp = chip->nr_irqs;while (tmp && (*wr_alloc + *rd_alloc) < ch_cnt) {dw_edma_dec_irq_alloc (&tmp, wr_alloc, dw->wr_ch_cnt);
@@ -868,7 +868,7 @@ static int dw_edma_irq_request(struct dw_edma_chip *chip,dw_edma_add_irq_mask (&rd_mask, *rd_alloc, dw->rd_ch_cnt);for (i =0 ; i < (*wr_alloc + *rd_alloc); i++) { - irq = dw->ops->irq_vector (dev, i); + irq = chip->ops->irq_vector (dev, i); err = request_irq(irq, i < *wr_alloc ? dw_edma_interrupt_write :
@@ -876,7 +876,7 @@ static int dw_edma_irq_request(struct dw_edma_chip *chip,IRQF_SHARED , dw->name, &dw->irq[i]);if (err) { - dw->nr_irqs = i; + chip->nr_irqs = i;return err; }
@@ -884,7 +884,7 @@ static int dw_edma_irq_request(struct dw_edma_chip *chip,get_cached_msi_msg (irq, &dw->irq[i].msi); } - dw->nr_irqs = i; + chip->nr_irqs = i; }return err;
@@ -902,20 +902,24 @@ int dw_edma_probe(struct dw_edma_chip *chip)return -EINVAL ; dev = chip->dev; -if (!dev) +if (!dev || !chip->nr_irqs || !chip->ops)return -EINVAL ; - dw = chip->dw; -if (!dw || !dw->irq || !dw->ops || !dw->ops->irq_vector) -return -EINVAL ; + dw =devm_kzalloc (dev,sizeof (*dw),GFP_KERNEL ); +if (!dw) +return -ENOMEM ; + + chip->dw = dw; + dw->chip = chip;raw_spin_lock_init (&dw->lock); - dw->wr_ch_cnt =min_t (u16, dw->wr_ch_cnt, + + dw->wr_ch_cnt =min_t (u16, chip->wr_ch_cnt,dw_edma_v0_core_ch_count (dw,EDMA_DIR_WRITE )); dw->wr_ch_cnt =min_t (u16, dw->wr_ch_cnt,EDMA_MAX_WR_CH ); - dw->rd_ch_cnt =min_t (u16, dw->rd_ch_cnt, + dw->rd_ch_cnt =min_t (u16, chip->rd_ch_cnt,dw_edma_v0_core_ch_count (dw,EDMA_DIR_READ )); dw->rd_ch_cnt =min_t (u16, dw->rd_ch_cnt,EDMA_MAX_RD_CH );
@@ -936,6 +940,10 @@ int dw_edma_probe(struct dw_edma_chip *chip)/* Disable eDMA, only to establish the ideal initial conditions */ dw_edma_v0_core_off (dw); + dw->irq =devm_kcalloc (dev, chip->nr_irqs,sizeof (*dw->irq),GFP_KERNEL ); +if (!dw->irq) +return -ENOMEM ; +/* Request IRQs */ err =dw_edma_irq_request (chip, &wr_alloc, &rd_alloc);if (err)
@@ -960,10 +968,10 @@ int dw_edma_probe(struct dw_edma_chip *chip)return 0 ; err_irq_free: -for (i = (dw->nr_irqs -1 ); i >=0 ; i--) -free_irq (dw->ops->irq_vector (dev, i), &dw->irq[i]); +for (i = (chip->nr_irqs -1 ); i >=0 ; i--) +free_irq (chip->ops->irq_vector (dev, i), &dw->irq[i]); - dw->nr_irqs =0 ; + chip->nr_irqs =0 ;return err; }
@@ -980,8 +988,8 @@ int dw_edma_remove(struct dw_edma_chip *chip)dw_edma_v0_core_off (dw);/* Free irqs */ -for (i = (dw->nr_irqs -1 ); i >=0 ; i--) -free_irq (dw->ops->irq_vector (dev, i), &dw->irq[i]); +for (i = (chip->nr_irqs -1 ); i >=0 ; i--) +free_irq (chip->ops->irq_vector (dev, i), &dw->irq[i]);/* Power management */ pm_runtime_disable (dev);
drivers/dma/dw-edma/dw-edma-core.h +3 -29
@@ -15,20 +15,12 @@#include "../virt-dma.h" #define EDMA_LL_SZ 24 -#define EDMA_MAX_WR_CH 8 -#define EDMA_MAX_RD_CH 8enum dw_edma_dir {EDMA_DIR_WRITE =0 ,EDMA_DIR_READ }; -enum dw_edma_map_format { -EDMA_MF_EDMA_LEGACY =0x0 , -EDMA_MF_EDMA_UNROLL =0x1 , -EDMA_MF_HDMA_COMPAT =0x5 -}; -enum dw_edma_request {EDMA_REQ_NONE =0 ,EDMA_REQ_STOP ,
@@ -57,12 +49,6 @@ struct dw_edma_burst {u32 sz; }; -struct dw_edma_region { -phys_addr_t paddr; -void __iomem *vaddr; -size_t sz; -}; -struct dw_edma_chunk {struct list_head list;struct dw_edma_chan *chan;
@@ -87,7 +73,7 @@ struct dw_edma_desc {struct dw_edma_chan {struct virt_dma_chan vc; -struct dw_edma_chip *chip; +struct dw_edma *dw;int id;enum dw_edma_dir dir;
@@ -109,10 +95,6 @@ struct dw_edma_irq {struct dw_edma *dw; }; -struct dw_edma_core_ops { -int (*irq_vector)(struct device *dev,unsigned int nr); -}; -struct dw_edma {char name[20 ];
@@ -122,21 +104,13 @@ struct dw_edma {struct dma_device rd_edma;u16 rd_ch_cnt; -struct dw_edma_region rg_region;/* Registers */ -struct dw_edma_region ll_region_wr[EDMA_MAX_WR_CH ]; -struct dw_edma_region ll_region_rd[EDMA_MAX_RD_CH ]; -struct dw_edma_region dt_region_wr[EDMA_MAX_WR_CH ]; -struct dw_edma_region dt_region_rd[EDMA_MAX_RD_CH ]; -struct dw_edma_irq *irq; -int nr_irqs; - -enum dw_edma_map_format mf;struct dw_edma_chan *chan; -const struct dw_edma_core_ops *ops;raw_spinlock_t lock;/* Only for legacy */ + +struct dw_edma_chip *chip;#ifdef CONFIG_DEBUG_FS struct dentry *debugfs;#endif /* CONFIG_DEBUG_FS */
drivers/dma/dw-edma/dw-edma-pcie.c +34 -48
144 lines not on this page · raw message
drivers/dma/dw-edma/dw-edma-v0-core.c +12 -12
@@ -25,7 +25,7 @@ enum dw_edma_control {static inline struct dw_edma_v0_regs __iomem *__dw_regs (struct dw_edma *dw) { -return dw->rg_region.vaddr; +return dw->chip->rg_region.vaddr; }#define SET_32 (dw, name, value) \
@@ -96,7 +96,7 @@ static inline struct dw_edma_v0_regs __iomem *__dw_regs(struct dw_edma *dw)static inline struct dw_edma_v0_ch_regs __iomem *__dw_ch_regs (struct dw_edma *dw,enum dw_edma_dir dir,u16 ch) { -if (dw->mf ==EDMA_MF_EDMA_LEGACY ) +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY )return &(__dw_regs (dw)->type.legacy.ch);if (dir ==EDMA_DIR_WRITE )
@@ -108,7 +108,7 @@ __dw_ch_regs(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch)static inline void writel_ch (struct dw_edma *dw,enum dw_edma_dir dir,u16 ch,u32 value,void __iomem *addr) { -if (dw->mf ==EDMA_MF_EDMA_LEGACY ) { +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY ) {u32 viewport_sel;unsigned long flags;
@@ -133,7 +133,7 @@ static inline u32 readl_ch(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch, {u32 value; -if (dw->mf ==EDMA_MF_EDMA_LEGACY ) { +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY ) {u32 viewport_sel;unsigned long flags;
@@ -169,7 +169,7 @@ static inline u32 readl_ch(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch,static inline void writeq_ch (struct dw_edma *dw,enum dw_edma_dir dir,u16 ch,u64 value,void __iomem *addr) { -if (dw->mf ==EDMA_MF_EDMA_LEGACY ) { +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY ) {u32 viewport_sel;unsigned long flags;
@@ -194,7 +194,7 @@ static inline u64 readq_ch(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch, {u32 value; -if (dw->mf ==EDMA_MF_EDMA_LEGACY ) { +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY ) {u32 viewport_sel;unsigned long flags;
@@ -256,7 +256,7 @@ u16 dw_edma_v0_core_ch_count(struct dw_edma *dw, enum dw_edma_dir dir)enum dma_status dw_edma_v0_core_ch_status (struct dw_edma_chan *chan) { -struct dw_edma *dw = chan->chip->dw; +struct dw_edma *dw = chan->dw;u32 tmp; tmp = FIELD_GET(EDMA_V0_CH_STATUS_MASK,
@@ -272,7 +272,7 @@ enum dma_status dw_edma_v0_core_ch_status(struct dw_edma_chan *chan)void dw_edma_v0_core_clear_done_int (struct dw_edma_chan *chan) { -struct dw_edma *dw = chan->chip->dw; +struct dw_edma *dw = chan->dw;SET_RW_32 (dw, chan->dir, int_clear,FIELD_PREP (EDMA_V0_DONE_INT_MASK ,BIT (chan->id)));
@@ -280,7 +280,7 @@ void dw_edma_v0_core_clear_done_int(struct dw_edma_chan *chan)void dw_edma_v0_core_clear_abort_int (struct dw_edma_chan *chan) { -struct dw_edma *dw = chan->chip->dw; +struct dw_edma *dw = chan->dw;SET_RW_32 (dw, chan->dir, int_clear,FIELD_PREP (EDMA_V0_ABORT_INT_MASK ,BIT (chan->id)));
@@ -357,7 +357,7 @@ static void dw_edma_v0_core_write_chunk(struct dw_edma_chunk *chunk)void dw_edma_v0_core_start (struct dw_edma_chunk *chunk,bool first) {struct dw_edma_chan *chan = chunk->chan; -struct dw_edma *dw = chan->chip->dw; +struct dw_edma *dw = chan->dw;u32 tmp;dw_edma_v0_core_write_chunk (chunk);
@@ -365,7 +365,7 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)if (first) {/* Enable engine */ SET_RW_32 (dw, chan->dir, engine_en,BIT (0 )); -if (dw->mf ==EDMA_MF_HDMA_COMPAT ) { +if (dw->chip->mf ==EDMA_MF_HDMA_COMPAT ) {switch (chan->id) {case 0 : SET_RW_COMPAT(dw, chan->dir, ch0_pwr_en,
@@ -431,7 +431,7 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)int dw_edma_v0_core_device_config (struct dw_edma_chan *chan) { -struct dw_edma *dw = chan->chip->dw; +struct dw_edma *dw = chan->dw;u32 tmp =0 ;/* MSI done addr - low, high */
drivers/dma/dw-edma/dw-edma-v0-debugfs.c +5 -5
@@ -54,7 +54,7 @@ struct debugfs_entries {static int dw_edma_debugfs_u32_get (void *data,u64 *val) {void __iomem *reg = (void __force __iomem *)data; -if (dw->mf ==EDMA_MF_EDMA_LEGACY && +if (dw->chip->mf ==EDMA_MF_EDMA_LEGACY && reg >= (void __iomem *)®s->type.legacy.ch) {void __iomem *ptr = ®s->type.legacy.ch;u32 viewport_sel =0 ;
@@ -173,7 +173,7 @@ static void dw_edma_debugfs_regs_wr(struct dentry *dir) nr_entries =ARRAY_SIZE (debugfs_regs);dw_edma_debugfs_create_x32 (debugfs_regs, nr_entries, regs_dir); -if (dw->mf ==EDMA_MF_HDMA_COMPAT ) { +if (dw->chip->mf ==EDMA_MF_HDMA_COMPAT ) { nr_entries =ARRAY_SIZE (debugfs_unroll_regs);dw_edma_debugfs_create_x32 (debugfs_unroll_regs, nr_entries, regs_dir);
@@ -242,7 +242,7 @@ static void dw_edma_debugfs_regs_rd(struct dentry *dir) nr_entries =ARRAY_SIZE (debugfs_regs);dw_edma_debugfs_create_x32 (debugfs_regs, nr_entries, regs_dir); -if (dw->mf ==EDMA_MF_HDMA_COMPAT ) { +if (dw->chip->mf ==EDMA_MF_HDMA_COMPAT ) { nr_entries =ARRAY_SIZE (debugfs_unroll_regs);dw_edma_debugfs_create_x32 (debugfs_unroll_regs, nr_entries, regs_dir);
@@ -288,7 +288,7 @@ void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip)if (!dw)return ; - regs = dw->rg_region.vaddr; + regs = dw->chip->rg_region.vaddr;if (!regs)return ;
@@ -296,7 +296,7 @@ void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip)if (!dw->debugfs)return ; -debugfs_create_u32 ("mf" ,0444 , dw->debugfs, &dw->mf); +debugfs_create_u32 ("mf" ,0444 , dw->debugfs, &dw->chip->mf);debugfs_create_u16 ("wr_ch_cnt" ,0444 , dw->debugfs, &dw->wr_ch_cnt);debugfs_create_u16 ("rd_ch_cnt" ,0444 , dw->debugfs, &dw->rd_ch_cnt);
include/linux/dma/edma.h +44 -0
63 lines not on this page · raw message
Signature · 1 line
2.24.0.rc1
PATCH v5 2/9 dmaengine: dw-edma: remove unused field irq in struct dw_edma_chip
In reply to Frank Liirq of struct dw_edma_chip was never used.
It can be removed safely.
---
Change from v4 to v5
- none
new patch at v4
drivers/dma/dw-edma/dw-edma-pcie.c | 1 - include/linux/dma/edma.h | 2 -- 2 files changed, 3 deletions(-)
drivers/dma/dw-edma/dw-edma-pcie.c +0 -1
@@ -225,7 +225,6 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,/* Data structure initialization */ chip->dev = dev; chip->id = pdev->devfn; - chip->irq = pdev->irq; chip->mf = vsec_data.mf; chip->nr_irqs = nr_irqs;
include/linux/dma/edma.h +0 -2
@@ -37,7 +37,6 @@ enum dw_edma_map_format {* struct dw_edma_chip - representation of DesignWare eDMA controller hardware * @dev: struct device of the eDMA controller * @id: instance ID -* @irq: irq line * @nr_irqs: total dma irq number * @ops DMA channel to IRQ number mapping * @wr_ch_cnt DMA write channel number
@@ -51,7 +50,6 @@ enum dw_edma_map_format {struct dw_edma_chip {struct device *dev;int id; -int irq;int nr_irqs;const struct dw_edma_core_ops *ops;
Signature · 1 line
2.24.0.rc1
PATCH v5 3/9 dmaengine: dw-edma: change rg_region to reg_base in struct dw_edma_chip
In reply to Frank Listruct dw_edma_region rg_region included virtual address, physical address and size informaiton. But only virtual address is used by EDMA driver. Change it to void __iomem *reg_base to clean up code.
---
No change since V4
drivers/dma/dw-edma/dw-edma-pcie.c | 6 +++--- drivers/dma/dw-edma/dw-edma-v0-core.c | 2 +- drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 2 +- include/linux/dma/edma.h | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-)
drivers/dma/dw-edma/dw-edma-pcie.c +3 -3
@@ -233,8 +233,8 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev, chip->wr_ch_cnt = vsec_data.wr_ch_cnt; chip->rd_ch_cnt = vsec_data.rd_ch_cnt; - chip->rg_region.vaddr =pcim_iomap_table (pdev)[vsec_data.rg.bar]; -if (!chip->rg_region.vaddr) + chip->reg_base =pcim_iomap_table (pdev)[vsec_data.rg.bar]; +if (!chip->reg_base)return -ENOMEM ;for (i =0 ; i < chip->wr_ch_cnt; i++) {
@@ -299,7 +299,7 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,pci_dbg (pdev,"Registers:\tBAR=%u, off=0x%.8lx, sz=0x%zx bytes, addr(v=%p)\n" , vsec_data.rg.bar, vsec_data.rg.off, vsec_data.rg.sz, - chip->rg_region.vaddr); + chip->reg_base);for (i =0 ; i < chip->wr_ch_cnt; i++) {
drivers/dma/dw-edma/dw-edma-v0-core.c +1 -1
@@ -25,7 +25,7 @@ enum dw_edma_control {static inline struct dw_edma_v0_regs __iomem *__dw_regs (struct dw_edma *dw) { -return dw->chip->rg_region.vaddr; +return dw->chip->reg_base; }#define SET_32 (dw, name, value) \
drivers/dma/dw-edma/dw-edma-v0-debugfs.c +1 -1
@@ -288,7 +288,7 @@ void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip)if (!dw)return ; - regs = dw->chip->rg_region.vaddr; + regs = dw->chip->reg_base;if (!regs)return ;
include/linux/dma/edma.h +2 -1
@@ -39,6 +39,7 @@ enum dw_edma_map_format {* @id: instance ID * @nr_irqs: total dma irq number * @ops DMA channel to IRQ number mapping +* @reg_base DMA register base address * @wr_ch_cnt DMA write channel number * @rd_ch_cnt DMA read channel number * @rg_region DMA register region
@@ -53,7 +54,7 @@ struct dw_edma_chip {int nr_irqs;const struct dw_edma_core_ops *ops; -struct dw_edma_region rg_region; +void __iomem *reg_base;u16 wr_ch_cnt;u16 rd_ch_cnt;
Signature · 1 line
2.24.0.rc1
PATCH v5 4/9 dmaengine: dw-edma: rename wr(rd)_ch_cnt to ll_wr(rd)_cnt in struct dw_edma_chip
In reply to Frank LiThere are same name wr(rd)_ch_cnt in struct dw_edma. EDMA driver get write(read) channel number from register, then save these into dw_edma. Old wr(rd)_ch_cnt in dw_edma_chip actuall means how many link list memory are avaiable in ll_region_wr(rd)[EDMA_MAX_WR_CH]. So rename it to ll_wr(rd)_cnt to indicate actual usage.
---
No change since v4
drivers/dma/dw-edma/dw-edma-core.c | 4 ++-- drivers/dma/dw-edma/dw-edma-pcie.c | 12 ++++++------ include/linux/dma/edma.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-)
drivers/dma/dw-edma/dw-edma-core.c +2 -2
@@ -915,11 +915,11 @@ int dw_edma_probe(struct dw_edma_chip *chip)raw_spin_lock_init (&dw->lock); - dw->wr_ch_cnt =min_t (u16, chip->wr_ch_cnt, + dw->wr_ch_cnt =min_t (u16, chip->ll_wr_cnt,dw_edma_v0_core_ch_count (dw,EDMA_DIR_WRITE )); dw->wr_ch_cnt =min_t (u16, dw->wr_ch_cnt,EDMA_MAX_WR_CH ); - dw->rd_ch_cnt =min_t (u16, chip->rd_ch_cnt, + dw->rd_ch_cnt =min_t (u16, chip->ll_rd_cnt,dw_edma_v0_core_ch_count (dw,EDMA_DIR_READ )); dw->rd_ch_cnt =min_t (u16, dw->rd_ch_cnt,EDMA_MAX_RD_CH );
drivers/dma/dw-edma/dw-edma-pcie.c +6 -6
@@ -230,14 +230,14 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev, chip->nr_irqs = nr_irqs; chip->ops = &dw_edma_pcie_core_ops; - chip->wr_ch_cnt = vsec_data.wr_ch_cnt; - chip->rd_ch_cnt = vsec_data.rd_ch_cnt; + chip->ll_wr_cnt = vsec_data.wr_ch_cnt; + chip->ll_rd_cnt = vsec_data.rd_ch_cnt; chip->reg_base =pcim_iomap_table (pdev)[vsec_data.rg.bar];if (!chip->reg_base)return -ENOMEM ; -for (i =0 ; i < chip->wr_ch_cnt; i++) { +for (i =0 ; i < chip->ll_wr_cnt; i++) {struct dw_edma_region *ll_region = &chip->ll_region_wr[i];struct dw_edma_region *dt_region = &chip->dt_region_wr[i];struct dw_edma_block *ll_block = &vsec_data.ll_wr[i];
@@ -262,7 +262,7 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev, dt_region->sz = dt_block->sz; } -for (i =0 ; i < chip->rd_ch_cnt; i++) { +for (i =0 ; i < chip->ll_rd_cnt; i++) {struct dw_edma_region *ll_region = &chip->ll_region_rd[i];struct dw_edma_region *dt_region = &chip->dt_region_rd[i];struct dw_edma_block *ll_block = &vsec_data.ll_rd[i];
@@ -302,7 +302,7 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev, chip->reg_base); -for (i =0 ; i < chip->wr_ch_cnt; i++) { +for (i =0 ; i < chip->ll_wr_cnt; i++) { pci_dbg(pdev, "L. List:\tWRITE CH%.2u, BAR=%u, off=0x%.8lx, sz=0x%zx bytes, addr(v=%p, p=%pa)\n", i, vsec_data.ll_wr[i].bar, vsec_data.ll_wr[i].off, chip->ll_region_wr[i].sz,
@@ -314,7 +314,7 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev, chip->dt_region_wr[i].vaddr, &chip->dt_region_wr[i].paddr); } -for (i =0 ; i < chip->rd_ch_cnt; i++) { +for (i =0 ; i < chip->ll_rd_cnt; i++) { pci_dbg(pdev, "L. List:\tREAD CH%.2u, BAR=%u, off=0x%.8lx, sz=0x%zx bytes, addr(v=%p, p=%pa)\n", i, vsec_data.ll_rd[i].bar, vsec_data.ll_rd[i].off, chip->ll_region_rd[i].sz,
include/linux/dma/edma.h +4 -4
@@ -40,8 +40,8 @@ enum dw_edma_map_format {* @nr_irqs: total dma irq number * @ops DMA channel to IRQ number mapping * @reg_base DMA register base address -* @wr_ch_cnt DMA write channel number -* @rd_ch_cnt DMA read channel number +* @ll_wr_cnt DMA write link list number +* @ll_rd_cnt DMA read link list number * @rg_region DMA register region * @ll_region_wr DMA descriptor link list memory for write channel * @ll_region_rd DMA descriptor link list memory for read channel
@@ -56,8 +56,8 @@ struct dw_edma_chip {void __iomem *reg_base; -u16 wr_ch_cnt; -u16 rd_ch_cnt; +u16 ll_wr_cnt; +u16 ll_rd_cnt;/* link list address */ struct dw_edma_region ll_region_wr[EDMA_MAX_WR_CH ];struct dw_edma_region ll_region_rd[EDMA_MAX_RD_CH ];
Signature · 1 line
2.24.0.rc1
PATCH v5 5/9 dmaengine: dw-edma: Fix programming the source & dest addresses for ep
In reply to Frank LiFrom: Manivannan Sadhasivam <[email protected]>
When eDMA is controlled by the Endpoint (EP), the current logic incorrectly programs the source and destination addresses for read and write. Since the Root complex and Endpoint uses the opposite channels for read/write, fix the issue by finding out the read operation first and program the eDMA accordingly.
--- drivers/dma/dw-edma/dw-edma-core.c | 32 +++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)
drivers/dma/dw-edma/dw-edma-core.c +31 -1
@@ -334,6 +334,7 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer)struct dw_edma_chunk *chunk;struct dw_edma_burst *burst;struct dw_edma_desc *desc; +bool read = false;u32 cnt =0 ;int i;
@@ -424,7 +425,36 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer) chunk->ll_region.sz += burst->sz; desc->alloc_sz += burst->sz; -if (chan->dir ==EDMA_DIR_WRITE ) { +/**************************************************************** +* +* Root Complex Endpoint +* +-----------------------+ +----------------------+ +* | | TX CH | | +* | | | | +* | DEV_TO_MEM <-------------+ MEM_TO_DEV | +* | | | | +* | | | | +* | MEM_TO_DEV +-------------> DEV_TO_MEM | +* | | | | +* | | RX CH | | +* +-----------------------+ +----------------------+ +* +* If eDMA is controlled by the Root complex, TX channel +* (EDMA_DIR_WRITE) is used for memory read (DEV_TO_MEM) and RX +* channel (EDMA_DIR_READ) is used for memory write (MEM_TO_DEV). +* +* If eDMA is controlled by the endpoint, RX channel +* (EDMA_DIR_READ) is used for memory read (DEV_TO_MEM) and TX +* channel (EDMA_DIR_WRITE) is used for memory write (MEM_TO_DEV). +* +****************************************************************/ + +if ((dir ==DMA_DEV_TO_MEM && chan->dir ==EDMA_DIR_READ ) || + (dir ==DMA_DEV_TO_MEM && chan->dir ==EDMA_DIR_WRITE )) + read = true; + +/* Program the source and destination addresses for DMA read/write */ +if (read) { burst->sar = src_addr;if (xfer->type ==EDMA_XFER_CYCLIC ) { burst->dar = xfer->xfer.cyclic.paddr;
Signature · 1 line
2.24.0.rc1
PATCH v5 6/9 dmaengine: dw-edma: Don't rely on the deprecated "direction" member
In reply to Frank LiFrom: Manivannan Sadhasivam <[email protected]>
The "direction" member of the "dma_slave_config" structure is deprecated. The clients no longer use this field to specify the direction of the slave channel. But in the eDMA core, this field is used to differentiate between the Root complex (remote) and Endpoint (local) DMA accesses.
Nevertheless, we can't differentiate between local and remote accesses without a dedicated flag. So let's get rid of the old check and add a new check for verifying the DMA operation between local and remote memory instead.
--- drivers/dma/dw-edma/dw-edma-core.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
drivers/dma/dw-edma/dw-edma-core.c +2 -15
@@ -341,22 +341,9 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer)if (!chan->configured)return NULL ; -switch (chan->config.direction) { -case DMA_DEV_TO_MEM :/* local DMA */ -if (dir ==DMA_DEV_TO_MEM && chan->dir ==EDMA_DIR_READ ) -break ; -return NULL ; -case DMA_MEM_TO_DEV :/* local DMA */ -if (dir ==DMA_MEM_TO_DEV && chan->dir ==EDMA_DIR_WRITE ) -break ; +/* eDMA supports only read and write between local and remote memory */ +if (dir !=DMA_DEV_TO_MEM && dir !=DMA_MEM_TO_DEV )return NULL ; -default :/* remote DMA */ -if (dir ==DMA_MEM_TO_DEV && chan->dir ==EDMA_DIR_READ ) -break ; -if (dir ==DMA_DEV_TO_MEM && chan->dir ==EDMA_DIR_WRITE ) -break ; -return NULL ; - }if (xfer->type ==EDMA_XFER_CYCLIC ) {if (!xfer->xfer.cyclic.len || !xfer->xfer.cyclic.cnt)
Signature · 1 line
2.24.0.rc1
PATCH v5 7/9 dmaengine: dw-edma: Add support for chip specific flags
In reply to Frank LiAdd a "flags" field to the "struct dw_edma_chip" so that the controller drivers can pass flags that are relevant to the platform.
DW_EDMA_CHIP_LOCAL - Used by the controller drivers accessing eDMA locally. Local eDMA access doesn't require generating MSIs to the remote.
---
Change from v4 to v5
- split two two patch
- rework commit message
Change from v3 to v4
none
Change from v2 to v3
- rework commit message
- Change to DW_EDMA_CHIP_32BIT_DBI
- using DW_EDMA_CHIP_LOCAL control msi
- Apply Bjorn's comments,
if (!j) {
control |= DW_EDMA_V0_LIE;
if (!(chan->chip->flags & DW_EDMA_CHIP_LOCAL))
control |= DW_EDMA_V0_RIE;
}
if ((chan->chip->flags & DW_EDMA_CHIP_REG32BIT) ||
!IS_ENABLED(CONFIG_64BIT)) {
SET_CH_32(...);
SET_CH_32(...);
} else {
SET_CH_64(...);
}Change from v1 to v2
- none
drivers/dma/dw-edma/dw-edma-v0-core.c | 9 ++++++--- include/linux/dma/edma.h | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-)
drivers/dma/dw-edma/dw-edma-v0-core.c +6 -3
@@ -301,6 +301,7 @@ u32 dw_edma_v0_core_status_abort_int(struct dw_edma *dw, enum dw_edma_dir dir)static void dw_edma_v0_core_write_chunk (struct dw_edma_chunk *chunk) {struct dw_edma_burst *child; +struct dw_edma_chan *chan = chunk->chan;struct dw_edma_v0_lli __iomem *lli;struct dw_edma_v0_llp __iomem *llp;u32 control =0 , i =0 ;
@@ -314,9 +315,11 @@ static void dw_edma_v0_core_write_chunk(struct dw_edma_chunk *chunk) j = chunk->bursts_alloc;list_for_each_entry (child, &chunk->burst->list, list) { j--; -if (!j) - control |= (DW_EDMA_V0_LIE |DW_EDMA_V0_RIE ); - +if (!j) { + control |=DW_EDMA_V0_LIE ; +if (!(chan->dw->chip->flags &DW_EDMA_CHIP_LOCAL )) + control |=DW_EDMA_V0_RIE ; + }/* Channel control */ SET_LL_32 (&lli[i].control, control);/* Transfer size */
include/linux/dma/edma.h +5 -0
@@ -33,12 +33,16 @@ enum dw_edma_map_format { EDMA_MF_HDMA_COMPAT = 0x5 }; +/* Probe EDMA engine locally and prevent generate MSI to host side*/ +#define DW_EDMA_CHIP_LOCAL BIT(0) +/** * struct dw_edma_chip - representation of DesignWare eDMA controller hardware * @dev: struct device of the eDMA controller * @id: instance ID * @nr_irqs: total dma irq number * @ops DMA channel to IRQ number mapping +* @flags - DW_EDMA_CHIP_LOCAL * @reg_base DMA register base address * @ll_wr_cnt DMA write link list number * @ll_rd_cnt DMA read link list number
@@ -53,6 +57,7 @@ struct dw_edma_chip {int id;int nr_irqs;const struct dw_edma_core_ops *ops; +u32 flags;void __iomem *reg_base;
Signature · 1 line
2.24.0.rc1
PATCH v5 8/9 dmaengine: dw-edma: Add DW_EDMA_CHIP_32BIT_DBI for chip specific flags
In reply to Frank LiDW_EDMA_CHIP_32BIT_DBI was used by the controller drivers like i.MX8 that allows only 32bit access to the DBI region.
---
New patch at v5
- fix kernel test robot build error
drivers/dma/dw-edma/dw-edma-v0-core.c | 13 ++++++++----- include/linux/dma/edma.h | 4 ++++ 2 files changed, 12 insertions(+), 5 deletions(-)
drivers/dma/dw-edma/dw-edma-v0-core.c +8 -5
@@ -417,15 +417,18 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)SET_CH_32 (dw, chan->dir, chan->id, ch_control1, (DW_EDMA_V0_CCS |DW_EDMA_V0_LLE ));/* Linked list */ -#ifdef CONFIG_64BIT -SET_CH_64 (dw, chan->dir, chan->id, llp.reg, - chunk->ll_region.paddr); -#else /* CONFIG_64BIT */ +if ((chan->dw->chip->flags &DW_EDMA_CHIP_32BIT_DBI ) || + !IS_ENABLED (CONFIG_64BIT )) {SET_CH_32 (dw, chan->dir, chan->id, llp.lsb,lower_32_bits (chunk->ll_region.paddr));SET_CH_32 (dw, chan->dir, chan->id, llp.msb,upper_32_bits (chunk->ll_region.paddr)); -#endif /* CONFIG_64BIT */ + }else { +#ifdef CONFIG_64BIT +SET_CH_64 (dw, chan->dir, chan->id, llp.reg, + chunk->ll_region.paddr); +#endif + } }/* Doorbell */ SET_RW_32(dw, chan->dir, doorbell,
include/linux/dma/edma.h +4 -0
@@ -36,6 +36,9 @@ enum dw_edma_map_format {/* Probe EDMA engine locally and prevent generate MSI to host side*/ #define DW_EDMA_CHIP_LOCAL BIT(0) +/* Only support 32bit DBI register access */ +#define DW_EDMA_CHIP_32BIT_DBI BIT(1) +/** * struct dw_edma_chip - representation of DesignWare eDMA controller hardware * @dev: struct device of the eDMA controller
@@ -43,6 +46,7 @@ enum dw_edma_map_format {* @nr_irqs: total dma irq number * @ops DMA channel to IRQ number mapping * @flags - DW_EDMA_CHIP_LOCAL +* - DW_EDMA_CHIP_32BIT_DBI * @reg_base DMA register base address * @ll_wr_cnt DMA write link list number * @ll_rd_cnt DMA read link list number
Signature · 1 line
2.24.0.rc1
PATCH v5 9/9 PCI: endpoint: functions/pci-epf-test: Support PCI controller DMA
In reply to Frank LiDesignware provided eDMA support in controller. This enabled use this eDMA controller to transfer data.
The whole flow align with standard DMA usage module
1. Using dma_request_channel() and filter function to find correct RX and TX Channel.
2. dmaengine_slave_config() config remote side physcial address.
3. using dmaengine_prep_slave_single() create transfer descriptor
4. tx_submit();
5. dma_async_issue_pending();
Tested at i.MX8DXL platform.
root@imx8qmmek:~# /usr/bin/pcitest -d -w WRITE ( 102400 bytes): OKAY root@imx8qmmek:~# /usr/bin/pcitest -d -r READ ( 102400 bytes): OKAY
WRITE => Size: 102400 bytes DMA: YES Time: 0.000180145 seconds Rate: 555108 KB/s READ => Size: 102400 bytes DMA: YES Time: 0.000194397 seconds Rate: 514411 KB/s
READ => Size: 102400 bytes DMA: NO Time: 0.013532597 seconds Rate: 7389 KB/s
WRITE => Size: 102400 bytes DMA: NO Time: 0.000857090 seconds Rate: 116673 KB/s
---
Change from v4 to v5:
- none
Change from v3 to v4:
- reverse Xmas tree order
- local -> dma_local
- change error message
- IS_ERR -> IS_ERR_OR_NULL
- check return value of dmaengine_slave_config()
Change from v1 to v2:
- none
drivers/pci/endpoint/functions/pci-epf-test.c | 108 ++++++++++++++++-- 1 file changed, 98 insertions(+), 10 deletions(-)
drivers/pci/endpoint/functions/pci-epf-test.c +98 -10
@@ -52,9 +52,11 @@ struct pci_epf_test {enum pci_barno test_reg_bar;size_t msix_table_offset;struct delayed_work cmd_handler; -struct dma_chan *dma_chan; +struct dma_chan *dma_chan_tx; +struct dma_chan *dma_chan_rx;struct completion transfer_complete;bool dma_supported; +bool dma_private;const struct pci_epc_features *epc_features; };
@@ -105,12 +107,15 @@ static void pci_epf_test_dma_callback(void *param)*/ static int pci_epf_test_data_transfer (struct pci_epf_test *epf_test,dma_addr_t dma_dst,dma_addr_t dma_src, -size_t len) +size_t len,dma_addr_t dma_remote, +enum dma_transfer_direction dir) { +struct dma_chan *chan = (dir ==DMA_DEV_TO_MEM ) ? epf_test->dma_chan_tx : epf_test->dma_chan_rx; +dma_addr_t dma_local = (dir ==DMA_MEM_TO_DEV ) ? dma_src : dma_dst;enum dma_ctrl_flags flags =DMA_CTRL_ACK |DMA_PREP_INTERRUPT ; -struct dma_chan *chan = epf_test->dma_chan;struct pci_epf *epf = epf_test->epf;struct dma_async_tx_descriptor *tx; +struct dma_slave_config sconf = {};struct device *dev = &epf->dev;dma_cookie_t cookie;int ret;
@@ -120,7 +125,22 @@ static int pci_epf_test_data_transfer(struct pci_epf_test *epf_test,return -EINVAL ; } - tx =dmaengine_prep_dma_memcpy (chan, dma_dst, dma_src, len, flags); +if (epf_test->dma_private) { + sconf.direction = dir; +if (dir ==DMA_MEM_TO_DEV ) + sconf.dst_addr = dma_remote; +else + sconf.src_addr = dma_remote; + +if (dmaengine_slave_config (chan, &sconf)) { +dev_err (dev,"DMA slave config fail\n" ); +return -EIO ; + } + tx =dmaengine_prep_slave_single (chan, dma_local, len, dir, flags); + }else { + tx =dmaengine_prep_dma_memcpy (chan, dma_dst, dma_src, len, flags); + } +if (!tx) {dev_err (dev,"Failed to prepare DMA memcpy\n" );return -EIO ;
@@ -148,6 +168,23 @@ static int pci_epf_test_data_transfer(struct pci_epf_test *epf_test,return 0 ; } +struct epf_dma_filter { +struct device *dev; +u32 dma_mask; +}; + +static bool epf_dma_filter_fn (struct dma_chan *chan,void *node) +{ +struct epf_dma_filter *filter = node; +struct dma_slave_caps caps; + +memset (&caps,0 ,sizeof (caps)); +dma_get_slave_caps (chan, &caps); + +return chan->device->dev == filter->dev + && (filter->dma_mask & caps.directions); +} +/** * pci_epf_test_init_dma_chan() - Function to initialize EPF test DMA channel * @epf_test: the EPF test device that performs data transfer operation
@@ -158,10 +195,44 @@ static int pci_epf_test_init_dma_chan(struct pci_epf_test *epf_test) {struct pci_epf *epf = epf_test->epf;struct device *dev = &epf->dev; +struct epf_dma_filter filter;struct dma_chan *dma_chan;dma_cap_mask_t mask;int ret; + filter.dev = epf->epc->dev.parent; + filter.dma_mask =BIT (DMA_DEV_TO_MEM ); + +dma_cap_zero (mask); +dma_cap_set (DMA_SLAVE , mask); + dma_chan =dma_request_channel (mask, epf_dma_filter_fn, &filter); +if (IS_ERR_OR_NULL (dma_chan)) { +dev_info (dev,"Failed to get private DMA channel. Falling back to generic one\n" ); + goto fail_back_tx; + } + + epf_test->dma_chan_rx = dma_chan; + + filter.dma_mask =BIT (DMA_MEM_TO_DEV ); + dma_chan =dma_request_channel (mask, epf_dma_filter_fn, &filter); + +if (IS_ERR (dma_chan)) { +dev_info (dev,"Failed to get private DMA channel. Falling back to generic one\n" ); + goto fail_back_rx; + } + + epf_test->dma_chan_tx = dma_chan; + epf_test->dma_private = true; + +init_completion (&epf_test->transfer_complete); + +return 0 ; + +fail_back_rx: +dma_release_channel (epf_test->dma_chan_rx); + epf_test->dma_chan_tx =NULL ; + +fail_back_tx:dma_cap_zero (mask);dma_cap_set (DMA_MEMCPY , mask);
@@ -174,7 +245,7 @@ static int pci_epf_test_init_dma_chan(struct pci_epf_test *epf_test) }init_completion (&epf_test->transfer_complete); - epf_test->dma_chan = dma_chan; + epf_test->dma_chan_tx = epf_test->dma_chan_rx = dma_chan;return 0 ; }
@@ -190,8 +261,17 @@ static void pci_epf_test_clean_dma_chan(struct pci_epf_test *epf_test)if (!epf_test->dma_supported)return ; -dma_release_channel (epf_test->dma_chan); - epf_test->dma_chan =NULL ; +dma_release_channel (epf_test->dma_chan_tx); +if (epf_test->dma_chan_tx == epf_test->dma_chan_rx) { + epf_test->dma_chan_tx =NULL ; + epf_test->dma_chan_rx =NULL ; +return ; + } + +dma_release_channel (epf_test->dma_chan_rx); + epf_test->dma_chan_rx =NULL ; + +return ; } static void pci_epf_test_print_rate(const char *ops, u64 size,
@@ -280,8 +360,14 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test) goto err_map_addr; } +if (epf_test->dma_private) { +dev_err (dev,"Cannot transfer data using DMA\n" ); + ret = -EINVAL ; + goto err_map_addr; + } + ret =pci_epf_test_data_transfer (epf_test, dst_phys_addr, - src_phys_addr, reg->size); + src_phys_addr, reg->size,0 ,DMA_MEM_TO_MEM );if (ret)dev_err (dev,"Data transfer failed\n" ); }else {
@@ -363,7 +449,8 @@ static int pci_epf_test_read(struct pci_epf_test *epf_test)ktime_get_ts64 (&start); ret =pci_epf_test_data_transfer (epf_test, dst_phys_addr, - phys_addr, reg->size); + phys_addr, reg->size, + reg->src_addr,DMA_DEV_TO_MEM );if (ret)dev_err (dev,"Data transfer failed\n" );ktime_get_ts64 (&end);
@@ -453,8 +540,9 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test) }ktime_get_ts64 (&start); + ret =pci_epf_test_data_transfer (epf_test, phys_addr, - src_phys_addr, reg->size); + src_phys_addr, reg->size, reg->dst_addr,DMA_MEM_TO_DEV );if (ret)dev_err (dev,"Data transfer failed\n" );ktime_get_ts64 (&end);
Signature · 1 line
2.24.0.rc1
Frank,
Please don't re-send patch so quickly. We haven't finished discussing and reviewing v4 yet, but you've already sent out v5 with possibly some of the comments missed. In addition you haven't addressed all my comments in the v4. Please get back there and let's finish all the discussions first. Regarding the resibmitting procedure see [1].
[1] Documentation/process/submitting-patches.rst: "Don't get discouraged - or impatient"
-Sergey
Quoted 54 lines · Frank Li
Default Designware EDMA just probe remotely at host side. This patch allow EDMA driver can probe at EP side.
1. Clean up patch
dmaengine: dw-edma: Detach the private data and chip info structures
dmaengine: dw-edma: remove unused field irq in structdw_edma_chip
dmaengine: dw-edma: changerg_regiontoreg_basein struct
dmaengine: dw-edma: rename wr(rd)_ch_cnt to ll_wr(rd)_cnt in struct2. Enhance EDMA driver to allow prode eDMA at EP side
dmaengine: dw-edma: Add support for chip specific flags
dmaengine: dw-edma: AddDW_EDMA_CHIP_32BIT_DBIfor chip specific flags3. Bugs fix at EDMA driver when probe eDMA at EP side
dmaengine: dw-edma: Fix programming the source & dest addresses for ep
dmaengine: dw-edma: Don't rely on the deprecated "direction" member4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: functions/pci-epf-test: Support PCI controller DMA5. Using imx8dxl to do test, but some EP functions still have not upstream yet. So below patch show how probe eDMA driver at EP controller driver.
https://lore.kernel.org/linux-pci/20220309120149.GB134091@thinkpad/T/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097Frank Li (7):
dmaengine: dw-edma: Detach the private data and chip info structures
dmaengine: dw-edma: remove unused field irq in structdw_edma_chip
dmaengine: dw-edma: changerg_regiontoreg_basein struct
dw_edma_chip
dmaengine: dw-edma: rename wr(rd)_ch_cnt to ll_wr(rd)_cnt in struct
dw_edma_chip
dmaengine: dw-edma: Add support for chip specific flags
dmaengine: dw-edma: AddDW_EDMA_CHIP_32BIT_DBIfor chip specific flags
PCI: endpoint: functions/pci-epf-test: Support PCI controller DMAManivannan Sadhasivam (2):
dmaengine: dw-edma: Fix programming the source & dest addresses for ep
dmaengine: dw-edma: Don't rely on the deprecated "direction" memberdrivers/dma/dw-edma/dw-edma-core.c | 131 +++++++++++------- drivers/dma/dw-edma/dw-edma-core.h | 32 +---- drivers/dma/dw-edma/dw-edma-pcie.c | 83 +++++------ drivers/dma/dw-edma/dw-edma-v0-core.c | 46 +++--- drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 10 +- drivers/pci/endpoint/functions/pci-epf-test.c | 108 +++++++++++++-- include/linux/dma/edma.h | 56 +++++++- 7 files changed, 298 insertions(+), 168 deletions(-)Signature · 1 line
2.24.0.rc1
Quoted 6 lines · Serge Semin
Frank,
Please don't re-send patch so quickly. We haven't finished discussing and reviewing v4 yet, but you've already sent out v5 with possibly some of the comments missed. In addition you haven't addressed all my comments
I think I have already finished my patches.
The comments missed are manivannan's patches, which should be fixed by him.
best regards
Frank Li
Quoted 62 lines
in the v4. Please get back there and let's finish all the discussions first. Regarding the resibmitting procedure see [1].
[1]
Documentation/process/submitting-patches.rst: "Don't get discouraged - or impatient"-Sergey
Quoted 54 lines · Frank Li
Default Designware EDMA just probe remotely at host side. This patch allow EDMA driver can probe at EP side.
1. Clean up patch
dmaengine: dw-edma: Detach the private data and chip info structures
dmaengine: dw-edma: remove unused field irq in structdw_edma_chip
dmaengine: dw-edma: changerg_regiontoreg_basein struct
dmaengine: dw-edma: rename wr(rd)_ch_cnt to ll_wr(rd)_cnt in struct2. Enhance EDMA driver to allow prode eDMA at EP side
dmaengine: dw-edma: Add support for chip specific flags
dmaengine: dw-edma: AddDW_EDMA_CHIP_32BIT_DBIfor chip specific flags3. Bugs fix at EDMA driver when probe eDMA at EP side
dmaengine: dw-edma: Fix programming the source & dest addresses for ep
dmaengine: dw-edma: Don't rely on the deprecated "direction" member4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: functions/pci-epf-test: Support PCI controller DMA5. Using imx8dxl to do test, but some EP functions still have not upstream yet. So below patch show how probe eDMA driver at EP controller driver.
https://lore.kernel.org/linux-pci/20220309120149.GB134091@thinkpad/T/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097Frank Li (7):
dmaengine: dw-edma: Detach the private data and chip info structures
dmaengine: dw-edma: remove unused field irq in structdw_edma_chip
dmaengine: dw-edma: changerg_regiontoreg_basein struct
dw_edma_chip
dmaengine: dw-edma: rename wr(rd)_ch_cnt to ll_wr(rd)_cnt in struct
dw_edma_chip
dmaengine: dw-edma: Add support for chip specific flags
dmaengine: dw-edma: AddDW_EDMA_CHIP_32BIT_DBIfor chip specific flags
PCI: endpoint: functions/pci-epf-test: Support PCI controller DMAManivannan Sadhasivam (2):
dmaengine: dw-edma: Fix programming the source & dest addresses for ep
dmaengine: dw-edma: Don't rely on the deprecated "direction" memberdrivers/dma/dw-edma/dw-edma-core.c | 131 +++++++++++------- drivers/dma/dw-edma/dw-edma-core.h | 32 +---- drivers/dma/dw-edma/dw-edma-pcie.c | 83 +++++------ drivers/dma/dw-edma/dw-edma-v0-core.c | 46 +++--- drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 10 +- drivers/pci/endpoint/functions/pci-epf-test.c | 108 +++++++++++++-- include/linux/dma/edma.h | 56 +++++++- 7 files changed, 298 insertions(+), 168 deletions(-)--
2.24.0.rc1
Quoted 9 lines · Serge Semin
Frank,
Please don't re-send patch so quickly. We haven't finished discussing and reviewing v4 yet, but you've already sent out v5 with possibly some of the comments missed. In addition you haven't addressed all my comments in the v4. Please get back there and let's finish all the discussions first. Regarding the resibmitting procedure see [1].
[1]
Documentation/process/submitting-patches.rst: "Don't get discouraged - or impatient"
Note due to that you've missed not only my comments, but also the Mani' ones. Like this:
https://lore.kernel.org/dmaengine/20220310075539.GD4869@thinkpad/
Please be patient. We are spending our time reviewing your patchset in an attempt to make it better, and the kernel code/repo log to be more readable and coherent. Skipping some comments not only wastes our time, but looks like disregard to the work we've done.
As soon as you see all the discussions are over, and there is no need to wait for additional comments, then you can re-spin the series.
-Sergey
Quoted 58 lines
-Sergey
Quoted 54 lines · Frank Li
Default Designware EDMA just probe remotely at host side. This patch allow EDMA driver can probe at EP side.
1. Clean up patch
dmaengine: dw-edma: Detach the private data and chip info structures
dmaengine: dw-edma: remove unused field irq in structdw_edma_chip
dmaengine: dw-edma: changerg_regiontoreg_basein struct
dmaengine: dw-edma: rename wr(rd)_ch_cnt to ll_wr(rd)_cnt in struct2. Enhance EDMA driver to allow prode eDMA at EP side
dmaengine: dw-edma: Add support for chip specific flags
dmaengine: dw-edma: AddDW_EDMA_CHIP_32BIT_DBIfor chip specific flags3. Bugs fix at EDMA driver when probe eDMA at EP side
dmaengine: dw-edma: Fix programming the source & dest addresses for ep
dmaengine: dw-edma: Don't rely on the deprecated "direction" member4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: functions/pci-epf-test: Support PCI controller DMA5. Using imx8dxl to do test, but some EP functions still have not upstream yet. So below patch show how probe eDMA driver at EP controller driver.
https://lore.kernel.org/linux-pci/20220309120149.GB134091@thinkpad/T/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097Frank Li (7):
dmaengine: dw-edma: Detach the private data and chip info structures
dmaengine: dw-edma: remove unused field irq in structdw_edma_chip
dmaengine: dw-edma: changerg_regiontoreg_basein struct
dw_edma_chip
dmaengine: dw-edma: rename wr(rd)_ch_cnt to ll_wr(rd)_cnt in struct
dw_edma_chip
dmaengine: dw-edma: Add support for chip specific flags
dmaengine: dw-edma: AddDW_EDMA_CHIP_32BIT_DBIfor chip specific flags
PCI: endpoint: functions/pci-epf-test: Support PCI controller DMAManivannan Sadhasivam (2):
dmaengine: dw-edma: Fix programming the source & dest addresses for ep
dmaengine: dw-edma: Don't rely on the deprecated "direction" memberdrivers/dma/dw-edma/dw-edma-core.c | 131 +++++++++++------- drivers/dma/dw-edma/dw-edma-core.h | 32 +---- drivers/dma/dw-edma/dw-edma-pcie.c | 83 +++++------ drivers/dma/dw-edma/dw-edma-v0-core.c | 46 +++--- drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 10 +- drivers/pci/endpoint/functions/pci-epf-test.c | 108 +++++++++++++-- include/linux/dma/edma.h | 56 +++++++- 7 files changed, 298 insertions(+), 168 deletions(-)Signature · 1 line
2.24.0.rc1
Quoted 27 lines · Frank Li
Default Designware EDMA just probe remotely at host side. This patch allow EDMA driver can probe at EP side.
1. Clean up patch
dmaengine: dw-edma: Detach the private data and chip info structures
dmaengine: dw-edma: remove unused field irq in structdw_edma_chip
dmaengine: dw-edma: changerg_regiontoreg_basein struct
dmaengine: dw-edma: rename wr(rd)_ch_cnt to ll_wr(rd)_cnt in struct2. Enhance EDMA driver to allow prode eDMA at EP side
dmaengine: dw-edma: Add support for chip specific flags
dmaengine: dw-edma: AddDW_EDMA_CHIP_32BIT_DBIfor chip specific flags3. Bugs fix at EDMA driver when probe eDMA at EP side
dmaengine: dw-edma: Fix programming the source & dest addresses for ep
dmaengine: dw-edma: Don't rely on the deprecated "direction" member4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: functions/pci-epf-test: Support PCI controller DMA5. Using imx8dxl to do test, but some EP functions still have not upstream yet. So below patch show how probe eDMA driver at EP controller driver.
https://lore.kernel.org/linux-pci/20220309120149.GB134091@thinkpad/T/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097
Quoted 7 lines
Frank Li (7):
dmaengine: dw-edma: Detach the private data and chip info structures
dmaengine: dw-edma: remove unused field irq in structdw_edma_chip
dmaengine: dw-edma: changerg_regiontoreg_basein struct
dw_edma_chip
dmaengine: dw-edma: rename wr(rd)_ch_cnt to ll_wr(rd)_cnt in struct
dw_edma_chip
These should be consistently capitalized to match previous commits (and the rest of your own commits :)):
s/remove unused/Remove unused/
s/change rg_region/Change rg_region/
s/rename wr/Rename wr/
Quoted 3 lines
dmaengine: dw-edma: Add support for chip specific flags
dmaengine: dw-edma: AddDW_EDMA_CHIP_32BIT_DBIfor chip specific flags
PCI: endpoint: functions/pci-epf-test: Support PCI controller DMA
There are a couple commits that use the whole "PCI: endpoint:
functions/pci-epf-test:" prefix, but IMO it's a bit of overkill to use so much space just for the prefix.
Maybe something like this would be enough?
PCI: endpoint: Add embedded DMA controller test
Quoted 16 lines
Manivannan Sadhasivam (2):
dmaengine: dw-edma: Fix programming the source & dest addresses for ep
dmaengine: dw-edma: Don't rely on the deprecated "direction" memberdrivers/dma/dw-edma/dw-edma-core.c | 131 +++++++++++------- drivers/dma/dw-edma/dw-edma-core.h | 32 +---- drivers/dma/dw-edma/dw-edma-pcie.c | 83 +++++------ drivers/dma/dw-edma/dw-edma-v0-core.c | 46 +++--- drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 10 +- drivers/pci/endpoint/functions/pci-epf-test.c | 108 +++++++++++++-- include/linux/dma/edma.h | 56 +++++++- 7 files changed, 298 insertions(+), 168 deletions(-)Signature · 1 line
2.24.0.rc1