mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 12:40:16 +04:00
Shiji Yang
8f638f9366
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.91 Remove upstreamed patches: - airoha/patches-6.12/017-v6.13-net-airoha-Implement-BQL-support.patch[1] - airoha/patches-6.12/138-v7.1-net-airoha-Add-missing-RX_CPU_IDX-configuration-in-a.patch[2] - airoha/patches-6.12/149-v7.1-net-airoha-Move-ndesc-initialization-at-end-of-airoh.patch[3] - generic/backport-6.12/940-v7.1-net-dsa-realtek-rtl8365mb-fix-mode-mask-calculation.patch[5] Manually rebased patches: - airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch[1] - ath79/patches-6.12/800-leds-add-reset-controller-based-driver.patch[4] - bcm27xx/patches-6.12/950-0122-bcmgenet-Better-coalescing-parameter-defaults.patch[6] We also backported four patches to fix perf tool regression: - generic/backport-6.12/216-01-revert-perf-cgroup-update-metric-leader-in-evlist__e.patch - generic/backport-6.12/216-02-revert-perf-tool_pmu-fix-aggregation-on-duration_tim.patch - generic/backport-6.12/216-03-revert-perf-python-add-parse_events-function.patch - generic/backport-6.12/216-04-revert-perf-tool_pmu-factor-tool-events-into-their-o.patch All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=ca24fcac1daaa5e8a667981d81986a3eb4b9fb04 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=f00037a99bc2332ef59dc85298b98b20af165904 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=d36be272adda7f313e39dd118086955d993bf6a7 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=07d3611389ba7d78b80ea360a42ce32ab2521fbc [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=3354d6c62fd4baa7b32cbd80cc5a8aa3f2bd0656 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=b84351dcc359667bc952131c1424b692ec83dce2 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/23444 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 85d63789f941c1fae67dcdc803fa00facc58627c Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Wed, 10 Jul 2024 14:47:17 +0100
|
|
Subject: [PATCH] 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
|
|
@@ -1561,6 +1561,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;
|
|
@@ -1671,9 +1672,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);
|