From: Serge Semin <Sergey.Semin@baikalelectronics.ru>
To: Gustavo Pimentel <gustavo.pimentel@synopsys.com>,
Vinod Koul <vkoul@kernel.org>, Rob Herring <robh@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Cai Huoqing <cai.huoqing@linux.dev>,
Robin Murphy <robin.murphy@arm.com>,
Jingoo Han <jingoohan1@gmail.com>, Frank Li <Frank.Li@nxp.com>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: "Serge Semin" <Sergey.Semin@baikalelectronics.ru>,
"Serge Semin" <fancer.lancer@gmail.com>,
"Alexey Malahov" <Alexey.Malahov@baikalelectronics.ru>,
"Pavel Parkhomenko" <Pavel.Parkhomenko@baikalelectronics.ru>,
"Krzysztof Wilczyński" <kw@linux.com>,
caihuoqing <caihuoqing@baidu.com>,
"Yoshihiro Shimoda" <yoshihiro.shimoda.uh@renesas.com>,
linux-pci@vger.kernel.org, dmaengine@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v9 23/27] dmaengine: dw-edma: Add mem-mapped LL-entries support
Date: Fri, 13 Jan 2023 20:14:05 +0300 [thread overview]
Message-ID: <20230113171409.30470-24-Sergey.Semin@baikalelectronics.ru> (raw)
In-Reply-To: <20230113171409.30470-1-Sergey.Semin@baikalelectronics.ru>
Currently the DW eDMA driver only supports the linked lists memory
allocated locally with respect to the remote eDMA engine setup. It means
the linked lists will be accessible by the CPU via the MMIO space only. If
eDMA is embedded into the DW PCIe Root Ports or local End-points (which
support will be added in one of the following up commits) the linked lists
are supposed to be allocated in the CPU memory. In that case the
LL-entries can be directly accessed meanwhile the former case implies
using the MMIO-accessors for that.
In order to have both cases supported by the driver the dw_edma_region
descriptor should be fixed to contain the MMIO-backed and just
memory-based virtual addresses. The linked lists initialization procedure
will use one of them depending on the eDMA device nature. If the eDMA
engine is embedded into the local DW PCIe RP/EP controllers then the list
entries will be directly accessed by referencing the corresponding
structure fields. Otherwise the MMIO accessors usage will be preserved.
Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
---
Changelog v9:
- This is a new patch added on v9 stage of the series.
---
drivers/dma/dw-edma/dw-edma-pcie.c | 32 ++++++-------
drivers/dma/dw-edma/dw-edma-v0-core.c | 69 +++++++++++++++++----------
include/linux/dma/edma.h | 5 +-
3 files changed, 64 insertions(+), 42 deletions(-)
diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c
index 3f9dadc73854..2b40f2b44f5e 100644
--- a/drivers/dma/dw-edma/dw-edma-pcie.c
+++ b/drivers/dma/dw-edma/dw-edma-pcie.c
@@ -240,20 +240,20 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,
struct dw_edma_block *ll_block = &vsec_data.ll_wr[i];
struct dw_edma_block *dt_block = &vsec_data.dt_wr[i];
- ll_region->vaddr = pcim_iomap_table(pdev)[ll_block->bar];
- if (!ll_region->vaddr)
+ ll_region->vaddr.io = pcim_iomap_table(pdev)[ll_block->bar];
+ if (!ll_region->vaddr.io)
return -ENOMEM;
- ll_region->vaddr += ll_block->off;
+ ll_region->vaddr.io += ll_block->off;
ll_region->paddr = pci_bus_address(pdev, ll_block->bar);
ll_region->paddr += ll_block->off;
ll_region->sz = ll_block->sz;
- dt_region->vaddr = pcim_iomap_table(pdev)[dt_block->bar];
- if (!dt_region->vaddr)
+ dt_region->vaddr.io = pcim_iomap_table(pdev)[dt_block->bar];
+ if (!dt_region->vaddr.io)
return -ENOMEM;
- dt_region->vaddr += dt_block->off;
+ dt_region->vaddr.io += dt_block->off;
dt_region->paddr = pci_bus_address(pdev, dt_block->bar);
dt_region->paddr += dt_block->off;
dt_region->sz = dt_block->sz;
@@ -265,20 +265,20 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,
struct dw_edma_block *ll_block = &vsec_data.ll_rd[i];
struct dw_edma_block *dt_block = &vsec_data.dt_rd[i];
- ll_region->vaddr = pcim_iomap_table(pdev)[ll_block->bar];
- if (!ll_region->vaddr)
+ ll_region->vaddr.io = pcim_iomap_table(pdev)[ll_block->bar];
+ if (!ll_region->vaddr.io)
return -ENOMEM;
- ll_region->vaddr += ll_block->off;
+ ll_region->vaddr.io += ll_block->off;
ll_region->paddr = pci_bus_address(pdev, ll_block->bar);
ll_region->paddr += ll_block->off;
ll_region->sz = ll_block->sz;
- dt_region->vaddr = pcim_iomap_table(pdev)[dt_block->bar];
- if (!dt_region->vaddr)
+ dt_region->vaddr.io = pcim_iomap_table(pdev)[dt_block->bar];
+ if (!dt_region->vaddr.io)
return -ENOMEM;
- dt_region->vaddr += dt_block->off;
+ dt_region->vaddr.io += dt_block->off;
dt_region->paddr = pci_bus_address(pdev, dt_block->bar);
dt_region->paddr += dt_block->off;
dt_region->sz = dt_block->sz;
@@ -303,24 +303,24 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,
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,
- chip->ll_region_wr[i].vaddr, &chip->ll_region_wr[i].paddr);
+ chip->ll_region_wr[i].vaddr.io, &chip->ll_region_wr[i].paddr);
pci_dbg(pdev, "Data:\tWRITE CH%.2u, BAR=%u, off=0x%.8lx, sz=0x%zx bytes, addr(v=%p, p=%pa)\n",
i, vsec_data.dt_wr[i].bar,
vsec_data.dt_wr[i].off, chip->dt_region_wr[i].sz,
- chip->dt_region_wr[i].vaddr, &chip->dt_region_wr[i].paddr);
+ chip->dt_region_wr[i].vaddr.io, &chip->dt_region_wr[i].paddr);
}
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,
- chip->ll_region_rd[i].vaddr, &chip->ll_region_rd[i].paddr);
+ chip->ll_region_rd[i].vaddr.io, &chip->ll_region_rd[i].paddr);
pci_dbg(pdev, "Data:\tREAD CH%.2u, BAR=%u, off=0x%.8lx, sz=0x%zx bytes, addr(v=%p, p=%pa)\n",
i, vsec_data.dt_rd[i].bar,
vsec_data.dt_rd[i].off, chip->dt_region_rd[i].sz,
- chip->dt_region_rd[i].vaddr, &chip->dt_region_rd[i].paddr);
+ chip->dt_region_rd[i].vaddr.io, &chip->dt_region_rd[i].paddr);
}
pci_dbg(pdev, "Nr. IRQs:\t%u\n", chip->nr_irqs);
diff --git a/drivers/dma/dw-edma/dw-edma-v0-core.c b/drivers/dma/dw-edma/dw-edma-v0-core.c
index 51a34b43434c..7df833873a19 100644
--- a/drivers/dma/dw-edma/dw-edma-v0-core.c
+++ b/drivers/dma/dw-edma/dw-edma-v0-core.c
@@ -159,9 +159,6 @@ static inline u32 readl_ch(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch,
#define GET_CH_32(dw, dir, ch, name) \
readl_ch(dw, dir, ch, &(__dw_ch_regs(dw, dir, ch)->name))
-#define SET_LL_32(ll, value) \
- writel(value, ll)
-
static inline void writeq_ch(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch,
u64 value, void __iomem *addr)
{
@@ -219,9 +216,6 @@ static inline u64 readq_ch(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch,
#define GET_CH_64(dw, dir, ch, name) \
readq_ch(dw, dir, ch, &(__dw_ch_regs(dw, dir, ch)->name))
-#define SET_LL_64(ll, value) \
- writeq(value, ll)
-
/* eDMA management callbacks */
void dw_edma_v0_core_off(struct dw_edma *dw)
{
@@ -293,17 +287,53 @@ u32 dw_edma_v0_core_status_abort_int(struct dw_edma *dw, enum dw_edma_dir dir)
GET_RW_32(dw, dir, int_status));
}
+static void dw_edma_v0_write_ll_data(struct dw_edma_chunk *chunk, int i,
+ u32 control, u32 size, u64 sar, u64 dar)
+{
+ ptrdiff_t ofs = i * sizeof(struct dw_edma_v0_lli);
+
+ if (chunk->chan->dw->chip->flags & DW_EDMA_CHIP_LOCAL) {
+ struct dw_edma_v0_lli *lli = chunk->ll_region.vaddr.mem + ofs;
+
+ lli->control = control;
+ lli->transfer_size = size;
+ lli->sar.reg = sar;
+ lli->dar.reg = dar;
+ } else {
+ struct dw_edma_v0_lli __iomem *lli = chunk->ll_region.vaddr.io + ofs;
+
+ writel(control, &lli->control);
+ writel(size, &lli->transfer_size);
+ writeq(sar, &lli->sar.reg);
+ writeq(dar, &lli->dar.reg);
+ }
+}
+
+static void dw_edma_v0_write_ll_link(struct dw_edma_chunk *chunk,
+ int i, u32 control, u64 pointer)
+{
+ ptrdiff_t ofs = i * sizeof(struct dw_edma_v0_lli);
+
+ if (chunk->chan->dw->chip->flags & DW_EDMA_CHIP_LOCAL) {
+ struct dw_edma_v0_llp *llp = chunk->ll_region.vaddr.mem + ofs;
+
+ llp->control = control;
+ llp->llp.reg = pointer;
+ } else {
+ struct dw_edma_v0_llp __iomem *llp = chunk->ll_region.vaddr.io + ofs;
+
+ writel(control, &llp->control);
+ writeq(pointer, &llp->llp.reg);
+ }
+}
+
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;
int j;
- lli = chunk->ll_region.vaddr;
-
if (chunk->cb)
control = DW_EDMA_V0_CB;
@@ -315,27 +345,16 @@ static void dw_edma_v0_core_write_chunk(struct dw_edma_chunk *chunk)
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 */
- SET_LL_32(&lli[i].transfer_size, child->sz);
- /* SAR */
- SET_LL_64(&lli[i].sar.reg, child->sar);
- /* DAR */
- SET_LL_64(&lli[i].dar.reg, child->dar);
-
- i++;
+
+ dw_edma_v0_write_ll_data(chunk, i++, control, child->sz,
+ child->sar, child->dar);
}
- llp = (void __iomem *)&lli[i];
control = DW_EDMA_V0_LLP | DW_EDMA_V0_TCB;
if (!chunk->cb)
control |= DW_EDMA_V0_CB;
- /* Channel control */
- SET_LL_32(&llp->control, control);
- /* Linked list */
- SET_LL_64(&llp->llp.reg, chunk->ll_region.paddr);
+ dw_edma_v0_write_ll_link(chunk, i, control, chunk->ll_region.paddr);
}
void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first)
diff --git a/include/linux/dma/edma.h b/include/linux/dma/edma.h
index 9d44da4aa59d..08833f12b386 100644
--- a/include/linux/dma/edma.h
+++ b/include/linux/dma/edma.h
@@ -19,7 +19,10 @@ struct dw_edma;
struct dw_edma_region {
u64 paddr;
- void __iomem *vaddr;
+ union {
+ void *mem;
+ void __iomem *io;
+ } vaddr;
size_t sz;
};
--
2.39.0
next prev parent reply other threads:[~2023-01-13 17:24 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 17:13 [PATCH v9 00/27] dmaengine: dw-edma: Add RP/EP local DMA controllers support Serge Semin
2023-01-13 17:13 ` [PATCH v9 01/27] dmaengine: Fix dma_slave_config.dst_addr description Serge Semin
2023-01-13 17:13 ` [PATCH v9 02/27] dmaengine: dw-edma: Release requested IRQs on failure Serge Semin
2023-01-13 17:13 ` [PATCH v9 03/27] dmaengine: dw-edma: Convert ll/dt phys-address to PCIe bus/DMA address Serge Semin
2023-01-13 17:13 ` [PATCH v9 04/27] dmaengine: dw-edma: Fix missing src/dst address of the interleaved xfers Serge Semin
2023-01-13 17:13 ` [PATCH v9 05/27] dmaengine: dw-edma: Don't permit non-inc " Serge Semin
2023-01-13 17:13 ` [PATCH v9 06/27] dmaengine: dw-edma: Fix invalid interleaved xfers semantics Serge Semin
2023-01-13 17:13 ` [PATCH v9 07/27] dmaengine: dw-edma: Add CPU to PCIe bus address translation Serge Semin
2023-01-13 17:13 ` [PATCH v9 08/27] dmaengine: dw-edma: Add PCIe bus address getter to the remote EP glue-driver Serge Semin
2023-01-20 23:29 ` Bjorn Helgaas
2023-01-21 20:37 ` Serge Semin
2023-01-13 17:13 ` [PATCH v9 09/27] dmaengine: dw-edma: Drop chancnt initialization Serge Semin
2023-01-20 23:54 ` Bjorn Helgaas
2023-01-21 21:10 ` Serge Semin
2023-01-13 17:13 ` [PATCH v9 10/27] dmaengine: dw-edma: Fix DebugFS reg entry type Serge Semin
2023-01-13 17:13 ` [PATCH v9 11/27] dmaengine: dw-edma: Stop checking debugfs_create_*() return value Serge Semin
2023-01-13 17:13 ` [PATCH v9 12/27] dmaengine: dw-edma: Add dw_edma prefix to the DebugFS nodes descriptor Serge Semin
2023-01-13 17:13 ` [PATCH v9 13/27] dmaengine: dw-edma: Convert DebugFS descs to being kz-allocated Serge Semin
2023-01-13 17:13 ` [PATCH v9 14/27] dmaengine: dw-edma: Rename DebugFS dentry variables to 'dent' Serge Semin
2023-01-13 17:13 ` [PATCH v9 15/27] dmaengine: dw-edma: Simplify the DebugFS context CSRs init procedure Serge Semin
2023-01-13 17:13 ` [PATCH v9 16/27] dmaengine: dw-edma: Move eDMA data pointer to DebugFS node descriptor Serge Semin
2023-01-13 17:13 ` [PATCH v9 17/27] dmaengine: dw-edma: Join Write/Read channels into a single device Serge Semin
2023-01-13 17:14 ` [PATCH v9 18/27] dmaengine: dw-edma: Use DMA-engine device DebugFS subdirectory Serge Semin
2023-01-13 17:14 ` [PATCH v9 19/27] dmaengine: dw-edma: Use non-atomic io-64 methods Serge Semin
2023-01-21 0:54 ` Bjorn Helgaas
2023-01-21 23:03 ` Serge Semin
2023-01-23 16:37 ` Bjorn Helgaas
2023-01-24 13:44 ` Serge Semin
2023-01-13 17:14 ` [PATCH v9 20/27] dmaengine: dw-edma: Drop DT-region allocation Serge Semin
2023-01-13 17:14 ` [PATCH v9 21/27] dmaengine: dw-edma: Replace chip ID number with device name Serge Semin
2023-01-13 17:14 ` [PATCH v9 22/27] dmaengine: dw-edma: Skip cleanup procedure if no private data found Serge Semin
2023-01-13 17:14 ` Serge Semin [this message]
2023-02-21 23:00 ` [PATCH v9 23/27] dmaengine: dw-edma: Add mem-mapped LL-entries support Bjorn Helgaas
2023-02-22 16:16 ` Vinod Koul
2023-01-13 17:14 ` [PATCH v9 24/27] dmaengine: dw-edma: Relax driver config settings Serge Semin
2023-01-20 22:50 ` Bjorn Helgaas
2023-01-22 0:11 ` Serge Semin
2023-01-23 16:43 ` Bjorn Helgaas
2023-01-24 14:49 ` Serge Semin
2023-01-24 23:47 ` Bjorn Helgaas
2023-01-25 14:40 ` Serge Semin
2023-01-25 23:23 ` Bjorn Helgaas
2023-01-26 16:37 ` Serge Semin
2023-01-26 18:19 ` Bjorn Helgaas
2023-01-26 21:16 ` Serge Semin
2023-01-13 17:14 ` [PATCH v9 25/27] PCI: dwc: Set coherent DMA-mask on MSI-address allocation Serge Semin
2023-01-20 21:59 ` Bjorn Helgaas
2023-01-22 0:34 ` Serge Semin
2023-01-13 17:14 ` [PATCH v9 26/27] PCI: bt1: Set 64-bit DMA-mask Serge Semin
2023-01-13 17:14 ` [PATCH v9 27/27] PCI: dwc: Add DW eDMA engine support Serge Semin
2023-01-13 18:34 ` [PATCH v9 00/27] dmaengine: dw-edma: Add RP/EP local DMA controllers support Serge Semin
2023-01-16 9:52 ` Lorenzo Pieralisi
2023-01-16 11:29 ` Serge Semin
2023-01-20 15:17 ` Lorenzo Pieralisi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230113171409.30470-24-Sergey.Semin@baikalelectronics.ru \
--to=sergey.semin@baikalelectronics.ru \
--cc=Alexey.Malahov@baikalelectronics.ru \
--cc=Frank.Li@nxp.com \
--cc=Pavel.Parkhomenko@baikalelectronics.ru \
--cc=bhelgaas@google.com \
--cc=cai.huoqing@linux.dev \
--cc=caihuoqing@baidu.com \
--cc=dmaengine@vger.kernel.org \
--cc=fancer.lancer@gmail.com \
--cc=gustavo.pimentel@synopsys.com \
--cc=jingoohan1@gmail.com \
--cc=kw@linux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=manivannan.sadhasivam@linaro.org \
--cc=robh@kernel.org \
--cc=robin.murphy@arm.com \
--cc=vkoul@kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox