mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 05:38:00 +00:00
3eb08538c4
This commit makes three changes all needed for the update of the 6.6 kernel. 1. Upstream kernel bump to 6.6.46 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.46 Manually rebased: bcm27xx/patches-6.6/950-0320-spi-spidev-Restore-loading-from-Device-Tree.patch All other patches automatically rebased. 2. Adjusted the following for new ksym[1] enabling it: armsr/config-6.6 bcm27xx/bcm2712/config-6.6 3. Added a fix to receiving fraglist GSO packets: generic/pending-6.6/601-udp-fix-receiving-fraglist-GSO_packets.patch[2] 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/arch/arm64/Kconfig?id=v6.6.46&id2=v6.6.45 2. https://marc.info/?l=linux-netdev&m=172407994500599&w=2 Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16173 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.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
|
|
@@ -1538,6 +1538,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:
|