* [PATCH v1 1/3] dmaengine: dw-edma: Make Xilinx Macros Dev Name Agnostic
2026-07-22 11:16 [PATCH v1 0/3] CPM6 Channel Separation Support Devendra K Verma
@ 2026-07-22 11:16 ` Devendra K Verma
2026-07-22 11:24 ` sashiko-bot
2026-07-22 11:16 ` [PATCH v1 2/3] dmaengine: dw-edma: Enable Chan Separation via VSEC Devendra K Verma
2026-07-22 11:16 ` [PATCH v1 3/3] dmaengine: dw-edma: Add changes to support Channel Separation Devendra K Verma
2 siblings, 1 reply; 7+ messages in thread
From: Devendra K Verma @ 2026-07-22 11:16 UTC (permalink / raw)
To: mani, vkoul, frank.li
Cc: dmaengine, linux-pci, linux-kernel, michal.simek, devverma
Xilinx specific macros for MDB device can be reused for the
Xilinx supported other similar IP such as CPM6.
Renamed the Xilinx specific macros in a way that can be
reused for Xilinx supported upcoming IP, CPM6.
Naming is in accordance with the naming done for Synopsys macros.
Signed-off-by: Devendra K Verma <devverma@amd.com>
---
drivers/dma/dw-edma/dw-edma-pcie.c | 58 +++++++++++++++---------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c
index 791c46e8ae4c..ec5e057a0f11 100644
--- a/drivers/dma/dw-edma/dw-edma-pcie.c
+++ b/drivers/dma/dw-edma/dw-edma-pcie.c
@@ -29,21 +29,21 @@
#define PCI_DEVICE_ID_XILINX_B054 0xb054
#define PCI_DEVICE_ID_XILINX_B00F 0xb00f
-#define DW_PCIE_XILINX_MDB_VSEC_DMA_ID 0x6
-#define DW_PCIE_XILINX_MDB_VSEC_ID 0x20
-#define DW_PCIE_XILINX_MDB_VSEC_DMA_BAR GENMASK(10, 8)
-#define DW_PCIE_XILINX_MDB_VSEC_DMA_MAP GENMASK(2, 0)
-#define DW_PCIE_XILINX_MDB_VSEC_DMA_WR_CH GENMASK(9, 0)
-#define DW_PCIE_XILINX_MDB_VSEC_DMA_RD_CH GENMASK(25, 16)
-
-#define DW_PCIE_XILINX_MDB_DEVMEM_OFF_REG_HIGH 0xc
-#define DW_PCIE_XILINX_MDB_DEVMEM_OFF_REG_LOW 0x8
-#define DW_PCIE_XILINX_MDB_INVALID_ADDR (~0ULL)
-
-#define DW_PCIE_XILINX_MDB_LL_OFF_GAP 0x200000
-#define DW_PCIE_XILINX_MDB_LL_SIZE 0x800
-#define DW_PCIE_XILINX_MDB_DT_OFF_GAP 0x100000
-#define DW_PCIE_XILINX_MDB_DT_SIZE 0x800
+#define DW_PCIE_XILINX_VSEC_DMA_ID 0x6
+#define DW_PCIE_XILINX_VSEC_ID 0x20
+#define DW_PCIE_XILINX_VSEC_DMA_BAR GENMASK(10, 8)
+#define DW_PCIE_XILINX_VSEC_DMA_MAP GENMASK(2, 0)
+#define DW_PCIE_XILINX_VSEC_DMA_WR_CH GENMASK(9, 0)
+#define DW_PCIE_XILINX_VSEC_DMA_RD_CH GENMASK(25, 16)
+
+#define DW_PCIE_XILINX_DEVMEM_OFF_REG_HIGH 0xc
+#define DW_PCIE_XILINX_DEVMEM_OFF_REG_LOW 0x8
+#define DW_PCIE_XILINX_INVALID_ADDR (~0ULL)
+
+#define DW_PCIE_XILINX_LL_OFF_GAP 0x200000
+#define DW_PCIE_XILINX_LL_SIZE 0x800
+#define DW_PCIE_XILINX_DT_OFF_GAP 0x100000
+#define DW_PCIE_XILINX_DT_SIZE 0x800
#define DW_BLOCK(a, b, c) \
{ \
@@ -258,10 +258,10 @@ static void dw_edma_pcie_get_xilinx_dma_data(struct pci_dev *pdev,
u16 vsec;
u64 off;
- pdata->devmem_phys_off = DW_PCIE_XILINX_MDB_INVALID_ADDR;
+ pdata->devmem_phys_off = DW_PCIE_XILINX_INVALID_ADDR;
vsec = pci_find_vsec_capability(pdev, PCI_VENDOR_ID_XILINX,
- DW_PCIE_XILINX_MDB_VSEC_DMA_ID);
+ DW_PCIE_XILINX_VSEC_DMA_ID);
if (!vsec)
return;
@@ -272,18 +272,18 @@ static void dw_edma_pcie_get_xilinx_dma_data(struct pci_dev *pdev,
pci_dbg(pdev, "Detected Xilinx PCIe Vendor-Specific Extended Capability DMA\n");
pci_read_config_dword(pdev, vsec + 0x8, &val);
- map = FIELD_GET(DW_PCIE_XILINX_MDB_VSEC_DMA_MAP, val);
+ map = FIELD_GET(DW_PCIE_XILINX_VSEC_DMA_MAP, val);
if (map != EDMA_MF_HDMA_NATIVE)
return;
pdata->mf = map;
- pdata->rg.bar = FIELD_GET(DW_PCIE_XILINX_MDB_VSEC_DMA_BAR, val);
+ pdata->rg.bar = FIELD_GET(DW_PCIE_XILINX_VSEC_DMA_BAR, val);
pci_read_config_dword(pdev, vsec + 0xc, &val);
pdata->wr_ch_cnt = min(pdata->wr_ch_cnt,
- FIELD_GET(DW_PCIE_XILINX_MDB_VSEC_DMA_WR_CH, val));
+ FIELD_GET(DW_PCIE_XILINX_VSEC_DMA_WR_CH, val));
pdata->rd_ch_cnt = min(pdata->rd_ch_cnt,
- FIELD_GET(DW_PCIE_XILINX_MDB_VSEC_DMA_RD_CH, val));
+ FIELD_GET(DW_PCIE_XILINX_VSEC_DMA_RD_CH, val));
pci_read_config_dword(pdev, vsec + 0x14, &val);
off = val;
@@ -293,16 +293,16 @@ static void dw_edma_pcie_get_xilinx_dma_data(struct pci_dev *pdev,
pdata->rg.off = off;
vsec = pci_find_vsec_capability(pdev, PCI_VENDOR_ID_XILINX,
- DW_PCIE_XILINX_MDB_VSEC_ID);
+ DW_PCIE_XILINX_VSEC_ID);
if (!vsec)
return;
pci_read_config_dword(pdev,
- vsec + DW_PCIE_XILINX_MDB_DEVMEM_OFF_REG_HIGH,
+ vsec + DW_PCIE_XILINX_DEVMEM_OFF_REG_HIGH,
&val);
off = val;
pci_read_config_dword(pdev,
- vsec + DW_PCIE_XILINX_MDB_DEVMEM_OFF_REG_LOW,
+ vsec + DW_PCIE_XILINX_DEVMEM_OFF_REG_LOW,
&val);
off <<= 32;
off |= val;
@@ -360,7 +360,7 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,
* address use the non-LL mode or simple mode supported by
* the HDMA IP.
*/
- if (vsec_data->devmem_phys_off == DW_PCIE_XILINX_MDB_INVALID_ADDR)
+ if (vsec_data->devmem_phys_off == DW_PCIE_XILINX_INVALID_ADDR)
non_ll = true;
/*
@@ -370,10 +370,10 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,
*/
if (!non_ll)
dw_edma_set_chan_region_offset(vsec_data, BAR_2, 0,
- DW_PCIE_XILINX_MDB_LL_OFF_GAP,
- DW_PCIE_XILINX_MDB_LL_SIZE,
- DW_PCIE_XILINX_MDB_DT_OFF_GAP,
- DW_PCIE_XILINX_MDB_DT_SIZE);
+ DW_PCIE_XILINX_LL_OFF_GAP,
+ DW_PCIE_XILINX_LL_SIZE,
+ DW_PCIE_XILINX_DT_OFF_GAP,
+ DW_PCIE_XILINX_DT_SIZE);
}
/* Mapping PCI BAR regions */
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v1 2/3] dmaengine: dw-edma: Enable Chan Separation via VSEC
2026-07-22 11:16 [PATCH v1 0/3] CPM6 Channel Separation Support Devendra K Verma
2026-07-22 11:16 ` [PATCH v1 1/3] dmaengine: dw-edma: Make Xilinx Macros Dev Name Agnostic Devendra K Verma
@ 2026-07-22 11:16 ` Devendra K Verma
2026-07-22 11:33 ` sashiko-bot
2026-07-22 11:16 ` [PATCH v1 3/3] dmaengine: dw-edma: Add changes to support Channel Separation Devendra K Verma
2 siblings, 1 reply; 7+ messages in thread
From: Devendra K Verma @ 2026-07-22 11:16 UTC (permalink / raw)
To: mani, vkoul, frank.li
Cc: dmaengine, linux-pci, linux-kernel, michal.simek, devverma
As per, 'Designware Cores PCI Express DM Controller - Reference
Manual', section 3.2.34.3, VSEC for DEVICE INFORMATION supports
the channel separation mechanisms. Basically, the HDMA IP allows
the user to configure the separation between DMA channel
registers and retrieve it via the VSEC capability mentioned
above.
HDMA IP supports the channel separation up to 32K but for
the simplicity channel separation support has been added till
4K. As and when required the function can be expanded to include
the higher sizes for channel separation.
Supported and missed out sizes are:
8K (0x5), 16K (0x6), 32K (0x7)
Signed-off-by: Devendra K Verma <devverma@amd.com>
---
drivers/dma/dw-edma/dw-edma-pcie.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c
index ec5e057a0f11..6295d01ba2f7 100644
--- a/drivers/dma/dw-edma/dw-edma-pcie.c
+++ b/drivers/dma/dw-edma/dw-edma-pcie.c
@@ -33,6 +33,7 @@
#define DW_PCIE_XILINX_VSEC_ID 0x20
#define DW_PCIE_XILINX_VSEC_DMA_BAR GENMASK(10, 8)
#define DW_PCIE_XILINX_VSEC_DMA_MAP GENMASK(2, 0)
+#define DW_PCIE_XILINX_VSEC_CH_SEP GENMASK(18, 16)
#define DW_PCIE_XILINX_VSEC_DMA_WR_CH GENMASK(9, 0)
#define DW_PCIE_XILINX_VSEC_DMA_RD_CH GENMASK(25, 16)
@@ -73,6 +74,7 @@ struct dw_edma_pcie_data {
u16 wr_ch_cnt;
u16 rd_ch_cnt;
u64 devmem_phys_off;
+ u32 ch_sep_sz;
};
static const struct dw_edma_pcie_data snps_edda_data = {
@@ -127,7 +129,7 @@ static const struct dw_edma_pcie_data xilinx_mdb_data = {
};
static const struct dw_edma_pcie_data xilinx_cpm6_dma_data = {
- /* MDB registers location */
+ /* CPM6 registers location */
.rg.bar = BAR_0,
.rg.off = SZ_4K, /* 4 Kbytes */
.rg.sz = SZ_8K, /* 8 Kbytes */
@@ -189,6 +191,23 @@ static int dw_edma_pcie_irq_vector(struct device *dev, unsigned int nr)
return pci_irq_vector(to_pci_dev(dev), nr);
}
+static u32 dw_edma_get_ch_sep_sz(u32 ch_sep_val)
+{
+ switch (ch_sep_val) {
+ default:
+ case 0:
+ return 256;
+ case 1:
+ return 512;
+ case 2:
+ return 1024;
+ case 3:
+ return 2048;
+ case 4:
+ return 4096;
+ }
+}
+
static u64 dw_edma_pcie_address(struct device *dev, phys_addr_t cpu_addr)
{
struct pci_dev *pdev = to_pci_dev(dev);
@@ -278,6 +297,8 @@ static void dw_edma_pcie_get_xilinx_dma_data(struct pci_dev *pdev,
pdata->mf = map;
pdata->rg.bar = FIELD_GET(DW_PCIE_XILINX_VSEC_DMA_BAR, val);
+ pdata->ch_sep_sz = dw_edma_get_ch_sep_sz(FIELD_GET(DW_PCIE_XILINX_VSEC_CH_SEP,
+ val));
pci_read_config_dword(pdev, vsec + 0xc, &val);
pdata->wr_ch_cnt = min(pdata->wr_ch_cnt,
@@ -324,9 +345,9 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,
struct dw_edma_pcie_data *pdata = (void *)pid->driver_data;
struct device *dev = &pdev->dev;
struct dw_edma_chip *chip;
+ bool non_ll = false;
int err, nr_irqs;
int i, mask;
- bool non_ll = false;
if (!pdata)
return -ENODEV;
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v1 2/3] dmaengine: dw-edma: Enable Chan Separation via VSEC
2026-07-22 11:16 ` [PATCH v1 2/3] dmaengine: dw-edma: Enable Chan Separation via VSEC Devendra K Verma
@ 2026-07-22 11:33 ` sashiko-bot
0 siblings, 0 replies; 7+ messages in thread
From: sashiko-bot @ 2026-07-22 11:33 UTC (permalink / raw)
To: Devendra K Verma; +Cc: Frank.Li, dmaengine, vkoul, linux-pci
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:
- [High] The parsed channel separation size (`ch_sep_sz`) is a dead store; it is never passed to the core DMA driver.
- [Medium] dw_edma_get_ch_sep_sz() silently falls back to 256 bytes for unsupported hardware channel separation values.
- [Medium] The newly added `ch_sep_sz` field is left uninitialized (implicitly 0) for statically defined devices.
--
--- Patch [2]: [PATCH v1 2/3] dmaengine: dw-edma: Enable Chan Separation via VSEC ---
commit 5d0ec977534da50b8d8937caafb8d91a21d54565
Author: Devendra K Verma <devverma@amd.com>
dmaengine: dw-edma: Enable Chan Separation via VSEC
This commit aims to enable channel separation via the VSEC capability for
DEVICE INFORMATION. It parses the channel separation size from the hardware
registers up to 4K.
> diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c
> index ec5e057a0f11b..6295d01ba2f71 100644
> --- a/drivers/dma/dw-edma/dw-edma-pcie.c
> +++ b/drivers/dma/dw-edma/dw-edma-pcie.c
[ ... ]
> @@ -73,6 +74,7 @@ struct dw_edma_pcie_data {
> u16 wr_ch_cnt;
> u16 rd_ch_cnt;
> u64 devmem_phys_off;
> + u32 ch_sep_sz;
> };
>
> static const struct dw_edma_pcie_data snps_edda_data = {
[Severity: Medium]
Does this leave the newly added ch_sep_sz field uninitialized (implicitly 0)
for statically defined devices like snps_edda_data?
If the core driver begins relying on this field to space out channel registers,
will preexisting devices calculate an offset of 0 for all channels and break
DMA functionality?
[ ... ]
> @@ -189,6 +191,23 @@ static int dw_edma_pcie_irq_vector(struct device *dev, unsigned int nr)
> return pci_irq_vector(to_pci_dev(dev), nr);
> }
>
> +static u32 dw_edma_get_ch_sep_sz(u32 ch_sep_val)
> +{
> + switch (ch_sep_val) {
> + default:
> + case 0:
> + return 256;
[Severity: Medium]
If a hardware device advertises a channel separation size greater than 4K
(e.g., 8K/0x5, 16K/0x6, 32K/0x7 as mentioned in the commit message), will
this switch statement silently hit the default case and return 256 bytes
instead of the actual hardware size, leading to incorrect memory offsets?
> + case 1:
> + return 512;
> + case 2:
> + return 1024;
> + case 3:
> + return 2048;
> + case 4:
> + return 4096;
> + }
> +}
[ ... ]
> @@ -324,9 +345,9 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,
> struct dw_edma_pcie_data *pdata = (void *)pid->driver_data;
> struct device *dev = &pdev->dev;
> struct dw_edma_chip *chip;
> + bool non_ll = false;
> int err, nr_irqs;
> int i, mask;
> - bool non_ll = false;
>
> if (!pdata)
> return -ENODEV;
[Severity: High]
Is the parsed channel separation size actually used by the core driver?
The VSEC capability is parsed into pdata->ch_sep_sz in this patch, but it
doesn't appear to be copied to the struct dw_edma_chip or used anywhere
to calculate register offsets, leaving the feature non-functional.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20260722111640.1146212-1-devverma@amd.com?part=2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v1 3/3] dmaengine: dw-edma: Add changes to support Channel Separation
2026-07-22 11:16 [PATCH v1 0/3] CPM6 Channel Separation Support Devendra K Verma
2026-07-22 11:16 ` [PATCH v1 1/3] dmaengine: dw-edma: Make Xilinx Macros Dev Name Agnostic Devendra K Verma
2026-07-22 11:16 ` [PATCH v1 2/3] dmaengine: dw-edma: Enable Chan Separation via VSEC Devendra K Verma
@ 2026-07-22 11:16 ` Devendra K Verma
2026-07-22 11:32 ` sashiko-bot
2 siblings, 1 reply; 7+ messages in thread
From: Devendra K Verma @ 2026-07-22 11:16 UTC (permalink / raw)
To: mani, vkoul, frank.li
Cc: dmaengine, linux-pci, linux-kernel, michal.simek, devverma
Following changes are made:
o In 'struct dw_hdma_v0_ch_regs', it is assumed the channel
separation as 256-bytes which is default, but if an IP is
configured for a different size of channel separation then
user can retrieve it using the supported VSEC (0x6).
Modified the struct to work with the channel separation
supported by IP.
CPM6 supports channel separation, default is 512.
o Changes in macros / functions where address of the channel
is accessed based on channel index and direction. It enables
the calculation of the channel reg base address based on
the selected channel separation.
o Struct removed - dw_hdma_v0_ch, dw_hdma_v0_regs
o Functions removed - __dw_regs()
Signed-off-by: Devendra K Verma <devverma@amd.com>
---
drivers/dma/dw-edma/dw-edma-pcie.c | 4 ++++
drivers/dma/dw-edma/dw-hdma-v0-core.c | 23 ++++++++++++++---------
drivers/dma/dw-edma/dw-hdma-v0-debugfs.c | 17 ++++++-----------
drivers/dma/dw-edma/dw-hdma-v0-regs.h | 10 ----------
include/linux/dma/edma.h | 1 +
5 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c
index 6295d01ba2f7..ca2a4be2f3a5 100644
--- a/drivers/dma/dw-edma/dw-edma-pcie.c
+++ b/drivers/dma/dw-edma/dw-edma-pcie.c
@@ -113,6 +113,7 @@ static const struct dw_edma_pcie_data snps_edda_data = {
.irqs = 1,
.wr_ch_cnt = 2,
.rd_ch_cnt = 2,
+ .ch_sep_sz = 256,
};
static const struct dw_edma_pcie_data xilinx_mdb_data = {
@@ -126,6 +127,7 @@ static const struct dw_edma_pcie_data xilinx_mdb_data = {
.irqs = 1,
.wr_ch_cnt = 8,
.rd_ch_cnt = 8,
+ .ch_sep_sz = 256,
};
static const struct dw_edma_pcie_data xilinx_cpm6_dma_data = {
@@ -139,6 +141,7 @@ static const struct dw_edma_pcie_data xilinx_cpm6_dma_data = {
.irqs = 1,
.wr_ch_cnt = 8,
.rd_ch_cnt = 8,
+ .ch_sep_sz = 512,
};
static void dw_edma_set_chan_region_offset(struct dw_edma_pcie_data *pdata,
@@ -443,6 +446,7 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,
chip->nr_irqs = nr_irqs;
chip->ops = &dw_edma_pcie_plat_ops;
chip->cfg_non_ll = non_ll;
+ chip->ch_sep_sz = vsec_data->ch_sep_sz;
chip->ll_wr_cnt = vsec_data->wr_ch_cnt;
chip->ll_rd_cnt = vsec_data->rd_ch_cnt;
diff --git a/drivers/dma/dw-edma/dw-hdma-v0-core.c b/drivers/dma/dw-edma/dw-hdma-v0-core.c
index 632abb8b481c..3f27a93c4d8c 100644
--- a/drivers/dma/dw-edma/dw-hdma-v0-core.c
+++ b/drivers/dma/dw-edma/dw-hdma-v0-core.c
@@ -23,18 +23,23 @@ enum dw_hdma_control {
DW_HDMA_V0_LLE = BIT(9),
};
-static inline struct dw_hdma_v0_regs __iomem *__dw_regs(struct dw_edma *dw)
-{
- return dw->chip->reg_base;
-}
-
static inline struct dw_hdma_v0_ch_regs __iomem *
__dw_ch_regs(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch)
{
- if (dir == EDMA_DIR_WRITE)
- return &(__dw_regs(dw)->ch[ch].wr);
- else
- return &(__dw_regs(dw)->ch[ch].rd);
+ u32 ch_base;
+
+ /*
+ * For Write, the channel register index starts at
+ * wr_base(ch_idx) = (2 * ch_idx) * ch_sep_sz
+ *
+ * For Read channel,
+ * rd_base(ch_idx) = (2 * ch_idx + 1) * ch_sep_sz
+ */
+ ch_base = 2 * ch;
+ if (dir == EDMA_DIR_READ)
+ ch_base += 1;
+
+ return dw->chip->reg_base + (ch_base * dw->chip->ch_sep_sz);
}
#define SET_CH_32(dw, dir, ch, name, value) \
diff --git a/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c b/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c
index dcdc57fe976c..33128685bbd9 100644
--- a/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c
+++ b/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c
@@ -13,22 +13,17 @@
#include "dw-hdma-v0-regs.h"
#include "dw-edma-core.h"
-#define REGS_ADDR(dw, name) \
- ({ \
- struct dw_hdma_v0_regs __iomem *__regs = (dw)->chip->reg_base; \
- \
- (void __iomem *)&__regs->name; \
- })
-
#define REGS_CH_ADDR(dw, name, _dir, _ch) \
({ \
- struct dw_hdma_v0_ch_regs __iomem *__ch_regs; \
+ struct dw_hdma_v0_ch_regs __iomem *__ch_regs; \
+ off_t __off = (dw)->chip->ch_sep_sz; \
\
- if (_dir == EDMA_DIR_READ) \
- __ch_regs = REGS_ADDR(dw, ch[_ch].rd); \
+ if ((_dir) == EDMA_DIR_READ) \
+ __off *= (2 * (_ch) + 1); \
else \
- __ch_regs = REGS_ADDR(dw, ch[_ch].wr); \
+ __off *= (2 * (_ch)); \
\
+ __ch_regs = ((dw)->chip->reg_base + __off); \
(void __iomem *)&__ch_regs->name; \
})
diff --git a/drivers/dma/dw-edma/dw-hdma-v0-regs.h b/drivers/dma/dw-edma/dw-hdma-v0-regs.h
index 7759ba9b4850..2475b8d96133 100644
--- a/drivers/dma/dw-edma/dw-hdma-v0-regs.h
+++ b/drivers/dma/dw-edma/dw-hdma-v0-regs.h
@@ -84,16 +84,6 @@ struct dw_hdma_v0_ch_regs {
};
} msi_abort;
u32 msi_msgdata; /* 0x00a8 */
- u32 padding_2[21]; /* 0x00ac..0x00fc */
-} __packed;
-
-struct dw_hdma_v0_ch {
- struct dw_hdma_v0_ch_regs wr; /* 0x0000 */
- struct dw_hdma_v0_ch_regs rd; /* 0x0100 */
-} __packed;
-
-struct dw_hdma_v0_regs {
- struct dw_hdma_v0_ch ch[HDMA_V0_MAX_NR_CH]; /* 0x0000..0x0fa8 */
} __packed;
struct dw_hdma_v0_lli {
diff --git a/include/linux/dma/edma.h b/include/linux/dma/edma.h
index 1fafd5b0e315..a6c5728f03d3 100644
--- a/include/linux/dma/edma.h
+++ b/include/linux/dma/edma.h
@@ -104,6 +104,7 @@ struct dw_edma_chip {
struct dw_edma *dw;
bool cfg_non_ll;
+ u32 ch_sep_sz;
};
/* Export to the platform drivers */
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v1 3/3] dmaengine: dw-edma: Add changes to support Channel Separation
2026-07-22 11:16 ` [PATCH v1 3/3] dmaengine: dw-edma: Add changes to support Channel Separation Devendra K Verma
@ 2026-07-22 11:32 ` sashiko-bot
0 siblings, 0 replies; 7+ messages in thread
From: sashiko-bot @ 2026-07-22 11:32 UTC (permalink / raw)
To: Devendra K Verma; +Cc: vkoul, dmaengine, Frank.Li, linux-pci
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:
New issues:
- [High] The newly introduced `ch_sep_sz` field in `struct dw_edma_chip` is uninitialized (defaults to 0) for platform drivers outside of `dw-edma-pcie` that use HDMA natively, causing all channel register accesses to map to identical offset 0.
- [High] The driver trusts the device-provided VSEC configuration to calculate DMA channel register offsets but never verifies if these offsets remain within the mapped PCI BAR region.
Pre-existing issues:
- [High] Pre-existing double free of IRQ vectors in `dw_edma_pcie_remove()` due to devres interference.
--
--- Patch [3]: [PATCH v1 3/3] dmaengine: dw-edma: Add changes to support Channel Separation ---
commit 2ad7c860cd4c4a1bef961b814db689f718e1407c
Author: Devendra K Verma <devverma@amd.com>
dmaengine: dw-edma: Add changes to support Channel Separation
This patch modifies the dw-edma driver to support configurable channel
separation sizes. It updates the register offset calculations to use a
dynamic size provided by the hardware IP instead of assuming a default
256-byte separation.
> diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c
> index 6295d01ba2f71..ca2a4be2f3a50 100644
> --- a/drivers/dma/dw-edma/dw-edma-pcie.c
> +++ b/drivers/dma/dw-edma/dw-edma-pcie.c
[ ... ]
> @@ -443,6 +446,7 @@ static int dw_edma_pcie_probe(struct pci_dev *pdev,
> chip->nr_irqs = nr_irqs;
> chip->ops = &dw_edma_pcie_plat_ops;
> chip->cfg_non_ll = non_ll;
> + chip->ch_sep_sz = vsec_data->ch_sep_sz;
>
> chip->ll_wr_cnt = vsec_data->wr_ch_cnt;
> chip->ll_rd_cnt = vsec_data->rd_ch_cnt;
[Severity: High]
This is a pre-existing issue, but does dw_edma_pcie_remove() explicitly call
pci_free_irq_vectors(pdev)?
Since pcim_enable_device(pdev) is called during dw_edma_pcie_probe(), it
automatically manages subsequent IRQ vectors via devres. When the driver is
unbound, the devres cleanup routine will attempt to free the already-freed
vectors, which could cause a double-free kernel panic on the device unbind
or module unload path.
> diff --git a/drivers/dma/dw-edma/dw-hdma-v0-core.c b/drivers/dma/dw-edma/dw-hdma-v0-core.c
> index 632abb8b481cf..3f27a93c4d8c8 100644
> --- a/drivers/dma/dw-edma/dw-hdma-v0-core.c
> +++ b/drivers/dma/dw-edma/dw-hdma-v0-core.c
[ ... ]
> @@ -23,18 +23,23 @@ enum dw_hdma_control {
> DW_HDMA_V0_LLE = BIT(9),
> };
>
> -static inline struct dw_hdma_v0_regs __iomem *__dw_regs(struct dw_edma *dw)
> -{
> - return dw->chip->reg_base;
> -}
> -
> static inline struct dw_hdma_v0_ch_regs __iomem *
> __dw_ch_regs(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch)
> {
> - if (dir == EDMA_DIR_WRITE)
> - return &(__dw_regs(dw)->ch[ch].wr);
> - else
> - return &(__dw_regs(dw)->ch[ch].rd);
> + u32 ch_base;
> +
> + /*
> + * For Write, the channel register index starts at
> + * wr_base(ch_idx) = (2 * ch_idx) * ch_sep_sz
> + *
> + * For Read channel,
> + * rd_base(ch_idx) = (2 * ch_idx + 1) * ch_sep_sz
> + */
> + ch_base = 2 * ch;
> + if (dir == EDMA_DIR_READ)
> + ch_base += 1;
> +
> + return dw->chip->reg_base + (ch_base * dw->chip->ch_sep_sz);
[Severity: High]
Does this code verify that the computed channel register offset remains within
the mapped PCI BAR region?
If a malicious or misconfigured PCIe endpoint provides a large channel
separation size, could this calculation result in out-of-bounds MMIO accesses?
[Severity: High]
If platform drivers outside of dw-edma-pcie use HDMA natively and allocate
struct dw_edma_chip via devm_kzalloc without explicitly initializing
ch_sep_sz, does ch_sep_sz default to 0?
Could this cause all channel register accesses to map to offset 0, leading to
data corruption by incorrectly targeting Write Channel 0's registers?
> }
>
> diff --git a/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c b/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c
> index dcdc57fe976c1..33128685bbd90 100644
> --- a/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c
> +++ b/drivers/dma/dw-edma/dw-hdma-v0-debugfs.c
[ ... ]
> @@ -13,22 +13,17 @@
> #include "dw-hdma-v0-regs.h"
> #include "dw-edma-core.h"
>
> -#define REGS_ADDR(dw, name) \
> - ({ \
> - struct dw_hdma_v0_regs __iomem *__regs = (dw)->chip->reg_base; \
> - \
> - (void __iomem *)&__regs->name; \
> - })
> -
> #define REGS_CH_ADDR(dw, name, _dir, _ch) \
> ({ \
> - struct dw_hdma_v0_ch_regs __iomem *__ch_regs; \
> + struct dw_hdma_v0_ch_regs __iomem *__ch_regs; \
> + off_t __off = (dw)->chip->ch_sep_sz; \
> \
> - if (_dir == EDMA_DIR_READ) \
> - __ch_regs = REGS_ADDR(dw, ch[_ch].rd); \
> + if ((_dir) == EDMA_DIR_READ) \
> + __off *= (2 * (_ch) + 1); \
> else \
> - __ch_regs = REGS_ADDR(dw, ch[_ch].wr); \
> + __off *= (2 * (_ch)); \
> \
> + __ch_regs = ((dw)->chip->reg_base + __off); \
[Severity: High]
Could this also lead to out-of-bounds MMIO accesses during debugfs reads?
If the untrusted channel separation size is used to compute the offset, and
userspace triggers a debugfs read, it seems this could be exploited if not
validated against the BAR size.
> (void __iomem *)&__ch_regs->name; \
> })
>
> diff --git a/include/linux/dma/edma.h b/include/linux/dma/edma.h
> index 1fafd5b0e3153..a6c5728f03d38 100644
> --- a/include/linux/dma/edma.h
> +++ b/include/linux/dma/edma.h
> @@ -104,6 +104,7 @@ struct dw_edma_chip {
>
> struct dw_edma *dw;
> bool cfg_non_ll;
> + u32 ch_sep_sz;
[Severity: High]
Does this new field need a fallback default for non-PCIe drivers?
Other core drivers that instantiate struct dw_edma_chip for HDMA might not
explicitly set this, leaving it uninitialized.
> };
>
> /* Export to the platform drivers */
--
Sashiko AI review · https://sashiko.dev/#/patchset/20260722111640.1146212-1-devverma@amd.com?part=3
^ permalink raw reply [flat|nested] 7+ messages in thread