aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/743-net-sfp-add-module-start-stop-upstream-notifications.patch
diff options
context:
space:
mode:
authorMarek BehĂșn <marek.behun@nic.cz>2022-01-08 19:56:02 +0100
committerChristian Lamparter <chunkeey@gmail.com>2022-03-26 21:26:07 +0100
commit0e5350db439259347db2ab689325915864c75e06 (patch)
treef4cfd5f6d7ebc47c6241b29550113e79dbabae24 /target/linux/generic/pending-5.4/743-net-sfp-add-module-start-stop-upstream-notifications.patch
parent52de8bf86e616de1b86ec2ab5e874029339adb16 (diff)
downloadupstream-0e5350db439259347db2ab689325915864c75e06.tar.gz
upstream-0e5350db439259347db2ab689325915864c75e06.tar.bz2
upstream-0e5350db439259347db2ab689325915864c75e06.zip
mvebu: SFP backports for GPON modules
This backports the following upstream Linux patches net: sfp: add mode quirk for GPON module Ubiquiti U-Fiber Instant net: sfp: relax bitrate-derived mode check net: sfp: cope with SFPs that set both LOS normal and LOS inverted for 5.4 for mvebu platform. This fixes GPON modules: Ubiquiti U-Fiber Instant SFP GPON VSOL V2801F CarlitoxxPro CPGOS03-0490 v2.0 Signed-off-by: Marek BehĂșn <marek.behun@nic.cz>
Diffstat (limited to 'target/linux/generic/pending-5.4/743-net-sfp-add-module-start-stop-upstream-notifications.patch')
-rw-r--r--target/linux/generic/pending-5.4/743-net-sfp-add-module-start-stop-upstream-notifications.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/743-net-sfp-add-module-start-stop-upstream-notifications.patch b/target/linux/generic/pending-5.4/743-net-sfp-add-module-start-stop-upstream-notifications.patch
index ba1b5b5822..50200135dd 100644
--- a/target/linux/generic/pending-5.4/743-net-sfp-add-module-start-stop-upstream-notifications.patch
+++ b/target/linux/generic/pending-5.4/743-net-sfp-add-module-start-stop-upstream-notifications.patch
@@ -78,7 +78,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
[SFP_S_WAIT] = "wait",
[SFP_S_INIT] = "init",
[SFP_S_INIT_TX_FAULT] = "init_tx_fault",
-@@ -1918,6 +1920,8 @@ static void sfp_sm_main(struct sfp *sfp,
+@@ -1926,6 +1928,8 @@ static void sfp_sm_main(struct sfp *sfp,
if (sfp->sm_state == SFP_S_LINK_UP &&
sfp->sm_dev_state == SFP_DEV_UP)
sfp_sm_link_down(sfp);
@@ -87,7 +87,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (sfp->mod_phy)
sfp_sm_phy_detach(sfp);
sfp_module_tx_disable(sfp);
-@@ -1985,6 +1989,10 @@ static void sfp_sm_main(struct sfp *sfp,
+@@ -1993,6 +1997,10 @@ static void sfp_sm_main(struct sfp *sfp,
* clear. Probe for the PHY and check the LOS state.
*/
sfp_sm_probe_for_phy(sfp);