d0520b880d
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.92 Remove upstreamed patches: - generic/backport-6.12/216-01-revert-perf-cgroup-update-metric-leader-in-evlist__e.patch[1] - generic/backport-6.12/216-02-revert-perf-tool_pmu-fix-aggregation-on-duration_tim.patch[2] - generic/backport-6.12/216-03-revert-perf-python-add-parse_events-function.patch[3] - generic/backport-6.12/216-04-revert-perf-tool_pmu-factor-tool-events-into-their-o.patch[4] - ath79/patches-6.12/301-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch[5] All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.92&id=546fc0fe44797e07dfb17898e019e0b543628f53 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.92&id=9fdca4c4d7eb942e83c81ef0e097303730ef72a6 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.92&id=94fc25a1f82aeaf7777478234ad38d90adb9d94f [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.92&id=709575a6ab20da63b2183ec4ac89a8e284ddbc1d [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.92&id=c6211c8832d542d93f4e030e6e6f79c45b219e13 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/23621 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From deba99bb2d9661e363cb7540871d2b733f012eb6 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Wed, 27 Mar 2019 13:45:46 +0000
|
|
Subject: [PATCH] bcmgenet: Better coalescing parameter defaults
|
|
|
|
Set defaults for TX and RX packet coalescing to be equivalent to:
|
|
|
|
# ethtool -C eth0 tx-frames 10
|
|
# ethtool -C eth0 rx-usecs 50
|
|
|
|
This may be something we want to set via DT parameters in the
|
|
future.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
|
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
|
@@ -2674,7 +2674,7 @@ static void bcmgenet_init_tx_ring(struct
|
|
|
|
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX);
|
|
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX);
|
|
- bcmgenet_tdma_ring_writel(priv, index, 1, DMA_MBUF_DONE_THRESH);
|
|
+ bcmgenet_tdma_ring_writel(priv, index, 10, DMA_MBUF_DONE_THRESH);
|
|
/* Disable rate control for now */
|
|
bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
|
|
TDMA_FLOW_PERIOD);
|
|
@@ -4073,8 +4073,10 @@ static int bcmgenet_probe(struct platfor
|
|
netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
|
|
|
|
/* Set default coalescing parameters */
|
|
- for (i = 0; i <= priv->hw_params->rx_queues; i++)
|
|
+ for (i = 0; i <= priv->hw_params->rx_queues; i++) {
|
|
priv->rx_rings[i].rx_max_coalesced_frames = 1;
|
|
+ priv->rx_rings[i].rx_coalesce_usecs = 50;
|
|
+ }
|
|
|
|
/* Initialize u64 stats seq counter for 32bit machines */
|
|
for (i = 0; i <= priv->hw_params->rx_queues; i++)
|