Skip to content

Commit

Permalink
dmaengine: dw-axi-dmac: Honour snps,block-size
Browse files Browse the repository at this point in the history
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: raspberrypi#6256

Signed-off-by: Phil Elwell <[email protected]>
  • Loading branch information
pelwell committed Jul 10, 2024
1 parent 99ae83f commit 475cdda
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -1470,6 +1470,7 @@ static int dw_probe(struct platform_device *pdev)
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;
Expand Down Expand Up @@ -1585,9 +1586,21 @@ static int dw_probe(struct platform_device *pdev)
* 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);
Expand Down

0 comments on commit 475cdda

Please sign in to comment.