Enable designware PCI EP EDMA locally
Subsystems (4)
v11 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 (this patch removed at v11 because dma tree already have fixed patch)
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: Add embedded DMA controller test
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 (6):
dmaengine: dw-edma: Remove unused field irq in struct dw_edma_chip
dmaengine: dw-edma: Detach the private data and chip info structures
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
PCI: endpoint: Enable DMA tests for endpoints with DMA capabilities
Serge Semin (2):
dmaengine: dw-edma: Drop dma_slave_config.direction field usage
dmaengine: dw-edma: Fix eDMA Rd/Wr-channels and DMA-direction
semantics
drivers/dma/dw-edma/dw-edma-core.c | 141 +++++++++++------- drivers/dma/dw-edma/dw-edma-core.h | 31 +--- drivers/dma/dw-edma/dw-edma-pcie.c | 83 +++++------ drivers/dma/dw-edma/dw-edma-v0-core.c | 41 ++--- drivers/dma/dw-edma/dw-edma-v0-core.h | 4 +- drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 18 +-- drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 8 +- drivers/pci/endpoint/functions/pci-epf-test.c | 108 ++++++++++++-- include/linux/dma/edma.h | 59 +++++++- 9 files changed, 313 insertions(+), 180 deletions(-)
Signature · 1 line
2.35.1
PATCH v11 1/8 dmaengine: dw-edma: Remove unused field irq in struct dw_edma_chip
irq of struct dw_edma_chip was never used.
It can be removed safely.
---
Change from v7 to v11
- None
Change from v6 to v7
- move to 1st patch
Change from v5 to v6
- s/remove/Remove/ at subject
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
@@ -231,7 +231,6 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev, chip->dw = dw; chip->dev = dev; chip->id = pdev->devfn; - chip->irq = pdev->irq; dw->mf = vsec_data.mf; dw->nr_irqs = nr_irqs;
include/linux/dma/edma.h +0 -2
@@ -18,13 +18,11 @@ struct dw_edma;* struct dw_edma_chip - representation of DesignWare eDMA controller hardware * @dev: struct device of the eDMA controller * @id: instance ID -* @irq: irq line * @dw: struct dw_edma that is filed by dw_edma_probe() */ struct dw_edma_chip {struct device *dev;int id; -int irq;struct dw_edma *dw; };
Signature · 1 line
2.35.1
PATCH v11 2/8 dmaengine: dw-edma: Detach the private data and chip info structures
In reply to Frank Li"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 v10 to v11
none
Change from v9 to v10
- add doc for dt_region_wr/dt_region_rd
Change from v8 to v9
- remove chip->ops check at dw_edma_irq_request()
Change from v7 to v8
- Check chip->ops at probe()
- use struct edma_dw at dw_edma_v0_debugfs_on/off()
Change from v6 to v7
- Move nr_irqs and chip->ops check into dw_edma_irq_request()
- Move dw->irq devm_kcalloc() into dw_edma_irq_request()
- Change dw->nr_irqs after request success
- Fix wrong use chip->nr_irqs when remove
Change from v5 to v6
- Don't touch chip->nr_irqs
- Don't set chip->dw utill everything is okay
- dw_edma_channel_setup() and dw_edma_v0_core_debugfs_on/off() methods take
dw_edma structure pointer as a parameter
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 | 90 +++++++++++++----------- drivers/dma/dw-edma/dw-edma-core.h | 31 +------- drivers/dma/dw-edma/dw-edma-pcie.c | 82 +++++++++------------ drivers/dma/dw-edma/dw-edma-v0-core.c | 32 ++++----- drivers/dma/dw-edma/dw-edma-v0-core.h | 4 +- drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 18 ++--- drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 8 +-- include/linux/dma/edma.h | 46 ++++++++++++ 8 files changed, 163 insertions(+), 148 deletions(-)
drivers/dma/dw-edma/dw-edma-core.c +49 -41
@@ -64,8 +64,8 @@ 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_chip *chip = desc->chan->dw->chip;struct dw_edma_chan *chan = desc->chan; -struct dw_edma *dw = chan->chip->dw;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,15 +686,15 @@ 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, +static int dw_edma_channel_setup (struct dw_edma *dw,bool write,u32 wr_alloc,u32 rd_alloc) { +struct dw_edma_chip *chip = dw->chip;struct dw_edma_region *dt_region;struct device *dev = chip->dev; -struct dw_edma *dw = chip->dw;struct dw_edma_chan *chan;struct dw_edma_irq *irq;struct dma_device *dma;
@@ -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,9 +735,9 @@ 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",
@@ -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);
@@ -827,11 +827,11 @@ static inline void dw_edma_add_irq_mask(u32 *mask, u32 alloc, u16 cnt) (*mask)++; } -static int dw_edma_irq_request (struct dw_edma_chip *chip, +static int dw_edma_irq_request (struct dw_edma *dw,u32 *wr_alloc,u32 *rd_alloc) { -struct device *dev = chip->dev; -struct dw_edma *dw = chip->dw; +struct dw_edma_chip *chip = dw->chip; +struct device *dev = dw->chip->dev;u32 wr_mask =1 ;u32 rd_mask =1 ;int i, err =0 ;
@@ -840,12 +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 || !chip->ops->irq_vector)return -EINVAL ; -if (dw->nr_irqs ==1 ) { + dw->irq =devm_kcalloc (dev, chip->nr_irqs,sizeof (*dw->irq),GFP_KERNEL ); +if (!dw->irq) +return -ENOMEM ; + +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) {
@@ -855,9 +859,11 @@ static int dw_edma_irq_request(struct dw_edma_chip *chip,if (irq_get_msi_desc (irq))get_cached_msi_msg (irq, &dw->irq[0 ].msi); + + dw->nr_irqs =1 ; }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 +874,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 :
@@ -902,20 +908,22 @@ int dw_edma_probe(struct dw_edma_chip *chip)return -EINVAL ; dev = chip->dev; -if (!dev) +if (!dev || !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 ; + + 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 );
@@ -937,17 +945,17 @@ int dw_edma_probe(struct dw_edma_chip *chip)dw_edma_v0_core_off (dw);/* Request IRQs */ - err =dw_edma_irq_request (chip, &wr_alloc, &rd_alloc); + err =dw_edma_irq_request (dw, &wr_alloc, &rd_alloc);if (err)return err;/* Setup write channels */ - err =dw_edma_channel_setup (chip, true, wr_alloc, rd_alloc); + err =dw_edma_channel_setup (dw, true, wr_alloc, rd_alloc);if (err) goto err_irq_free;/* Setup read channels */ - err =dw_edma_channel_setup (chip, false, wr_alloc, rd_alloc); + err =dw_edma_channel_setup (dw, false, wr_alloc, rd_alloc);if (err) goto err_irq_free;
@@ -955,15 +963,15 @@ int dw_edma_probe(struct dw_edma_chip *chip)pm_runtime_enable (dev);/* Turn debugfs on */ -dw_edma_v0_core_debugfs_on (chip); +dw_edma_v0_core_debugfs_on (dw); + + chip->dw = dw;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]); - - dw->nr_irqs =0 ; +free_irq (chip->ops->irq_vector (dev, i), &dw->irq[i]);return err; }
@@ -981,7 +989,7 @@ int dw_edma_remove(struct dw_edma_chip *chip)/* Free irqs */ for (i = (dw->nr_irqs -1 ); i >=0 ; i--) -free_irq (dw->ops->irq_vector (dev, i), &dw->irq[i]); +free_irq (chip->ops->irq_vector (dev, i), &dw->irq[i]);/* Power management */ pm_runtime_disable (dev);
@@ -1002,7 +1010,7 @@ int dw_edma_remove(struct dw_edma_chip *chip) }/* Turn debugfs off */ -dw_edma_v0_core_debugfs_off (chip); +dw_edma_v0_core_debugfs_off (dw);return 0 ; }
drivers/dma/dw-edma/dw-edma-core.h +3 -28
@@ -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,14 @@ 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
143 lines not on this page · raw message
drivers/dma/dw-edma/dw-edma-v0-core.c +16 -16
@@ -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,
@@ -435,7 +435,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 */
@@ -505,12 +505,12 @@ int dw_edma_v0_core_device_config(struct dw_edma_chan *chan) }/* eDMA debugfs callbacks */ -void dw_edma_v0_core_debugfs_on (struct dw_edma_chip *chip) +void dw_edma_v0_core_debugfs_on (struct dw_edma *dw) { -dw_edma_v0_debugfs_on (chip); +dw_edma_v0_debugfs_on (dw); } -void dw_edma_v0_core_debugfs_off (struct dw_edma_chip *chip) +void dw_edma_v0_core_debugfs_off (struct dw_edma *dw) { -dw_edma_v0_debugfs_off (chip); +dw_edma_v0_debugfs_off (dw); }
drivers/dma/dw-edma/dw-edma-v0-core.h +2 -2
@@ -22,7 +22,7 @@ u32 dw_edma_v0_core_status_abort_int(struct dw_edma *chan, enum dw_edma_dir dir)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);/* eDMA debug fs callbacks */ -void dw_edma_v0_core_debugfs_on (struct dw_edma_chip *chip); -void dw_edma_v0_core_debugfs_off (struct dw_edma_chip *chip); +void dw_edma_v0_core_debugfs_on (struct dw_edma *dw); +void dw_edma_v0_core_debugfs_off (struct dw_edma *dw);#endif /* _DW_EDMA_V0_CORE_H */
drivers/dma/dw-edma/dw-edma-v0-debugfs.c +9 -9
@@ -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);
@@ -282,13 +282,13 @@ static void dw_edma_debugfs_regs(void)dw_edma_debugfs_regs_rd (regs_dir); } -void dw_edma_v0_debugfs_on (struct dw_edma_chip *chip) +void dw_edma_v0_debugfs_on (struct dw_edma *_dw) { - dw = chip->dw; + dw = _dw;if (!dw)return ; - regs = dw->rg_region.vaddr; + regs = dw->chip->rg_region.vaddr;if (!regs)return ;
@@ -296,16 +296,16 @@ 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);dw_edma_debugfs_regs (); } -void dw_edma_v0_debugfs_off (struct dw_edma_chip *chip) +void dw_edma_v0_debugfs_off (struct dw_edma *_dw) { - dw = chip->dw; + dw = _dw;if (!dw)return ;
drivers/dma/dw-edma/dw-edma-v0-debugfs.h +4 -4
@@ -12,14 +12,14 @@#include <linux/dma/edma.h> #ifdef CONFIG_DEBUG_FS -void dw_edma_v0_debugfs_on (struct dw_edma_chip *chip); -void dw_edma_v0_debugfs_off (struct dw_edma_chip *chip); +void dw_edma_v0_debugfs_on (struct dw_edma *dw); +void dw_edma_v0_debugfs_off (struct dw_edma *dw);#else -static inline void dw_edma_v0_debugfs_on (struct dw_edma_chip *chip) +static inline void dw_edma_v0_debugfs_on (struct dw_edma *dw) { } -static inline void dw_edma_v0_debugfs_off (struct dw_edma_chip *chip) +static inline void dw_edma_v0_debugfs_off (struct dw_edma *dw) { }#endif /* CONFIG_DEBUG_FS */
include/linux/dma/edma.h +46 -0
63 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v11 3/8 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 information. But only virtual address is used by EDMA driver. Change it to void __iomem *reg_base to clean up code.
---
Change from v6 to v11:
- none
Change from v5 to v6:
-s/change/Change at subject
New patch at 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 *_dw)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
@@ -55,7 +56,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.35.1
PATCH v11 4/8 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 available in ll_region_wr(rd)[EDMA_MAX_WR_CH]. So rename it to ll_wr(rd)_cnt to indicate actual usage.
---
Change from v10 to v11
- none
Change from v9 to v10
- Change comment for ll_wr(rd)_cnt
Change from v6 to v9
- none
Change from v5 to v6
- s/rename/Rename/ at subject
new patch at 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
@@ -919,11 +919,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 count +* @ll_rd_cnt DMA read link list count * @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
@@ -58,8 +58,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.35.1
PATCH v11 5/8 dmaengine: dw-edma: Drop dma_slave_config.direction field usage
In reply to Frank LiFrom: Serge Semin <[email protected]>
The dma_slave_config.direction field usage in the DW eDMA driver has been introduced in the commit bd96f1b2f43a ("dmaengine: dw-edma: support local dma device transfer semantics"). Mainly the change introduced there was correct (indeed DEV_TO_MEM means using RD-channel and MEM_TO_DEV - WR-channel for the case of having eDMA accessed locally from CPU/Application side), but providing an additional MEM_TO_MEM/DEV_TO_DEV-based semantics was quite redundant if not to say potentially harmful (when it comes to removing the denoted field). First of all since the dma_slave_config.direction field has been marked as obsolete (see [1] and the structure dc [2]) and will be discarded in future, using it especially in a non-standard way is discouraged. Secondly in accordance with the commit denoted above the default dw_edma_device_transfer() semantics has been changed despite what it's message said. So claiming that the method was left backward compatible was wrong.
Anyway let's fix the problems denoted above and simplify the dw_edma_device_transfer() method by dropping the parsing of the DMA-channel direction field. Instead of having that implicit dma_slave_config.direction field semantic we can use the recently added DW_EDMA_CHIP_LOCAL flag to distinguish between the local and remote DW eDMA setups thus preserving both cases support. In addition to that an ASCII-figure has been added to clarify the complication out.
[1] Documentation/driver-api/dmaengine/provider.rst
[2] include/linux/dmaengine.h: dma_slave_config.direction
--- drivers/dma/dw-edma/dw-edma-core.c | 49 +++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 15 deletions(-)
drivers/dma/dw-edma/dw-edma-core.c +34 -15
@@ -340,21 +340,40 @@ 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 ; -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 ; +/* +* Local Root Port/End-point Remote End-point +* +-----------------------+ PCIe bus +----------------------+ +* | | +-+ | | +* | DEV_TO_MEM Rx Ch <----+ +---+ Tx Ch DEV_TO_MEM | +* | | | | | | +* | MEM_TO_DEV Tx Ch +----+ +---> Rx Ch MEM_TO_DEV | +* | | +-+ | | +* +-----------------------+ +----------------------+ +* +* 1. Normal logic: +* If eDMA is embedded into the DW PCIe RP/EP and controlled from the +* CPU/Application side, the Rx channel (EDMA_DIR_READ) will be used +* for the device read operations (DEV_TO_MEM) and the Tx channel +* (EDMA_DIR_WRITE) - for the write operations (MEM_TO_DEV). +* +* 2. Inverted logic: +* If eDMA is embedded into a Remote PCIe EP and is controlled by the +* MWr/MRd TLPs sent from the CPU's PCIe host controller, the Tx +* channel (EDMA_DIR_WRITE) will be used for the device read operations +* (DEV_TO_MEM) and the Rx channel (EDMA_DIR_READ) - for the write +* operations (MEM_TO_DEV). +* +* It is the client driver responsibility to choose a proper channel +* for the DMA transfers. +*/ +if (chan->dw->chip->flags &DW_EDMA_CHIP_LOCAL ) { +if ((chan->dir ==EDMA_DIR_READ && dir !=DMA_DEV_TO_MEM ) || + (chan->dir ==EDMA_DIR_WRITE && dir !=DMA_MEM_TO_DEV )) +return NULL ; + }else { +if ((chan->dir ==EDMA_DIR_WRITE && dir !=DMA_DEV_TO_MEM ) || + (chan->dir ==EDMA_DIR_READ && dir !=DMA_MEM_TO_DEV )) +return NULL ; }if (xfer->type ==EDMA_XFER_CYCLIC ) {
Signature · 1 line
2.35.1
PATCH v11 6/8 dmaengine: dw-edma: Fix eDMA Rd/Wr-channels and DMA-direction semantics
In reply to Frank LiFrom: Serge Semin <[email protected]>
In accordance with [1, 2] the DW eDMA controller has been created to be part of the DW PCIe Root Port and DW PCIe End-point controllers and to offload the transferring of large blocks of data between application and remote PCIe domains leaving the system CPU free for other tasks. In the first case (eDMA being part of DW PCIe Root Port) the eDMA controller is always accessible via the CPU DBI interface and never over the PCIe wire. The later case is more complex. Depending on the DW PCIe End-Point IP-core synthesize parameters it's possible to have the eDMA registers accessible not only from the application CPU side, but also via mapping the eDMA CSRs over a dedicated end-point BAR. So based on the specifics denoted above the eDMA driver is supposed to support two types of the DMA controller setups:
1) eDMA embedded into the DW PCIe Root Port/End-point and accessible over the local CPU from the application side.
2) eDMA embedded into the DW PCIe End-point and accessible via the PCIe wire with MWr/MRd TLPs generated by the CPU PCIe host controller. Since the CPU memory resides different sides in these cases the semantics of the MEM_TO_DEV and DEV_TO_MEM operations is flipped with respect to the Tx and Rx DMA channels. So MEM_TO_DEV/DEV_TO_MEM corresponds to the Tx/Rx channels in setup 1) and to the Rx/Tx channels in case of setup 2).
The DW eDMA driver has supported the case 2) since the initial commit e63d79d1ffcd ("dmaengine: Add Synopsys eDMA IP core driver") in the framework of the drivers/dma/dw-edma/dw-edma-pcie.c driver. The case 1) support was added a bit later in commit bd96f1b2f43a ("dmaengine: dw-edma:
support local dma device transfer semantics"). Afterwards the driver was supposed to cover the both possible eDMA setups, but the later commit turned to be not fully correct. The problem was that the commit together with the new functionality support also changed the channel direction semantics in a way so the eDMA Read-channel (corresponding to the DMA_DEV_TO_MEM direction for the case 1.) now uses the sgl/cyclic base addresses as the Source addresses of the DMA-transfers and dma_slave_config.dst_addr as the Destination address of the DMA-transfers. Similarly the eDMA Write-channel (corresponding to the DMA_MEM_TO_DEV direction for case 1.) now utilizes dma_slave_config.src_addr as a source address of the DMA-transfers and sgl/cyclic base address as the Destination address of the DMA-transfers. This contradicts to the logic of the DMA-interface, which implies that DEV side is supposed to belong to the PCIe device memory and MEM - to the CPU/Application memory. Indeed it seems irrational to have the SG-list defined in the PCIe bus space, while expecting a contiguous buffer allocated in the CPU memory. Moreover the passed SG-list and cyclic DMA buffers are supposed to be mapped in a way so to be seen by the DW eDMA Application (CPU) interface. So in order to have the correct DW eDMA interface we need to invert the eDMA Rd/Wr-channels and DMA-slave directions semantics by selecting the src/dst addresses based on the DMA transfer direction instead of using the channel direction capability.
[1] DesignWare Cores PCI Express Controller Databook - DWC PCIe Root Port, v.5.40a, March 2019, p.1092
[2] DesignWare Cores PCI Express Controller Databook - DWC PCIe Endpoint, v.5.40a, March 2019, p.1189
--- drivers/dma/dw-edma/dw-edma-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/dw-edma/dw-edma-core.c +1 -1
@@ -443,7 +443,7 @@ 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 ) { +if (dir ==DMA_DEV_TO_MEM ) { burst->sar = src_addr;if (xfer->type ==EDMA_XFER_CYCLIC ) { burst->dar = xfer->xfer.cyclic.paddr;
Signature · 1 line
2.35.1
PATCH v11 7/8 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 v7 to v11
-none
Change from v6 to v7
- dw_edma_chip_flags to u32
Change from v5 to v6
- use enum instead of define
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 | 10 ++++++++++ 2 files changed, 16 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 +10 -0
@@ -33,12 +33,21 @@ enum dw_edma_map_format { EDMA_MF_HDMA_COMPAT = 0x5 }; +/** +* enum dw_edma_chip_flags - Flags specific to an eDMA chip +* @DW_EDMA_CHIP_LOCAL: eDMA is used locally by an endpoint +*/ +enum dw_edma_chip_flags { +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_flags * @reg_base DMA register base address * @ll_wr_cnt DMA write link list count * @ll_rd_cnt DMA read link list count
@@ -55,6 +64,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.35.1
PATCH v11 8/8 PCI: endpoint: Enable DMA tests for endpoints with DMA capabilities
In reply to Frank LiSome PCI Endpoints controllers integrate an eDMA (embedded DMA). eDMA only sends once a bus read/write command to complete once data transfer. eDMA can bypass the outbound memory address translation unit to access all RC memory space.
Add DMA support for pci-epf-test.
EPF test can use, depending on HW availability, eDMA or general system DMA controllers to perform DMA. The test probes the EPF DMA channel capabilities.
Separate dma_chan to dma_chan_tx and dma_chan_rx. eDMA channels have higher priority than general DMA channels. If general memory to memory DMA hannels are used, dma_chan_rx = dma_chan_tx.
Add dma_addr_t dma_remote in function pci_epf_test_data_transfer() because eDMA using remote RC physical address directly
Add enum dma_transfer_direction dir in function pci_epf_test_data_transfer() because eDMA chooses the correct RX/TX channel by dir.
The overall steps are
1. Execute dma_request_channel() and filter function to find correct eDMA RX and TX Channel. If a channel does not exist, fallback to try to allocate general memory to memory DMA channel.
2. Execute dmaengine_slave_config() to configure remote side physical address.
3. Execute dmaengine_prep_slave_single() to create transfer descriptor.
4. Execute tx_submit().
5. Execute dma_async_issue_pending()
---
Change from v10 to v11:
- rewrite commit message
Change from v9 to v10:
- rewrite commit message
Change from v4 to v9:
- 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.35.1
Re: [PATCH v11 8/8] PCI: endpoint: Enable DMA tests for endpoints with DMA capabilities
Quoted 4 lines · Frank Li
Some PCI Endpoints controllers integrate an eDMA (embedded DMA). eDMA only sends once a bus read/write command to complete once data transfer. eDMA can bypass the outbound memory address translation unit to access all RC memory space.
s/Endpoints/Endpoint/
I'm not sure what "only sends once a command to complete once transfer" means or why it is revelant here. I guess it just means "the eDMA controller issues a single bus command per data transfer"?
Quoted 1 line
Add DMA support for pci-epf-test.
It looks like pci-epf-test.c already *has* DMA support, but you're adding support for separate RX and TX DMA channels.
Quoted 6 lines
EPF test can use, depending on HW availability, eDMA or general system DMA controllers to perform DMA. The test probes the EPF DMA channel capabilities.
Separate
dma_chantodma_chan_txanddma_chan_rx. eDMA channels have higher priority than general DMA channels.
I think the "priority" you refer to is merely that the *test* uses eDMA channels if present, not that there's any actual hardware priority involved here, right?
Quoted 2 lines
If general memory to memory
DMA hannels are used,dma_chan_rx=dma_chan_tx.
s/hannels/channels/
Quoted 2 lines
Add
dma_addr_tdma_remotein functionpci_epf_test_data_transfer()because eDMA using remote RC physical address directly
s/function pci_epf_test_data_transfer()/pci_epf_test_data_transfer()/ s/eDMA using/eDMA uses/
s/directly/directly./
(No need to specify "function" since the parens make it obvious that pci_epf_test_data_transfer() is a function. Same thing below.)
Quoted 8 lines
Add enum
dma_transfer_directiondir in functionpci_epf_test_data_transfer()because eDMA chooses the correct RX/TX channel by dir.The overall steps are
1. Execute
dma_request_channel()and filter function to find correct eDMA RX and TX Channel. If a channel does not exist, fallback to try to allocate general memory to memory DMA channel.
s/exist, /exist, / remove extra space
s/memory DMA /memory DMA / remove extra space again
Quoted 1 line
2. Execute
dmaengine_slave_config()to configure remote side physical address.
Rewrap to fit in 75 columns.
Quoted 43 lines
3. Execute
dmaengine_prep_slave_single()to create transfer descriptor.
4. Executetx_submit().
5. Executedma_async_issue_pending()Signed-off-by Frank Li <[email protected]>---
Change from v10 to v11:
- rewrite commit message
Change from v9 to v10:
- rewrite commit message
Change from v4 to v9:
- 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 ofdmaengine_slave_config()
Change from v1 to v2:
- nonedrivers/pci/endpoint/functions/pci-epf-test.c | 108 ++++++++++++++++-- 1 file changed, 98 insertions(+), 10 deletions(-)drivers/pci/endpoint/functions/pci-epf-test.c +3
-1@@ -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; };
drivers/pci/endpoint/functions/pci-epf-test.c static void pci_epf_test_dma_callback(void *param) · line 111
Quoted 6 lines
drivers/pci/endpoint/functions/pci-epf-test.c +2
-1@@ -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)
Please update the kernel-doc for these two new parameters. You can use:
$ make W=1 drivers/pci/endpoint/functions/
to find errors like this.
Quoted 76 lines
drivers/pci/endpoint/functions/pci-epf-test.c +45
-2{ +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" );
drivers/pci/endpoint/functions/pci-epf-test.c static int pci_epf_test_init_dma_chan(struct pci_epf_test *epf_test) · line 220
Quoted 10 lines
drivers/pci/endpoint/functions/pci-epf-test.c +10
-0+ 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" );
These messages should indicate whether the failure was for the DEV_TO_MEM channel or the MEM_TO_DEV channel. Otherwise the failure looks the same to the user.
Quoted 74 lines
drivers/pci/endpoint/functions/pci-epf-test.c +36
-5+ 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);
drivers/pci/endpoint/functions/pci-epf-test.c static int pci_epf_test_write(struct pci_epf_test *epf_test) · line 545
Quoted 7 lines
drivers/pci/endpoint/functions/pci-epf-test.c +2
-1@@ -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 );
Wrap to fit in 80 columns, like the rest of the file. There are a couple other cases above (the dev_info() cases are fine since we don't want to split info/error message strings).
Quoted 6 lines
drivers/pci/endpoint/functions/pci-epf-test.c +0
-0if (ret)dev_err (dev,"Data transfer failed\n" );ktime_get_ts64 (&end);Signature · 1 line
2.35.1
Re: [PATCH v11 8/8] PCI: endpoint: Enable DMA tests for endpoints with DMA capabilities
Quoted 9 lines · Bjorn Helgaas
Quoted 4 lines · Frank Li
Some PCI Endpoints controllers integrate an eDMA (embedded DMA). eDMA only sends once a bus read/write command to complete once data transfer. eDMA can bypass the outbound memory address translation unit to access all RC memory space.
s/Endpoints/Endpoint/
Quoted 8 lines
I'm not sure what "only sends once a command to complete once transfer" means or why it is revelant here. I guess it just means "the eDMA controller issues a single bus command per data transfer"?
Quoted 1 line
Add DMA support for pci-epf-test.
It looks like
pci-epf-test.calready *has* DMA support, but you're adding support for separate RX and TX DMA channels.
pci-epf-test already has memory to memory DMA support. I added eDMA support.
Quoted 11 lines
Quoted 7 lines
EPF test can use, depending on HW availability, eDMA or general system DMA controllers to perform DMA. The test probes the EPF DMA channel capabilities.
Separate
dma_chantodma_chan_txanddma_chan_rx. eDMA channels have higher priority than general DMA channels.I think the "priority" you refer to is merely that the *test* uses eDMA channels if present, not that there's any actual hardware priority involved here, right?
Yes, choose EDMA channel first if it exists, then choose memory to memory dma channel.
Quoted 25 lines
Quoted 3 lines
If general memory to memory
DMA hannels are used,dma_chan_rx=dma_chan_tx.s/hannels/channels/
Quoted 2 lines
Add
dma_addr_tdma_remotein functionpci_epf_test_data_transfer()because eDMA using remote RC physical address directlys/function pci_epf_test_data_transfer()/pci_epf_test_data_transfer()/ s/eDMA using/eDMA uses/
s/directly/directly./(No need to specify "function" since the parens make it obvious that
pci_epf_test_data_transfer()is a function. Same thing below.)Quoted 8 lines
Add enum
dma_transfer_directiondir in functionpci_epf_test_data_transfer()because eDMA chooses the correct RX/TX channel by dir.The overall steps are
1. Execute
dma_request_channel()and filter function to find correct eDMA RX and TX Channel. If a channel does not exist, fallback to try to allocate general memory to memory DMA channel.
Quoted 14 lines
s/exist, /exist, / remove extra space
s/memory DMA /memory DMA / remove extra space againQuoted 1 line
2. Execute
dmaengine_slave_config()to configure remote side physical address.Rewrap to fit in 75 columns.
Quoted 7 lines
3. Execute
dmaengine_prep_slave_single()to create transfer descriptor.
4. Executetx_submit().
5. Executedma_async_issue_pending()Signed-off-by Frank Li <[email protected]>---
Bjorn: Are you satisfied with the below message? I will fix the other code in the next version.
Some PCI Endpoint controllers integrate an eDMA (embedded DMA). The eDMA controller issues a single bus command per data transfer. eDMA can bypass the outbound memory address translation unit to access all RC memory space.
Add eDMA support for pci-epf-test.
EPF test can use, depending on HW availability, eDMA or general system DMA controllers to perform DMA. The test probes the EPF DMA channel capabilities.
Separate dma_chan to dma_chan_tx and dma_chan_rx. Search eDMA channel firstly, then search memory to memory DMA channel if eDMA does not exist. If general memory to memory channels are used, dma_chan_rx = dma_chan_tx.
Add dma_addr_t dma_remote in pci_epf_test_data_transfer() because eDMA uses remote RC physical address directly.
Add enum dma_transfer_direction dir in pci_epf_test_data_transfer() because eDMA chooses the correct RX/TX channel by dir.
The overall steps are
1. Execute dma_request_channel() and filter function to find correct eDMA RX and TX Channel. If a channel does not exist, fallback to try to allocate general memory to memory DMA channel.
2. Execute dmaengine_slave_config() to configure remote side physical address.
3. Execute dmaengine_prep_slave_single() to create transfer descriptor.
4. Execute tx_submit().
5. Execute dma_async_issue_pending()
Quoted 233 lines
Quoted 36 lines
Change from v10 to v11:
- rewrite commit message
Change from v9 to v10:
- rewrite commit message
Change from v4 to v9:
- 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 ofdmaengine_slave_config()
Change from v1 to v2:
- nonedrivers/pci/endpoint/functions/pci-epf-test.c | 108 ++++++++++++++++-- 1 file changed, 98 insertions(+), 10 deletions(-)drivers/pci/endpoint/functions/pci-epf-test.c +3
-1@@ -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; };drivers/pci/endpoint/functions/pci-epf-test.c static void pci_epf_test_dma_callback(void *param) · line 111
Quoted 6 lines
drivers/pci/endpoint/functions/pci-epf-test.c +2
-1@@ -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)Please update the kernel-doc for these two new parameters. You can use:
$ make W=1 drivers/pci/endpoint/functions/to find errors like this.
Quoted 76 lines
drivers/pci/endpoint/functions/pci-epf-test.c +45
-2{ +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" );drivers/pci/endpoint/functions/pci-epf-test.c static int pci_epf_test_init_dma_chan(struct pci_epf_test *epf_test) · line 220
Quoted 10 lines
drivers/pci/endpoint/functions/pci-epf-test.c +10
-0+ 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" );These messages should indicate whether the failure was for the
DEV_TO_MEMchannel or theMEM_TO_DEVchannel. Otherwise the failure looks the same to the user.Quoted 74 lines
drivers/pci/endpoint/functions/pci-epf-test.c +36
-5+ 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);drivers/pci/endpoint/functions/pci-epf-test.c static int pci_epf_test_write(struct pci_epf_test *epf_test) · line 545
Quoted 7 lines
drivers/pci/endpoint/functions/pci-epf-test.c +2
-1@@ -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 );Wrap to fit in 80 columns, like the rest of the file. There are a couple other cases above (the
dev_info()cases are fine since we don't want to split info/error message strings).Quoted 6 lines
drivers/pci/endpoint/functions/pci-epf-test.c +0
-1if (ret)dev_err (dev,"Data transfer failed\n" );ktime_get_ts64 (&end); --2.35.1
Re: [PATCH v11 8/8] PCI: endpoint: Enable DMA tests for endpoints with DMA capabilities
Quoted 2 lines · Zhi Li
Bjorn: Are you satisfied with the below message? I will fix the other code in the next version.
Looks good, minor questions and tweaks below:
Quoted 2 lines
Some PCI Endpoint controllers integrate an eDMA (embedded DMA). The eDMA controller issues a single bus command per data transfer.
Still not sure why this sentence is here. Is it something the patch relies on? Why does it matter how many bus commands there are?
Quoted 8 lines
eDMA can bypass the outbound memory address translation unit to access all RC memory space.
Add eDMA support for pci-epf-test.
EPF test can use, depending on HW availability, eDMA or general system DMA controllers to perform DMA. The test probes the EPF DMA channel capabilities.
Depending on HW availability, the EPF test can use either eDMA or general system DMA controllers to perform DMA. The test tries to use eDMA first and falls back to general system DMA controllers if there's no eDMA.
Quoted 3 lines
Separate
dma_chantodma_chan_txanddma_chan_rx. Search eDMA channel firstly, then search memory to memory DMA channel if eDMA does not exist. If general memory to memory channels are used,dma_chan_rx=dma_chan_tx.
Search for an eDMA channel first, then search for a memory-to-memory DMA channel ...
Quoted 16 lines
Add
dma_addr_tdma_remoteinpci_epf_test_data_transfer()because eDMA uses remote RC physical address directly.Add enum
dma_transfer_directiondir inpci_epf_test_data_transfer()because eDMA chooses the correct RX/TX channel by dir.The overall steps are
1. Execute
dma_request_channel()and filter function to find correct eDMA RX and TX Channel. If a channel does not exist, fallback to try to allocate general memory to memory DMA channel.
2. Executedmaengine_slave_config()to configure remote side physical address.
3. Executedmaengine_prep_slave_single()to create transfer descriptor.
4. Executetx_submit().
5. Executedma_async_issue_pending()
Re: [PATCH v11 8/8] PCI: endpoint: Enable DMA tests for endpoints with DMA capabilities
Quoted 6 lines · Bjorn Helgaas
Quoted 2 lines · Zhi Li
Bjorn: Are you satisfied with the below message? I will fix the other code in the next version.
Quoted 7 lines
Looks good, minor questions and tweaks below:
Quoted 2 lines
Some PCI Endpoint controllers integrate an eDMA (embedded DMA). The eDMA controller issues a single bus command per data transfer.
Still not sure why this sentence is here. Is it something the patch relies on? Why does it matter how many bus commands there are?
Okay, let me remove this line in the next version.
Quoted 38 lines
Quoted 9 lines
eDMA can bypass the outbound memory address translation unit to access all RC memory space.
Add eDMA support for pci-epf-test.
EPF test can use, depending on HW availability, eDMA or general system DMA controllers to perform DMA. The test probes the EPF DMA channel capabilities.
Depending on HW availability, the EPF test can use either eDMA or general system DMA controllers to perform DMA. The test tries to use eDMA first and falls back to general system DMA controllers if there's no eDMA.
Quoted 3 lines
Separate
dma_chantodma_chan_txanddma_chan_rx. Search eDMA channel firstly, then search memory to memory DMA channel if eDMA does not exist. If general memory to memory channels are used,dma_chan_rx=dma_chan_tx.Search for an eDMA channel first, then search for a memory-to-memory DMA channel ...
Quoted 16 lines
Add
dma_addr_tdma_remoteinpci_epf_test_data_transfer()because eDMA uses remote RC physical address directly.Add enum
dma_transfer_directiondir inpci_epf_test_data_transfer()because eDMA chooses the correct RX/TX channel by dir.The overall steps are
1. Execute
dma_request_channel()and filter function to find correct eDMA RX and TX Channel. If a channel does not exist, fallback to try to allocate general memory to memory DMA channel.
2. Executedmaengine_slave_config()to configure remote side physical address.
3. Executedmaengine_prep_slave_single()to create transfer descriptor.
4. Executetx_submit().
5. Executedma_async_issue_pending()
Re: [PATCH v11 8/8] PCI: endpoint: Enable DMA tests for endpoints with DMA capabilities
In reply to Frank LiQuoted 31 lines · Frank Li
Some PCI Endpoints controllers integrate an eDMA (embedded DMA). eDMA only sends once a bus read/write command to complete once data transfer. eDMA can bypass the outbound memory address translation unit to access all RC memory space.
Add DMA support for pci-epf-test.
EPF test can use, depending on HW availability, eDMA or general system DMA controllers to perform DMA. The test probes the EPF DMA channel capabilities.
Separate
dma_chantodma_chan_txanddma_chan_rx. eDMA channels have higher priority than general DMA channels. If general memory to memory DMA hannels are used,dma_chan_rx=dma_chan_tx.Add
dma_addr_tdma_remotein functionpci_epf_test_data_transfer()because eDMA using remote RC physical address directlyAdd enum
dma_transfer_directiondir in functionpci_epf_test_data_transfer()because eDMA chooses the correct RX/TX channel by dir.The overall steps are
1. Execute
dma_request_channel()and filter function to find correct eDMA RX and TX Channel. If a channel does not exist, fallback to try to allocate general memory to memory DMA channel.
2. Executedmaengine_slave_config()to configure remote side physical address.
3. Executedmaengine_prep_slave_single()to create transfer descriptor.
4. Executetx_submit().
5. Executedma_async_issue_pending()
Quoted 2 lines
Signed-off-by Frank Li <[email protected]>
Quoted 213 lines
---
Change from v10 to v11:
- rewrite commit message
Change from v9 to v10:
- rewrite commit message
Change from v4 to v9:
- 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 ofdmaengine_slave_config()
Change from v1 to v2:
- nonedrivers/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);
Hello Vinod,
Quoted 20 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
flags (this patch removed at v11 because dma tree already have fixed patch)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
Quoted 7 lines
4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: Add embedded DMA controller test5. 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
The series has been hanging out on review for over three months now. It has got to v11 and has been tested on at least two platforms. The original driver maintainer has been silent for all that time (most likely Gustavo dropped the driver maintaining role). Could you please merge it in seeing no comments have been posted for the last several weeks? The PCI Host/EP controller drivers maintainer suggested to get this series via the DMA-engine tree:
https://lore.kernel.org/linux-pci/YnqlRShJzvma2SKM@lpieralisi/
which is obviously right seeing it mainly concerns the DW eDMA driver. Though after that Lorenzo disappeared as quickly as popped up.)
There is one more series depending on the changes in this patchset:
https://lore.kernel.org/linux-pci/[email protected]/
Me and Frank already settled all the conflicts and inter-dependencies, so at least his series is more than ready to be merged in into the kernel repo. It would be very good to get it accepted on this merge window so to have the kernel v5.19 with all this changes available.
-Sergey
Quoted 4 lines
Signature · 2 lines
-- 2.35.1
Quoted 42 lines · Serge Semin
Hello Vinod,
Quoted 20 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
flags (this patch removed at v11 because dma tree already have fixed patch)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" memberQuoted 7 lines
4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: Add embedded DMA controller test5. 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/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097The series has been hanging out on review for over three months now. It has got to v11 and has been tested on at least two platforms. The original driver maintainer has been silent for all that time (most likely Gustavo dropped the driver maintaining role). Could you please merge it in seeing no comments have been posted for the last several weeks? The PCI Host/EP controller drivers maintainer suggested to get this series via the DMA-engine tree:
https://lore.kernel.org/linux-pci/YnqlRShJzvma2SKM@lpieralisi/
which is obviously right seeing it mainly concerns the DW eDMA driver. Though after that Lorenzo disappeared as quickly as popped up.)
Quoted 7 lines
There is one more series depending on the changes in this patchset:
https://lore.kernel.org/linux-pci/[email protected]/
Me and Frank already settled all the conflicts and inter-dependencies, so at least his series is more than ready to be merged in into the kernel repo. It would be very good to get it accepted on this merge window so to have the kernel v5.19 with all this changes available.
Since the v5.19 merge window is already open, it seems doubtful that anybody would merge this so late in the cycle.
If Gustavo isn't available or willing to merge it, it looks like Vinod (maintainer of drivers/dma) would be the next logical candidate.
I suspect Vinod would appreciate an ack or reviewed-by from Kishon for the last patch because he maintains pci-epf-test.c.
I have a couple trivial comments on the pci-epf-test.c (I'll respond there), but I'm not qualified to ack it.
Bjorn
Quoted 52 lines · Bjorn Helgaas
Quoted 42 lines · Serge Semin
Hello Vinod,
Quoted 20 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
flags (this patch removed at v11 because dma tree already have fixed patch)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" memberQuoted 7 lines
4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: Add embedded DMA controller test5. 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/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097The series has been hanging out on review for over three months now. It has got to v11 and has been tested on at least two platforms. The original driver maintainer has been silent for all that time (most likely Gustavo dropped the driver maintaining role). Could you please merge it in seeing no comments have been posted for the last several weeks? The PCI Host/EP controller drivers maintainer suggested to get this series via the DMA-engine tree:
https://lore.kernel.org/linux-pci/YnqlRShJzvma2SKM@lpieralisi/
which is obviously right seeing it mainly concerns the DW eDMA driver. Though after that Lorenzo disappeared as quickly as popped up.)Quoted 7 lines
There is one more series depending on the changes in this patchset:
https://lore.kernel.org/linux-pci/[email protected]/
Me and Frank already settled all the conflicts and inter-dependencies, so at least his series is more than ready to be merged in into the kernel repo. It would be very good to get it accepted on this merge window so to have the kernel v5.19 with all this changes available.
Quoted 5 lines
Since the v5.19 merge window is already open, it seems doubtful that anybody would merge this so late in the cycle.
If Gustavo isn't available or willing to merge it, it looks like Vinod (maintainer of
drivers/dma) would be the next logical candidate.
I think the last patch should not block other patches from merging. The last patch about pci-epf-test.c is totally independent from other patches.
I prefer to merge all the dma patches first.
best regards
Frank Li
Quoted 8 lines
I suspect Vinod would appreciate an ack or reviewed-by from Kishon for the last patch because he maintains
pci-epf-test.c.I have a couple trivial comments on the
pci-epf-test.c(I'll respond there), but I'm not qualified to ack it.Bjorn
Quoted 55 lines · Zhi Li
Quoted 54 lines · Bjorn Helgaas
Quoted 42 lines · Serge Semin
Hello Vinod,
Quoted 20 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
flags (this patch removed at v11 because dma tree already have fixed patch)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" memberQuoted 7 lines
4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: Add embedded DMA controller test5. 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/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097The series has been hanging out on review for over three months now. It has got to v11 and has been tested on at least two platforms. The original driver maintainer has been silent for all that time (most likely Gustavo dropped the driver maintaining role). Could you please merge it in seeing no comments have been posted for the last several weeks? The PCI Host/EP controller drivers maintainer suggested to get this series via the DMA-engine tree:
https://lore.kernel.org/linux-pci/YnqlRShJzvma2SKM@lpieralisi/
which is obviously right seeing it mainly concerns the DW eDMA driver. Though after that Lorenzo disappeared as quickly as popped up.)Quoted 7 lines
There is one more series depending on the changes in this patchset:
https://lore.kernel.org/linux-pci/[email protected]/
Me and Frank already settled all the conflicts and inter-dependencies, so at least his series is more than ready to be merged in into the kernel repo. It would be very good to get it accepted on this merge window so to have the kernel v5.19 with all this changes available.Since the v5.19 merge window is already open, it seems doubtful that anybody would merge this so late in the cycle.
Quoted 7 lines
Quoted 2 lines
If Gustavo isn't available or willing to merge it, it looks like Vinod (maintainer of
drivers/dma) would be the next logical candidate.I think the last patch should not block other patches from merging. The last patch about
pci-epf-test.cis totally independent from other patches.I prefer to merge all the dma patches first.
Absolutely.
Given an ack from Kishon, it would make sense for Vinod to merge them all together since they're logically related, but I have no objection to merging any of the drivers/dma patches separately.
Bjorn
Hi Bjorn
Quoted 54 lines · Bjorn Helgaas
Quoted 52 lines · Zhi Li
Quoted 51 lines · Bjorn Helgaas
Quoted 49 lines · Serge Semin
Hello Vinod,
Quoted 20 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
flags (this patch removed at v11 because dma tree already have fixed patch)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" memberQuoted 7 lines
4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: Add embedded DMA controller test5. 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/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097The series has been hanging out on review for over three months now. It has got to v11 and has been tested on at least two platforms. The original driver maintainer has been silent for all that time (most likely Gustavo dropped the driver maintaining role). Could you please merge it in seeing no comments have been posted for the last several weeks? The PCI Host/EP controller drivers maintainer suggested to get this series via the DMA-engine tree:
https://lore.kernel.org/linux-pci/YnqlRShJzvma2SKM@lpieralisi/
which is obviously right seeing it mainly concerns the DW eDMA driver. Though after that Lorenzo disappeared as quickly as popped up.)There is one more series depending on the changes in this patchset:
https://lore.kernel.org/linux-pci/[email protected]/
Me and Frank already settled all the conflicts and inter-dependencies, so at least his series is more than ready to be merged in into the kernel repo. It would be very good to get it accepted on this merge window so to have the kernel v5.19 with all this changes available.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Since the v5.19 merge window is already open, it seems doubtful that anybody would merge this so late in the cycle.
In this case it would be safer to merge this whole series through your repo. See my series:
"[PATCH v2 00/26] dmaengine: dw-edma: Add RP/EP local DMA controllers support"
https://lore.kernel.org/linux-pci/[email protected]/
depends in the Frank' patchset. Meanwhile my patchset is also based on the DW PCIe modifications introduced in the set of the series:
"[PATCH v2 00/17] PCI: dwc: Add dma-ranges/YAML-schema/Baikal-T1 support"
https://lore.kernel.org/linux-pci/[email protected]/
and
"[PATCH v3 00/13] PCI: dwc: Various fixes and cleanups"
https://lore.kernel.org/linux-pci/[email protected]/
So to speak in order to have more coherent repos with least merge, logical problems the next order of the merging would be preferable:
1) Frank's patchset (ready to be merged in):
[PATCH v11 0/8] Enable designware PCI EP EDMA locally
https://lore.kernel.org/linux-pci/[email protected]
2) My series (ready to be merged in):
[PATCH v3 00/13] PCI: dwc: Various fixes and cleanups
https://lore.kernel.org/linux-pci/[email protected]/
3) My series (still in review, I need to fix some Rob' and Manivannan' notes) [PATCH v2 00/17] PCI: dwc: Add dma-ranges/YAML-schema/Baikal-T1 support
https://lore.kernel.org/linux-pci/[email protected]/
4) Me series (ready to be merged in, but depends on the prev patchsets):
https://lore.kernel.org/linux-pci/[email protected]/
Seeing the Frank patches won't make it into the mainline repo on this merge window, it would be great to collect all the changes in a single repository. Seeing Lorenzo disappeared as fast as popped up your repo is the best candidate since the DW eDMA block is a part of the DW PCIe controller.
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
If Gustavo isn't available or willing to merge it, it looks like Vinod (maintainer of
drivers/dma) would be the next logical candidate.I think the last patch should not block other patches from merging. The last patch about
pci-epf-test.cis totally independent from other patches.
Quoted 8 lines
Quoted 1 line
I prefer to merge all the dma patches first.
Absolutely.
Given an ack from Kishon, it would make sense for Vinod to merge them all together since they're logically related, but I have no objection to merging any of the
drivers/dmapatches separately.
Please see my comment above.
Thanks
-Sergey
Quoted 2 lines
Bjorn
Quoted 84 lines · Serge Semin
Quoted 54 lines · Bjorn Helgaas
Quoted 52 lines · Zhi Li
Quoted 51 lines · Bjorn Helgaas
Quoted 49 lines · Serge Semin
Hello Vinod,
Quoted 20 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
flags (this patch removed at v11 because dma tree already have fixed patch)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" memberQuoted 7 lines
4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: Add embedded DMA controller test5. 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/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097The series has been hanging out on review for over three months now. It has got to v11 and has been tested on at least two platforms. The original driver maintainer has been silent for all that time (most likely Gustavo dropped the driver maintaining role). Could you please merge it in seeing no comments have been posted for the last several weeks? The PCI Host/EP controller drivers maintainer suggested to get this series via the DMA-engine tree:
https://lore.kernel.org/linux-pci/YnqlRShJzvma2SKM@lpieralisi/
which is obviously right seeing it mainly concerns the DW eDMA driver. Though after that Lorenzo disappeared as quickly as popped up.)There is one more series depending on the changes in this patchset:
https://lore.kernel.org/linux-pci/[email protected]/
Me and Frank already settled all the conflicts and inter-dependencies, so at least his series is more than ready to be merged in into the kernel repo. It would be very good to get it accepted on this merge window so to have the kernel v5.19 with all this changes available.Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Since the v5.19 merge window is already open, it seems doubtful that anybody would merge this so late in the cycle.
In this case it would be safer to merge this whole series through your repo. See my series:
"[PATCH v2 00/26] dmaengine: dw-edma: Add RP/EP local DMA controllers support"
https://lore.kernel.org/linux-pci/[email protected]/
depends in the Frank' patchset. Meanwhile my patchset is also based on the DW PCIe modifications introduced in the set of the series:
"[PATCH v2 00/17] PCI: dwc: Add dma-ranges/YAML-schema/Baikal-T1 support"
https://lore.kernel.org/linux-pci/[email protected]/
and
"[PATCH v3 00/13] PCI: dwc: Various fixes and cleanups"
https://lore.kernel.org/linux-pci/[email protected]/So to speak in order to have more coherent repos with least merge, logical problems the next order of the merging would be preferable:
1) Frank's patchset (ready to be merged in):
[PATCH v11 0/8] Enable designware PCI EP EDMA locally
https://lore.kernel.org/linux-pci/[email protected]
2) My series (ready to be merged in):
[PATCH v3 00/13] PCI: dwc: Various fixes and cleanups
https://lore.kernel.org/linux-pci/[email protected]/
3) My series (still in review, I need to fix some Rob' and Manivannan' notes) [PATCH v2 00/17] PCI: dwc: Add dma-ranges/YAML-schema/Baikal-T1 support
https://lore.kernel.org/linux-pci/[email protected]/
4) Me series (ready to be merged in, but depends on the prev patchsets):
https://lore.kernel.org/linux-pci/[email protected]/
Quoted 5 lines
Seeing the Frank patches won't make it into the mainline repo on this merge window, it would be great to collect all the changes in a single repository. Seeing Lorenzo disappeared as fast as popped up your repo is the best candidate since the DW eDMA block is a part of the DW PCIe controller.
I'll be happy to merge this via the PCI tree, given acks from Gustavo and/or Vinod.
Bjorn
Quoted 92 lines · Bjorn Helgaas
Quoted 84 lines · Serge Semin
Quoted 54 lines · Bjorn Helgaas
Quoted 52 lines · Zhi Li
Quoted 51 lines · Bjorn Helgaas
Quoted 49 lines · Serge Semin
Hello Vinod,
Quoted 20 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
flags (this patch removed at v11 because dma tree already have fixed patch)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" memberQuoted 7 lines
4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: Add embedded DMA controller test5. 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/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097The series has been hanging out on review for over three months now. It has got to v11 and has been tested on at least two platforms. The original driver maintainer has been silent for all that time (most likely Gustavo dropped the driver maintaining role). Could you please merge it in seeing no comments have been posted for the last several weeks? The PCI Host/EP controller drivers maintainer suggested to get this series via the DMA-engine tree:
https://lore.kernel.org/linux-pci/YnqlRShJzvma2SKM@lpieralisi/
which is obviously right seeing it mainly concerns the DW eDMA driver. Though after that Lorenzo disappeared as quickly as popped up.)There is one more series depending on the changes in this patchset:
https://lore.kernel.org/linux-pci/[email protected]/
Me and Frank already settled all the conflicts and inter-dependencies, so at least his series is more than ready to be merged in into the kernel repo. It would be very good to get it accepted on this merge window so to have the kernel v5.19 with all this changes available.Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Since the v5.19 merge window is already open, it seems doubtful that anybody would merge this so late in the cycle.
In this case it would be safer to merge this whole series through your repo. See my series:
"[PATCH v2 00/26] dmaengine: dw-edma: Add RP/EP local DMA controllers support"
https://lore.kernel.org/linux-pci/[email protected]/
depends in the Frank' patchset. Meanwhile my patchset is also based on the DW PCIe modifications introduced in the set of the series:
"[PATCH v2 00/17] PCI: dwc: Add dma-ranges/YAML-schema/Baikal-T1 support"
https://lore.kernel.org/linux-pci/[email protected]/
and
"[PATCH v3 00/13] PCI: dwc: Various fixes and cleanups"
https://lore.kernel.org/linux-pci/[email protected]/So to speak in order to have more coherent repos with least merge, logical problems the next order of the merging would be preferable:
1) Frank's patchset (ready to be merged in):
[PATCH v11 0/8] Enable designware PCI EP EDMA locally
https://lore.kernel.org/linux-pci/[email protected]
2) My series (ready to be merged in):
[PATCH v3 00/13] PCI: dwc: Various fixes and cleanups
https://lore.kernel.org/linux-pci/[email protected]/
3) My series (still in review, I need to fix some Rob' and Manivannan' notes) [PATCH v2 00/17] PCI: dwc: Add dma-ranges/YAML-schema/Baikal-T1 support
https://lore.kernel.org/linux-pci/[email protected]/
4) Me series (ready to be merged in, but depends on the prev patchsets):
https://lore.kernel.org/linux-pci/[email protected]/Quoted 5 lines
Seeing the Frank patches won't make it into the mainline repo on this merge window, it would be great to collect all the changes in a single repository. Seeing Lorenzo disappeared as fast as popped up your repo is the best candidate since the DW eDMA block is a part of the DW PCIe controller.
Quoted 2 lines
I'll be happy to merge this via the PCI tree, given acks from Gustavo and/or Vinod.
Great! Thanks. I'll add my note regarding this to the v12 patchset thread. Alas Gustavo hasn't shown any sign of activity for more than a year (last commit on Feb 2021 and no more acks and rb tags afterwards). So we need to wait for the Vinod' ack.
-Sergey
Quoted 2 lines
Bjorn
Quoted 94 lines · Serge Semin
Quoted 91 lines · Bjorn Helgaas
Quoted 89 lines · Serge Semin
Quoted 54 lines · Bjorn Helgaas
Quoted 52 lines · Zhi Li
Quoted 51 lines · Bjorn Helgaas
Quoted 49 lines · Serge Semin
Hello Vinod,
Quoted 20 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
flags (this patch removed at v11 because dma tree already have fixed patch)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" memberQuoted 7 lines
4. change pci-epf-test to use EDMA driver to transfer data.
PCI: endpoint: Add embedded DMA controller test5. 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/#m979eb506c73ab3cfca2e7a43635ecdaec18d8097The series has been hanging out on review for over three months now. It has got to v11 and has been tested on at least two platforms. The original driver maintainer has been silent for all that time (most likely Gustavo dropped the driver maintaining role). Could you please merge it in seeing no comments have been posted for the last several weeks? The PCI Host/EP controller drivers maintainer suggested to get this series via the DMA-engine tree:
https://lore.kernel.org/linux-pci/YnqlRShJzvma2SKM@lpieralisi/
which is obviously right seeing it mainly concerns the DW eDMA driver. Though after that Lorenzo disappeared as quickly as popped up.)There is one more series depending on the changes in this patchset:
https://lore.kernel.org/linux-pci/[email protected]/
Me and Frank already settled all the conflicts and inter-dependencies, so at least his series is more than ready to be merged in into the kernel repo. It would be very good to get it accepted on this merge window so to have the kernel v5.19 with all this changes available.Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Since the v5.19 merge window is already open, it seems doubtful that anybody would merge this so late in the cycle.
In this case it would be safer to merge this whole series through your repo. See my series:
"[PATCH v2 00/26] dmaengine: dw-edma: Add RP/EP local DMA controllers support"
https://lore.kernel.org/linux-pci/[email protected]/
depends in the Frank' patchset. Meanwhile my patchset is also based on the DW PCIe modifications introduced in the set of the series:
"[PATCH v2 00/17] PCI: dwc: Add dma-ranges/YAML-schema/Baikal-T1 support"
https://lore.kernel.org/linux-pci/[email protected]/
and
"[PATCH v3 00/13] PCI: dwc: Various fixes and cleanups"
https://lore.kernel.org/linux-pci/[email protected]/So to speak in order to have more coherent repos with least merge, logical problems the next order of the merging would be preferable:
1) Frank's patchset (ready to be merged in):
[PATCH v11 0/8] Enable designware PCI EP EDMA locally
https://lore.kernel.org/linux-pci/[email protected]
2) My series (ready to be merged in):
[PATCH v3 00/13] PCI: dwc: Various fixes and cleanups
https://lore.kernel.org/linux-pci/[email protected]/
3) My series (still in review, I need to fix some Rob' and Manivannan' notes) [PATCH v2 00/17] PCI: dwc: Add dma-ranges/YAML-schema/Baikal-T1 support
https://lore.kernel.org/linux-pci/[email protected]/
4) Me series (ready to be merged in, but depends on the prev patchsets):
https://lore.kernel.org/linux-pci/[email protected]/Seeing the Frank patches won't make it into the mainline repo on this merge window, it would be great to collect all the changes in a single repository. Seeing Lorenzo disappeared as fast as popped up your repo is the best candidate since the DW eDMA block is a part of the DW PCIe controller.
Quoted 2 lines
Quoted 2 lines
I'll be happy to merge this via the PCI tree, given acks from Gustavo and/or Vinod.
@Vinod Koul
Friendly ping Vinod?
Quoted 10 lines
Great! Thanks. I'll add my note regarding this to the v12 patchset thread. Alas Gustavo hasn't shown any sign of activity for more than a year (last commit on Feb 2021 and no more acks and rb tags afterwards). So we need to wait for the Vinod' ack.
-Sergey
Quoted 2 lines
Bjorn