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>
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 77c99eba357c028c1c390c4f8f3b3c7ba6cbf3cf Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Wed, 14 Dec 2022 15:00:51 +0000
|
|
Subject: [PATCH] net: bcmgenet: Add 'eee' module parameter
|
|
|
|
On some switches, having EEE enabled causes the link to become
|
|
unstable. With this patch, adding 'genet.eee=N' to the kernel command
|
|
line will cause EEE to be disabled on the link.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/4289
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 14 ++++++++++++++
|
|
1 file changed, 14 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
|
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
|
@@ -68,6 +68,9 @@ static void bcmgenet_set_rx_mode(struct
|
|
static bool skip_umac_reset = false;
|
|
module_param(skip_umac_reset, bool, 0444);
|
|
MODULE_PARM_DESC(skip_umac_reset, "Skip UMAC reset step");
|
|
+static bool eee = true;
|
|
+module_param(eee, bool, 0444);
|
|
+MODULE_PARM_DESC(eee, "Enable EEE (default Y)");
|
|
|
|
static inline void bcmgenet_writel(u32 value, void __iomem *offset)
|
|
{
|
|
@@ -3359,6 +3362,17 @@ static int bcmgenet_open(struct net_devi
|
|
|
|
bcmgenet_phy_pause_set(dev, priv->rx_pause, priv->tx_pause);
|
|
|
|
+ if (!eee) {
|
|
+ struct ethtool_keee eee_data;
|
|
+
|
|
+ ret = bcmgenet_get_eee(dev, &eee_data);
|
|
+ if (ret == 0) {
|
|
+ eee_data.eee_enabled = 0;
|
|
+ bcmgenet_set_eee(dev, &eee_data);
|
|
+ netdev_warn(dev, "EEE disabled\n");
|
|
+ }
|
|
+ }
|
|
+
|
|
bcmgenet_netif_start(dev);
|
|
|
|
netif_tx_start_all_queues(dev);
|