aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2019-04-11 17:59:44 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-01-23 15:28:03 +0100
commit26c25567751646f2ac45c389019a08e37170da73 (patch)
treef399ddb03d56ec40cb5e124bef2b6b34eb29520f /target/linux/ath79
parent0d416a8d3b990e3b78628f0e7546527709c877f7 (diff)
downloadupstream-26c25567751646f2ac45c389019a08e37170da73.tar.gz
upstream-26c25567751646f2ac45c389019a08e37170da73.tar.bz2
upstream-26c25567751646f2ac45c389019a08e37170da73.zip
ath79: allow to override AR8033 SGMII aneg status
In order to make the QCA955x SGMII workaround work, the unsuccessful SGMII autonegotiation on the AR8033 should not block the PHY state-machine. Otherwise, the ag71xx driver never becomes aware of the copper-side link-establishment and the workaround is never executed. Signed-off-by: David Bauer <mail@david-bauer.net> [remove one trailing whitespace per file] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch16
-rw-r--r--target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch16
2 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch b/target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch
new file mode 100644
index 0000000000..b0a1942b7a
--- /dev/null
+++ b/target/linux/ath79/patches-4.14/425-at803x-allow-sgmii-aneg-override.patch
@@ -0,0 +1,16 @@
+--- a/drivers/net/phy/at803x.c
++++ b/drivers/net/phy/at803x.c
+@@ -484,6 +484,13 @@ static int at803x_aneg_done(struct phy_d
+ if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
+ pr_warn("803x_aneg_done: SGMII link is not ok\n");
+ aneg_done = 0;
++#ifdef CONFIG_OF_MDIO
++ if (phydev->mdio.dev.of_node &&
++ of_property_read_bool(phydev->mdio.dev.of_node,
++ "at803x-override-sgmii-link-check")) {
++ aneg_done = 1;
++ }
++#endif
+ }
+ /* switch back to copper page */
+ phy_write(phydev, AT803X_REG_CHIP_CONFIG, ccr | AT803X_BT_BX_REG_SEL);
diff --git a/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch b/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch
new file mode 100644
index 0000000000..b0a1942b7a
--- /dev/null
+++ b/target/linux/ath79/patches-4.19/425-at803x-allow-sgmii-aneg-override.patch
@@ -0,0 +1,16 @@
+--- a/drivers/net/phy/at803x.c
++++ b/drivers/net/phy/at803x.c
+@@ -484,6 +484,13 @@ static int at803x_aneg_done(struct phy_d
+ if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
+ pr_warn("803x_aneg_done: SGMII link is not ok\n");
+ aneg_done = 0;
++#ifdef CONFIG_OF_MDIO
++ if (phydev->mdio.dev.of_node &&
++ of_property_read_bool(phydev->mdio.dev.of_node,
++ "at803x-override-sgmii-link-check")) {
++ aneg_done = 1;
++ }
++#endif
+ }
+ /* switch back to copper page */
+ phy_write(phydev, AT803X_REG_CHIP_CONFIG, ccr | AT803X_BT_BX_REG_SEL);