aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/759-net-sfp-re-attempt-probing-for-phy.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/759-net-sfp-re-attempt-probing-for-phy.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/759-net-sfp-re-attempt-probing-for-phy.patch')
-rw-r--r--target/linux/generic/pending-5.4/759-net-sfp-re-attempt-probing-for-phy.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/759-net-sfp-re-attempt-probing-for-phy.patch b/target/linux/generic/pending-5.4/759-net-sfp-re-attempt-probing-for-phy.patch
index aebb6b0398..27e2187398 100644
--- a/target/linux/generic/pending-5.4/759-net-sfp-re-attempt-probing-for-phy.patch
+++ b/target/linux/generic/pending-5.4/759-net-sfp-re-attempt-probing-for-phy.patch
@@ -69,7 +69,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (IS_ERR(phy)) {
dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy));
return PTR_ERR(phy);
-@@ -1954,6 +1961,7 @@ static void sfp_sm_module(struct sfp *sf
+@@ -1962,6 +1969,7 @@ static void sfp_sm_module(struct sfp *sf
static void sfp_sm_main(struct sfp *sfp, unsigned int event)
{
unsigned long timeout;
@@ -77,7 +77,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
/* Some events are global */
if (sfp->sm_state != SFP_S_DOWN &&
-@@ -2027,22 +2035,39 @@ static void sfp_sm_main(struct sfp *sfp,
+@@ -2035,22 +2043,39 @@ static void sfp_sm_main(struct sfp *sfp,
sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT,
sfp->sm_fault_retries == N_FAULT_INIT);
} else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) {