mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 14:50:15 +04:00
John Audia
ff235f09b5
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.78
Removed upstreamed:
generic/pending-6.12/620-net-sfp-improve-Huawei-MA5671a-fixup.patch[1]
generic/pending-6.12/704-net-phy-register-phy-led_triggers-during-probe-to-av.patch[2]
airoha/patches-6.12/014-01-v6.13-net-airoha-fix-PSE-memory-configuration-in-airoha_fe.patch[3]
airoha/patches-6.12/014-02-v6.13-net-airoha-read-default-PSE-reserved-pages-value-bef.patch[4]
airoha/patches-6.12/031-01-v6.13-net-airoha-Read-completion-queue-data-in-airoha_qdma.patch[5]
airoha/patches-6.12/128-v7.1-net-airoha-Remove-airoha_dev_stop-in-airoha_remove.patch[6]
Manually rebased:
airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch
All patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=bbdf6d378e1ddbeadc04c57b182aadefcc3aa917
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=241cd64cf2e32b28ead151b1795cd8fef2b6e482
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=a04ac7bc97afe313e10ae4c73797c668dee47c5c
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=a9ed47c3663219e20406d566f02809de05373a42
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=4cba4373abac7ba27fdb33057a29b92efa8fd15d
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=652ec118d8dc1b088e685d5562995b6665463771
Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/22607
[Fix 048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol]
(cherry picked from commit bb3da35c90)
Link: https://github.com/openwrt/openwrt/pull/22699
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
44 lines
1.7 KiB
Diff
44 lines
1.7 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
|
|
@@ -2657,7 +2657,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);
|
|
@@ -4132,9 +4132,12 @@ 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;
|
|
+ }
|
|
priv->rx_rings[DESC_INDEX].rx_max_coalesced_frames = 1;
|
|
+ priv->rx_rings[DESC_INDEX].rx_coalesce_usecs = 50;
|
|
|
|
/* libphy will determine the link state */
|
|
netif_carrier_off(dev);
|