dmaengine: dw-edma: Enable HDMA 64R/W Channels
Subsystems (2)
PATCH v8 1/1 dmaengine: dw-edma: Enable HDMA 64R/W Channels
From: Devendra K Verma <[email protected]>
As per 'Designware Cores PCI Express Controller Databook', Section 7.1 - Overview, HDMA supports 64 Read and 64 Write channels. Current controller driver supports up to 8 read and write channels only. In order to utilize all the channels the controller driver need to have the channel related structs and variables as per the number of channels supported by IP. Following changes are made to enable 64 Read / 64 Write channel support:
o Defined HDMA specific macros to reflect the channel count.
o The count of ll_regions and dt_regions in dw_edma_chip and dw_edma_pcie_data shall be in accordance to number of read and write channels.
o In dw_edma_probe() configure the channels as per the channels of the IP used.
o Changed mask types to u64 for higher channel counts.
---
Changes in v7:
o Added Reviewed-by Tag
Changes in v6:
o In declaring bitmap variables wr/rd_mask, replaced constants with the macros defined for max channel count.
Changes in v5:
o Changed the {wr,rd}_mask type to BITMAP type for eDMA/HDMA as per the review comment.
o Changed the 'mask' var type to pointer to ul.
Changes in v4:
o Changed 'mask' variable to a bitmap type as per the review comment.
Changes in v3:
o Reverted the FIX for AI reported GET_CH_32() issue, as per the recommendation of reviewers, need to create separate patch for it.
Changes in v2:
o Fixed the pre-existing bug related to GET_CH_32 interchanging the channel direction and id. This bug was not caused by any version of this patch.
o Fixed the issue when using for_each_set_bit() for mask of u64 type.
Changes in v1:
o On review recommendation of sashiko bot, in the function dw_hdma_v0_core_off(), the loop iterates over registers as per the number of channels enabled and not on total number of channels supported.
o Changed mask types to u64 for higher channel counts.
--- drivers/dma/dw-edma/dw-edma-core.c | 19 +++++++++++++------ drivers/dma/dw-edma/dw-edma-core.h | 5 +++-- drivers/dma/dw-edma/dw-edma-pcie.c | 8 ++++---- drivers/dma/dw-edma/dw-edma-v0-core.c | 6 +++--- drivers/dma/dw-edma/dw-hdma-v0-core.c | 27 +++++++++++++++++++-------- drivers/dma/dw-edma/dw-hdma-v0-regs.h | 2 +- include/linux/dma/edma.h | 10 ++++++---- 7 files changed, 49 insertions(+), 28 deletions(-)
drivers/dma/dw-edma/dw-edma-core.c +13 -6
@@ -925,9 +925,9 @@ static int dw_edma_channel_setup(struct dw_edma *dw, u32 wr_alloc, u32 rd_alloc) irq = &dw->irq[pos];if (chan->dir ==EDMA_DIR_WRITE ) - irq->wr_mask |=BIT (chan->id); +bitmap_set (irq->wr_mask, chan->id,1 );else - irq->rd_mask |=BIT (chan->id); +bitmap_set (irq->rd_mask, chan->id,1 ); irq->dw = dw;memcpy (&chan->msi, &irq->msi,sizeof (chan->msi));
@@ -1079,6 +1079,8 @@ int dw_edma_probe(struct dw_edma_chip *chip)struct dw_edma *dw;u32 wr_alloc =0 ;u32 rd_alloc =0 ; +u16 max_wr_cnt; +u16 max_rd_cnt;int i, err;if (!chip)
@@ -1094,20 +1096,25 @@ int dw_edma_probe(struct dw_edma_chip *chip) dw->chip = chip; -if (dw->chip->mf ==EDMA_MF_HDMA_NATIVE ) +if (dw->chip->mf ==EDMA_MF_HDMA_NATIVE ) {dw_hdma_v0_core_register (dw); -else + max_wr_cnt =HDMA_MAX_WR_CH ; + max_rd_cnt =HDMA_MAX_RD_CH ; + }else {dw_edma_v0_core_register (dw); + max_wr_cnt =EDMA_MAX_WR_CH ; + max_rd_cnt =EDMA_MAX_RD_CH ; + }raw_spin_lock_init (&dw->lock); dw->wr_ch_cnt =min_t (u16, chip->ll_wr_cnt,dw_edma_core_ch_count (dw,EDMA_DIR_WRITE )); - dw->wr_ch_cnt =min_t (u16, dw->wr_ch_cnt,EDMA_MAX_WR_CH ); + dw->wr_ch_cnt =min_t (u16, dw->wr_ch_cnt, max_wr_cnt); dw->rd_ch_cnt =min_t (u16, chip->ll_rd_cnt,dw_edma_core_ch_count (dw,EDMA_DIR_READ )); - dw->rd_ch_cnt =min_t (u16, dw->rd_ch_cnt,EDMA_MAX_RD_CH ); + dw->rd_ch_cnt =min_t (u16, dw->rd_ch_cnt, max_rd_cnt);if (!dw->wr_ch_cnt && !dw->rd_ch_cnt)return -EINVAL ;
drivers/dma/dw-edma/dw-edma-core.h +3 -2
@@ -91,9 +91,10 @@ struct dw_edma_chan {struct dw_edma_irq {struct msi_msg msi; -u32 wr_mask; -u32 rd_mask;struct dw_edma *dw; + + DECLARE_BITMAP(wr_mask, HDMA_MAX_WR_CH); + DECLARE_BITMAP(rd_mask, HDMA_MAX_RD_CH); };struct dw_edma {
drivers/dma/dw-edma/dw-edma-pcie.c +4 -4
@@ -61,11 +61,11 @@ struct dw_edma_pcie_data {/* eDMA registers location */ struct dw_edma_block rg;/* eDMA memory linked list location */ -struct dw_edma_block ll_wr[EDMA_MAX_WR_CH ]; -struct dw_edma_block ll_rd[EDMA_MAX_RD_CH ]; +struct dw_edma_block ll_wr[HDMA_MAX_WR_CH ]; +struct dw_edma_block ll_rd[HDMA_MAX_RD_CH ];/* eDMA memory data location */ -struct dw_edma_block dt_wr[EDMA_MAX_WR_CH ]; -struct dw_edma_block dt_rd[EDMA_MAX_RD_CH ]; +struct dw_edma_block dt_wr[HDMA_MAX_WR_CH ]; +struct dw_edma_block dt_rd[HDMA_MAX_RD_CH ];/* Other */ enum dw_edma_map_format mf;u8 irqs;
drivers/dma/dw-edma/dw-edma-v0-core.c +3 -3
@@ -239,7 +239,7 @@ dw_edma_v0_core_handle_int(struct dw_edma_irq *dw_irq, enum dw_edma_dir dir,irqreturn_t ret =IRQ_NONE ;struct dw_edma_chan *chan;unsigned long off; -u32 mask; +unsigned long *mask;if (dir ==EDMA_DIR_WRITE ) { total = dw->wr_ch_cnt;
@@ -252,7 +252,7 @@ dw_edma_v0_core_handle_int(struct dw_edma_irq *dw_irq, enum dw_edma_dir dir, } val =dw_edma_v0_core_status_done_int (dw, dir); - val &= mask; + val &= *mask;for_each_set_bit (pos, &val, total) { chan = &dw->chan[pos + off];
@@ -263,7 +263,7 @@ dw_edma_v0_core_handle_int(struct dw_edma_irq *dw_irq, enum dw_edma_dir dir, } val =dw_edma_v0_core_status_abort_int (dw, dir); - val &= mask; + val &= *mask;for_each_set_bit (pos, &val, total) { chan = &dw->chan[pos + off];
drivers/dma/dw-edma/dw-hdma-v0-core.c +19 -8
@@ -53,13 +53,24 @@ __dw_ch_regs(struct dw_edma *dw, enum dw_edma_dir dir, u16 ch)static void dw_hdma_v0_core_off (struct dw_edma *dw) {int id; +enum dw_edma_dir dir; + + dir =EDMA_DIR_WRITE ; +for (id =0 ; id < dw->wr_ch_cnt; id++) { +SET_CH_32 (dw, dir, id, int_setup, +HDMA_V0_STOP_INT_MASK |HDMA_V0_ABORT_INT_MASK ); +SET_CH_32 (dw, dir, id, int_clear, +HDMA_V0_STOP_INT_MASK |HDMA_V0_ABORT_INT_MASK ); +SET_CH_32 (dw, dir, id, ch_en,0 ); + } -for (id =0 ; id <HDMA_V0_MAX_NR_CH ; id++) { -SET_BOTH_CH_32 (dw, id, int_setup, -HDMA_V0_STOP_INT_MASK |HDMA_V0_ABORT_INT_MASK ); -SET_BOTH_CH_32 (dw, id, int_clear, -HDMA_V0_STOP_INT_MASK |HDMA_V0_ABORT_INT_MASK ); -SET_BOTH_CH_32 (dw, id, ch_en,0 ); + dir =EDMA_DIR_READ ; +for (id =0 ; id < dw->rd_ch_cnt; id++) { +SET_CH_32 (dw, dir, id, int_setup, +HDMA_V0_STOP_INT_MASK |HDMA_V0_ABORT_INT_MASK ); +SET_CH_32 (dw, dir, id, int_clear, +HDMA_V0_STOP_INT_MASK |HDMA_V0_ABORT_INT_MASK ); +SET_CH_32 (dw, dir, id, ch_en,0 ); } }
@@ -118,7 +129,7 @@ dw_hdma_v0_core_handle_int(struct dw_edma_irq *dw_irq, enum dw_edma_dir dir,unsigned long total, pos, val;irqreturn_t ret =IRQ_NONE ;struct dw_edma_chan *chan; -unsigned long off, mask; +unsigned long off, *mask;if (dir ==EDMA_DIR_WRITE ) { total = dw->wr_ch_cnt;
@@ -130,7 +141,7 @@ dw_hdma_v0_core_handle_int(struct dw_edma_irq *dw_irq, enum dw_edma_dir dir, mask = dw_irq->rd_mask; } -for_each_set_bit (pos, &mask, total) { +for_each_set_bit (pos, mask, total) { chan = &dw->chan[pos + off]; val =dw_hdma_v0_core_status_int (chan);
drivers/dma/dw-edma/dw-hdma-v0-regs.h +1 -1
@@ -11,7 +11,7 @@#include <linux/dmaengine.h> -#define HDMA_V0_MAX_NR_CH 8 +#define HDMA_V0_MAX_NR_CH 64#define HDMA_V0_CH_EN BIT(0)#define HDMA_V0_LOCAL_ABORT_INT_EN BIT(6)#define HDMA_V0_REMOTE_ABORT_INT_EN BIT(5)
include/linux/dma/edma.h +6 -4
@@ -14,6 +14,8 @@#define EDMA_MAX_WR_CH 8#define EDMA_MAX_RD_CH 8 +#define HDMA_MAX_WR_CH 64 +#define HDMA_MAX_RD_CH 64struct dw_edma ;
@@ -89,12 +91,12 @@ struct dw_edma_chip {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 ]; +struct dw_edma_region ll_region_wr[HDMA_MAX_WR_CH ]; +struct dw_edma_region ll_region_rd[HDMA_MAX_RD_CH ];/* data region */ -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_region dt_region_wr[HDMA_MAX_WR_CH ]; +struct dw_edma_region dt_region_rd[HDMA_MAX_RD_CH ];/* interrupt emulation */ int db_irq;
Signature · 1 line
2.43.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 4 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 4 potential issue(s) to consider:
New issues:
- [High] The DesignWare PCIe controller frontend fails initialization for platforms attempting to use 64 HDMA channels due to hardcoded legacy channel limits.
- [Medium] The dw-edma-pcie endpoint driver silently caps dynamically detected channel counts to 8.
Pre-existing issues:
- [High] A race condition during initialization causes a guaranteed NULL pointer dereference if a shared or spurious interrupt occurs early.
- [High] Incorrect argument order in dw_hdma_v0_core_ch_status leads to invalid register reads, breaking DMA status reporting. --
--- Patch [1]: [PATCH v8] dmaengine: dw-edma: Enable HDMA 64R/W Channels --- commit 639271379db4829feeac5972fb5074c44780d440
Author: Devendra K Verma <[email protected]>
dmaengine: dw-edma: Enable HDMA 64R/W Channels
This patch introduces support for up to 64 read and write channels in the DesignWare HDMA controller. It defines new macros for HDMA maximum channel counts, updates data structures, and transitions bitmasks to 64-bit bitmaps to accommodate the expanded channel limits.
Quoted 4 lines
Changes in v3:
o Reverted the FIX for AI reportedGET_CH_32()issue, as per the recommendation of reviewers, need to create separate patch for it.
[Severity: High]
This isn't a bug introduced by this patch, but does the incorrect argument order in dw_hdma_v0_core_ch_status() still lead to invalid register reads?
When the DMA status is checked, dw_hdma_v0_core_ch_status() calls GET_CH_32() with the channel ID and direction swapped:
tmp = FIELD_GET(HDMA_V0_CH_STATUS_MASK,
GET_CH_32(dw, chan->id, chan->dir, ch_stat));
The macro evaluates the numeric channel ID as the direction and uses the direction as the channel index, which breaks DMA status reporting.
Quoted 3 lines
drivers/dma/dw-edma/dw-edma-core.c +0
-0
[ ... ]
drivers/dma/dw-edma/dw-edma-core.c static int dw_edma_channel_setup(struct dw_edma *dw, u32 wr_alloc, u32 rd_alloc) · line 932
Quoted 11 lines
drivers/dma/dw-edma/dw-edma-core.c +2
-2@@ -925,9 +925,9 @@ static int dw_edma_channel_setup(struct dw_edma *dw, u32 wr_alloc, u32 rd_alloc) irq = &dw->irq[pos];if (chan->dir ==EDMA_DIR_WRITE ) - irq->wr_mask |=BIT (chan->id); +bitmap_set (irq->wr_mask, chan->id,1 );else - irq->rd_mask |=BIT (chan->id); +bitmap_set (irq->rd_mask, chan->id,1 ); irq->dw = dw;
[Severity: High]
This is a pre-existing issue, but does this initialization sequence leave a race condition that causes a NULL pointer dereference if a shared interrupt fires early?
In dw_edma_probe(), dw_edma_irq_request() calls request_irq() with IRQF_SHARED while dw->irq[i].dw is still NULL.
If an interrupt fires immediately after registration, dw_edma_interrupt_common() executes and dereferences dw_irq->dw to call dw->core->handle_int. This will dereference the NULL pointer before dw_edma_channel_setup() finishes initialization here.
drivers/dma/dw-edma/dw-edma-pcie.c struct dw_edma_pcie_data { · line 66
Quoted 11 lines
drivers/dma/dw-edma/dw-edma-pcie.c +2
-2@@ -62,11 +62,11 @@ struct dw_edma_pcie_data {/* eDMA registers location */ struct dw_edma_block rg;/* eDMA memory linked list location */ -struct dw_edma_block ll_wr[EDMA_MAX_WR_CH ]; -struct dw_edma_block ll_rd[EDMA_MAX_RD_CH ]; +struct dw_edma_block ll_wr[HDMA_MAX_WR_CH ]; +struct dw_edma_block ll_rd[HDMA_MAX_RD_CH ];
[Severity: Medium]
Does the dw-edma-pcie endpoint driver silently cap dynamically detected channel counts to 8, defeating the purpose of the 64-channel support?
During probe, dw_edma_pcie_get_xilinx_dma_data() reads the channel count from the hardware VSEC but caps it using the static template limit:
pdata->wr_ch_cnt = min(pdata->wr_ch_cnt,
FIELD_GET(DW_PCIE_XILINX_MDB_VSEC_DMA_WR_CH, val));Since pdata is initialized from xilinx_mdb_data which statically defines a maximum of 8 channels, the dynamically read channel count is bounded and will never exceed 8.
include/linux/dma/edma.h line 18
Quoted 9 lines
include/linux/dma/edma.h +2
-0@@ -14,6 +14,8 @@#define EDMA_MAX_WR_CH 8#define EDMA_MAX_RD_CH 8 +#define HDMA_MAX_WR_CH 64 +#define HDMA_MAX_RD_CH 64
[Severity: High]
Will the DesignWare PCIe controller frontend fail initialization with -EINVAL for platforms attempting to use 64 HDMA channels?
When an HDMA platform is probed, dw_pcie_edma_find_channels() in drivers/pci/controller/dwc/pcie-designware.c still uses the legacy EDMA_MAX_WR_CH limit:
if (!pci->edma.ll_wr_cnt || pci->edma.ll_wr_cnt > EDMA_MAX_WR_CH ||
!pci->edma.ll_rd_cnt || pci->edma.ll_rd_cnt > EDMA_MAX_RD_CH)
return -EINVAL;Additionally, dw_pcie_edma_irq_vector() rejects requested IRQ numbers that are greater than the legacy maximums:
if (nr >= EDMA_MAX_WR_CH + EDMA_MAX_RD_CH)
return -EINVAL;This artificial cap at 16 seems insufficient for platforms using the new 64-channel support.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 61 lines · On 13-Jul-26 12:37, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 4 potential issue(s) to consider:
New issues:
- [High] The DesignWare PCIe controller frontend fails initialization for platforms attempting to use 64 HDMA channels due to hardcoded legacy channel limits.
- [Medium] The dw-edma-pcie endpoint driver silently caps dynamically detected channel counts to 8.Pre-existing issues:
- [High] A race condition during initialization causes a guaranteed NULL pointer dereference if a shared or spurious interrupt occurs early.
- [High] Incorrect argument order indw_hdma_v0_core_ch_statusleads to invalid register reads, breaking DMA status reporting. ----- Patch [1]: [PATCH v8] dmaengine: dw-edma: Enable HDMA 64R/W Channels --- commit
639271379db4829feeac5972fb5074c44780d440
Author: Devendra K Verma <[email protected]>dmaengine: dw-edma: Enable HDMA 64R/W Channels
This patch introduces support for up to 64 read and write channels in the DesignWare HDMA controller. It defines new macros for HDMA maximum channel counts, updates data structures, and transitions bitmasks to 64-bit bitmaps to accommodate the expanded channel limits.
Quoted 4 lines
Changes in v3:
o Reverted the FIX for AI reportedGET_CH_32()issue, as per the recommendation of reviewers, need to create separate patch for it.[Severity: High]
This isn't a bug introduced by this patch, but does the incorrect argument order indw_hdma_v0_core_ch_status()still lead to invalid register reads?When the DMA status is checked,
dw_hdma_v0_core_ch_status()callsGET_CH_32()with the channel ID and direction swapped:tmp = FIELD_GET(HDMA_V0_CH_STATUS_MASK,
GET_CH_32(dw, chan->id, chan->dir, ch_stat));The macro evaluates the numeric channel ID as the direction and uses the direction as the channel index, which breaks DMA status reporting.
Quoted 3 lines
drivers/dma/dw-edma/dw-edma-core.c +0
-0[ ... ]
drivers/dma/dw-edma/dw-edma-core.c static int dw_edma_channel_setup(struct dw_edma *dw, u32 wr_alloc, u32 rd_alloc) · line 932
Quoted 11 lines
drivers/dma/dw-edma/dw-edma-core.c +2
-2@@ -925,9 +925,9 @@ static int dw_edma_channel_setup(struct dw_edma *dw, u32 wr_alloc, u32 rd_alloc) irq = &dw->irq[pos];if (chan->dir ==EDMA_DIR_WRITE ) - irq->wr_mask |=BIT (chan->id); +bitmap_set (irq->wr_mask, chan->id,1 );else - irq->rd_mask |=BIT (chan->id); +bitmap_set (irq->rd_mask, chan->id,1 ); irq->dw = dw;[Severity: High]
This is a pre-existing issue, but does this initialization sequence leave a race condition that causes a NULL pointer dereference if a shared interrupt fires early?
Quoted 8 lines
In
dw_edma_probe(),dw_edma_irq_request()callsrequest_irq()withIRQF_SHAREDwhile dw->irq[i].dw is still NULL.If an interrupt fires immediately after registration,
dw_edma_interrupt_common()executes and dereferencesdw_irq->dwto calldw->core->handle_int. This will dereference the NULL pointer beforedw_edma_channel_setup()finishes initialization here.
This is a new issue and shall be taken in a separate patch series.
Quoted 19 lines
drivers/dma/dw-edma/dw-edma-pcie.c struct dw_edma_pcie_data { · line 66
Quoted 11 lines
drivers/dma/dw-edma/dw-edma-pcie.c +2
-2@@ -62,11 +62,11 @@ struct dw_edma_pcie_data {/* eDMA registers location */ struct dw_edma_block rg;/* eDMA memory linked list location */ -struct dw_edma_block ll_wr[EDMA_MAX_WR_CH ]; -struct dw_edma_block ll_rd[EDMA_MAX_RD_CH ]; +struct dw_edma_block ll_wr[HDMA_MAX_WR_CH ]; +struct dw_edma_block ll_rd[HDMA_MAX_RD_CH ];[Severity: Medium]
Does the dw-edma-pcie endpoint driver silently cap dynamically detected channel counts to 8, defeating the purpose of the 64-channel support?During probe,
dw_edma_pcie_get_xilinx_dma_data()reads the channel count from the hardware VSEC but caps it using the static template limit:
Quoted 6 lines
pdata->wr_ch_cnt = min(pdata->wr_ch_cnt, FIELD_GET(DW_PCIE_XILINX_MDB_VSEC_DMA_WR_CH, val));Since pdata is initialized from
xilinx_mdb_datawhich statically defines a maximum of 8 channels, the dynamically read channel count is bounded and will never exceed 8.
The Xilinx MDB only supports 8 Read / 8 Write channels. Enhancing the support for 64 R/W channels will not cause any issue here. The capping specifically for the IPs which support only 8 R/W channels is good thing to do here.
Quoted 15 lines
include/linux/dma/edma.h line 18
Quoted 10 lines
include/linux/dma/edma.h +2
-0@@ -14,6 +14,8 @@#define EDMA_MAX_WR_CH 8#define EDMA_MAX_RD_CH 8 +#define HDMA_MAX_WR_CH 64 +#define HDMA_MAX_RD_CH 64[Severity: High]
Will the DesignWare PCIe controller frontend fail initialization with-EINVALfor platforms attempting to use 64 HDMA channels?
Quoted 8 lines
When an HDMA platform is probed,
dw_pcie_edma_find_channels()indrivers/pci/controller/dwc/pcie-designware.cstill uses the legacyEDMA_MAX_WR_CHlimit:if (!pci->edma.ll_wr_cnt || pci->edma.ll_wr_cnt > EDMA_MAX_WR_CH || !pci->edma.ll_rd_cnt || pci->edma.ll_rd_cnt > EDMA_MAX_RD_CH) return -EINVAL;
This specific function is implemented for non-HDMA IPs. Having support for 64 R/W channels for HDMA will not affect any of the above.
Quoted 9 lines
Additionally,
dw_pcie_edma_irq_vector()rejects requested IRQ numbers that are greater than the legacy maximums:if (nr >= EDMA_MAX_WR_CH + EDMA_MAX_RD_CH) return -EINVAL;This artificial cap at 16 seems insufficient for platforms using the new 64-channel support.
Though, the irqs allocated by the number of channels, this change will not affect any functionality. This is a new issue and shall be addressed in new patch series.
-Devendra
Quoted 10 lines · Devendra K Verma
As per 'Designware Cores PCI Express Controller Databook', Section 7.1 - Overview, HDMA supports 64 Read and 64 Write channels. Current controller driver supports up to 8 read and write channels only. In order to utilize all the channels the controller driver need to have the channel related structs and variables as per the number of channels supported by IP. Following changes are made to enable 64 Read / 64 Write channel support:
[...]
Applied, thanks!
[1/1] dmaengine: dw-edma: Enable HDMA 64R/W Channels
commit: 64173b6b7609acb88fb763041c9e496caa6e834d
Best regards,
Signature · 1 line
~Vinod