mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 840c5d327a27df01e0e6a606ac1da4b3be3db28d Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Wed, 10 Jul 2024 14:47:17 +0100
|
|
Subject: [PATCH 486/697] dmaengine: dw-axi-dmac: Honour snps,block-size
|
|
|
|
The snps,block-size DT property declares the maximum block size for each
|
|
channel of the dw-axi-dmac. However, the driver ignores these when
|
|
setting max_seg_size and uses MAX_BLOCK_SIZE (4096) instead.
|
|
|
|
To take advantage of the efficiencies of larger blocks, calculate the
|
|
minimum block size across all channels and use that instead.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/6256
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 15 ++++++++++++++-
|
|
1 file changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
|
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
|
@@ -1560,6 +1560,7 @@ static int dw_probe(struct platform_devi
|
|
struct dw_axi_dma *dw;
|
|
struct dw_axi_dma_hcfg *hdata;
|
|
struct reset_control *resets;
|
|
+ unsigned int max_seg_size;
|
|
unsigned int flags;
|
|
u32 i;
|
|
int ret;
|
|
@@ -1670,9 +1671,21 @@ static int dw_probe(struct platform_devi
|
|
* Synopsis DesignWare AxiDMA datasheet mentioned Maximum
|
|
* supported blocks is 1024. Device register width is 4 bytes.
|
|
* Therefore, set constraint to 1024 * 4.
|
|
+ * However, if all channels specify a greater value, use that instead.
|
|
*/
|
|
+
|
|
dw->dma.dev->dma_parms = &dw->dma_parms;
|
|
- dma_set_max_seg_size(&pdev->dev, MAX_BLOCK_SIZE);
|
|
+ max_seg_size = UINT_MAX;
|
|
+ for (i = 0; i < dw->hdata->nr_channels; i++) {
|
|
+ unsigned int block_size = chip->dw->hdata->block_size[i];
|
|
+
|
|
+ if (!block_size)
|
|
+ block_size = MAX_BLOCK_SIZE;
|
|
+ max_seg_size = min(block_size, max_seg_size);
|
|
+ }
|
|
+
|
|
+ dma_set_max_seg_size(&pdev->dev, max_seg_size);
|
|
+
|
|
platform_set_drvdata(pdev, chip);
|
|
|
|
pm_runtime_enable(chip->dev);
|