2022-09-09 13:08:16 +00:00
|
|
|
From 2b88563ee5aafd9571d965b7f2093a0f58d98a31 Mon Sep 17 00:00:00 2001
|
|
|
|
From: John Crispin <john@phrozen.org>
|
|
|
|
Date: Thu, 26 Nov 2020 12:02:21 +0100
|
|
|
|
Subject: net: phy: EEE support for rtl838x
|
|
|
|
|
|
|
|
* rename the target to realtek
|
|
|
|
* add refactored DSA driver
|
|
|
|
* add latest gpio driver
|
|
|
|
* lots of arch cleanups
|
|
|
|
* new irq driver
|
|
|
|
* additional boards
|
|
|
|
|
|
|
|
Submitted-by: Bert Vermeulen <bert@biot.com>
|
|
|
|
Submitted-by: Birger Koblitz <mail@birger-koblitz.de>
|
|
|
|
Submitted-by: Sander Vanheule <sander@svanheule.net>
|
|
|
|
Submitted-by: Bjørn Mork <bjorn@mork.no>
|
|
|
|
Submitted-by: John Crispin <john@phrozen.org>
|
|
|
|
---
|
|
|
|
drivers/net/phy/phylink. | 14 +++++++++++--
|
|
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
--- a/drivers/net/phy/phylink.c
|
|
|
|
+++ b/drivers/net/phy/phylink.c
|
kernel: bump 5.15 to 5.15.145
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.145
No patches needed a rebase.
23.05 backport:
Rebased patch mediatek/100-dts-update-mt7622-rfb1.patch due to
changes introduced in commit e37aa926447f ("arm64: dts: mediatek:
mt7622: fix memory node warning check") in version v5.15.143 and we
jumped over from v5.15.139 directly to v5.15.145.
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
23.05 backport:
Stijn:
Compile-tested: ath79/generic, ipq40xx/generic, mvebu/cortexa72, ramips/mt{7621,7620,76x8}, realtek/rtl{838x,930x}, 86/64.
Run-tested: cortexa72 (RB5009UG+S+IN), mt7621 (EAP615-Wall v1), rtl838x (GS1900-10HP, GS1900-8HP, GS108T v3).
Petr:
Compile-tested: ipq807x, mvebu/cortexa9
Run-tested: turris-omnia, prpl-haze
Tested-by: Stijn Segers <foss@volatilesystems.org> [23.05 testing]
Signed-off-by: John Audia <therealgraysky@proton.me>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [23.05 refresh]
(cherry picked from commit 8de4cc77a6d5c25e48566d0203f159287ac7f3fe)
2023-12-23 11:52:06 +00:00
|
|
|
@@ -1991,6 +1991,11 @@ int phylink_ethtool_ksettings_set(struct
|
2022-09-09 13:08:16 +00:00
|
|
|
* the presence of a PHY, this should not be changed as that
|
|
|
|
* should be determined from the media side advertisement.
|
|
|
|
*/
|
|
|
|
+ if (pl->phydev->drv->get_port && pl->phydev->drv->set_port) {
|
|
|
|
+ if(pl->phydev->drv->get_port(pl->phydev) != kset->base.port) {
|
|
|
|
+ pl->phydev->drv->set_port(pl->phydev, kset->base.port);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
return phy_ethtool_ksettings_set(pl->phydev, kset);
|
|
|
|
}
|
|
|
|
|
kernel: bump 5.15 to 5.15.145
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.145
No patches needed a rebase.
23.05 backport:
Rebased patch mediatek/100-dts-update-mt7622-rfb1.patch due to
changes introduced in commit e37aa926447f ("arm64: dts: mediatek:
mt7622: fix memory node warning check") in version v5.15.143 and we
jumped over from v5.15.139 directly to v5.15.145.
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
23.05 backport:
Stijn:
Compile-tested: ath79/generic, ipq40xx/generic, mvebu/cortexa72, ramips/mt{7621,7620,76x8}, realtek/rtl{838x,930x}, 86/64.
Run-tested: cortexa72 (RB5009UG+S+IN), mt7621 (EAP615-Wall v1), rtl838x (GS1900-10HP, GS1900-8HP, GS108T v3).
Petr:
Compile-tested: ipq807x, mvebu/cortexa9
Run-tested: turris-omnia, prpl-haze
Tested-by: Stijn Segers <foss@volatilesystems.org> [23.05 testing]
Signed-off-by: John Audia <therealgraysky@proton.me>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [23.05 refresh]
(cherry picked from commit 8de4cc77a6d5c25e48566d0203f159287ac7f3fe)
2023-12-23 11:52:06 +00:00
|
|
|
@@ -2294,8 +2299,11 @@ int phylink_ethtool_get_eee(struct phyli
|
2022-09-09 13:08:16 +00:00
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
- if (pl->phydev)
|
|
|
|
+ if (pl->phydev) {
|
|
|
|
+ if (pl->phydev->drv->get_eee)
|
|
|
|
+ return pl->phydev->drv->get_eee(pl->phydev, eee);
|
|
|
|
ret = phy_ethtool_get_eee(pl->phydev, eee);
|
|
|
|
+ }
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
kernel: bump 5.15 to 5.15.145
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.145
No patches needed a rebase.
23.05 backport:
Rebased patch mediatek/100-dts-update-mt7622-rfb1.patch due to
changes introduced in commit e37aa926447f ("arm64: dts: mediatek:
mt7622: fix memory node warning check") in version v5.15.143 and we
jumped over from v5.15.139 directly to v5.15.145.
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
23.05 backport:
Stijn:
Compile-tested: ath79/generic, ipq40xx/generic, mvebu/cortexa72, ramips/mt{7621,7620,76x8}, realtek/rtl{838x,930x}, 86/64.
Run-tested: cortexa72 (RB5009UG+S+IN), mt7621 (EAP615-Wall v1), rtl838x (GS1900-10HP, GS1900-8HP, GS108T v3).
Petr:
Compile-tested: ipq807x, mvebu/cortexa9
Run-tested: turris-omnia, prpl-haze
Tested-by: Stijn Segers <foss@volatilesystems.org> [23.05 testing]
Signed-off-by: John Audia <therealgraysky@proton.me>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [23.05 refresh]
(cherry picked from commit 8de4cc77a6d5c25e48566d0203f159287ac7f3fe)
2023-12-23 11:52:06 +00:00
|
|
|
@@ -2312,8 +2320,11 @@ int phylink_ethtool_set_eee(struct phyli
|
2022-09-09 13:08:16 +00:00
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
- if (pl->phydev)
|
|
|
|
+ if (pl->phydev) {
|
|
|
|
+ if (pl->phydev->drv->set_eee)
|
|
|
|
+ return pl->phydev->drv->set_eee(pl->phydev, eee);
|
|
|
|
ret = phy_ethtool_set_eee(pl->phydev, eee);
|
|
|
|
+ }
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|