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>
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 8d428b0009134f7bc9779d5cb966944cf4790221 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Fri, 9 Aug 2019 08:51:43 +0100
|
|
Subject: [PATCH] net: bcmgenet: Workaround #2 for Pi4 Ethernet fail
|
|
|
|
Some combinations of Pi 4Bs and Ethernet switches don't reliably get a
|
|
DCHP-assigned IP address, leaving the unit with a self=assigned 169.254
|
|
address. In the failure case, the Pi is left able to receive packets
|
|
but not send them, suggesting that the MAC<->PHY link is getting into
|
|
a bad state.
|
|
|
|
It has been found empirically that skipping a reset step by the genet
|
|
driver prevents the failures. No downsides have been discovered yet,
|
|
and unlike the forced renegotiation it doesn't increase the time to
|
|
get an IP address, so the workaround is enabled by default; add
|
|
|
|
genet.skip_umac_reset=n
|
|
|
|
to the command line to disable it.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/3108
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
|
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
|
@@ -65,6 +65,9 @@
|
|
|
|
/* Forward declarations */
|
|
static void bcmgenet_set_rx_mode(struct net_device *dev);
|
|
+static bool skip_umac_reset = true;
|
|
+module_param(skip_umac_reset, bool, 0444);
|
|
+MODULE_PARM_DESC(skip_umac_reset, "Skip UMAC reset step");
|
|
|
|
static inline void bcmgenet_writel(u32 value, void __iomem *offset)
|
|
{
|
|
@@ -2512,6 +2515,11 @@ static void reset_umac(struct bcmgenet_p
|
|
bcmgenet_rbuf_ctrl_set(priv, 0);
|
|
udelay(10);
|
|
|
|
+ if (skip_umac_reset) {
|
|
+ pr_warn("Skipping UMAC reset\n");
|
|
+ return;
|
|
+ }
|
|
+
|
|
/* issue soft reset and disable MAC while updating its registers */
|
|
spin_lock_bh(&priv->reg_lock);
|
|
bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD);
|