aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10/736-net-phy-at803x-add-at8031-features.patch
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2021-06-04 15:12:14 +0200
committerDavid Bauer <mail@david-bauer.net>2021-06-08 00:38:28 +0200
commit15167671b0d7cf0c95568dd6f9620db082df5d96 (patch)
tree2f282fa98f8329b63d8a63395a5ce18d8038d8b3 /target/linux/generic/pending-5.10/736-net-phy-at803x-add-at8031-features.patch
parent1412424fc51209480fa4efed9f3f0badc6dcab09 (diff)
downloadupstream-15167671b0d7cf0c95568dd6f9620db082df5d96.tar.gz
upstream-15167671b0d7cf0c95568dd6f9620db082df5d96.tar.bz2
upstream-15167671b0d7cf0c95568dd6f9620db082df5d96.zip
generic: backport at803x fixes
As patches for the AR8031/AR8033 copper page selection were merged upstream, we can backport these patches. This also fixes a PHY capabilities detection issue on the Ubiquiti ER-X-SFP. Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux/generic/pending-5.10/736-net-phy-at803x-add-at8031-features.patch')
-rw-r--r--target/linux/generic/pending-5.10/736-net-phy-at803x-add-at8031-features.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/target/linux/generic/pending-5.10/736-net-phy-at803x-add-at8031-features.patch b/target/linux/generic/pending-5.10/736-net-phy-at803x-add-at8031-features.patch
deleted file mode 100644
index 77d3946aae..0000000000
--- a/target/linux/generic/pending-5.10/736-net-phy-at803x-add-at8031-features.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add back explicit PHY feature flags for the AR8031 and
-AR8033 PHY instead of reading them from the PHY.
-
-The Botloader for Ubiquiti UniFi AC boards (and possibly more)
-leave fiber page selected, thus we will end up reading the PHY
-capabilities of the SGMII side (which does not offer 10 Mbit/s).
-
-We already have a hack in place, which switches back to the copper
-page, however this happens after capabilities are read.
-
-The original conversation about 735-net-phy-at803x-fix-at8033-sgmii-mode
-back in 2015 explicitly mention the UniFi AC Lite. The issue however is
-not missing autonegotiation on the Fiber side, but the fact the PHY
-is never switched to the copper side. So half of this patch is superfluous.
-
-A fix is currently being upstreamed. Once this is mainlined and available to us,
-these patches can be dropped:
-
-735-net-phy-at803x-fix-at8033-sgmii-mode.patch
-736-net-phy-at803x-add-at8031-features.patch
-
-This was tested on a UniFi AC Lite.
-
-See https://patchwork.kernel.org/project/netdevbpf/list/?series=467341
-
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -1119,7 +1119,7 @@ static struct phy_driver at803x_driver[]
- .get_wol = at803x_get_wol,
- .suspend = at803x_suspend,
- .resume = at803x_resume,
-- /* PHY_GBIT_FEATURES */
-+ .features = PHY_GBIT_FEATURES,
- .read_status = at803x_read_status,
- .aneg_done = at803x_aneg_done,
- .ack_interrupt = &at803x_ack_interrupt,