mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
ec6293febc
Ran update_kernel.sh in a fresh clone without any existing toolchains.
Manually rebased:
pending-5.4/611-netfilter_match_bypass_default_table.patch
The upstream change affecting this patch is the revert of an earlier
kernel commit. Therefore, we just revert our corresponding changes
in [1].
Build system: x86_64
Build-tested: ipq806x/R7800
[1] 9b1b89229f ("kernel: bump 5.4 to 5.4.86")
Signed-off-by: John Audia <graysky@archlinux.us>
[adjust manually rebased patch, add explanation]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Tue, 16 Feb 2021 00:06:35 +0100
|
|
Subject: [PATCH] net: dsa: bcm_sf2: keep GPHY enabled on the BCM4908
|
|
|
|
Trying to access disabled PHY results in MDIO_READ_FAIL and:
|
|
[ 11.962886] brcm-sf2 80080000.switch wan: configuring for phy/internal link mode
|
|
[ 11.972500] 8021q: adding VLAN 0 to HW filter on device wan
|
|
[ 11.980205] ------------[ cut here ]------------
|
|
[ 11.984885] WARNING: CPU: 0 PID: 7 at phy_error+0x10/0x58
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
---
|
|
drivers/net/dsa/bcm_sf2.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
--- a/drivers/net/dsa/bcm_sf2.c
|
|
+++ b/drivers/net/dsa/bcm_sf2.c
|
|
@@ -1335,6 +1335,12 @@ static int bcm_sf2_sw_probe(struct platf
|
|
priv->hw_params.core_rev >> 8, priv->hw_params.core_rev & 0xff,
|
|
priv->irq0, priv->irq1);
|
|
|
|
+ /* BCM4908 has 5 GPHYs which means bcm_sf2_port_setup() will not enable
|
|
+ * GPHY when needed. Leave it enabled here.
|
|
+ */
|
|
+ if (priv->type == BCM4908_DEVICE_ID)
|
|
+ bcm_sf2_gphy_enable_set(priv->dev->ds, true);
|
|
+
|
|
return 0;
|
|
|
|
out_mdio:
|