mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-04 06:54:27 -05:00
a1a9572f43
Backport commit fixing detection of SFP modules which has been broken since Linux 6.4 for some modules. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 97eb5d51b4a584a60e5d096bdb6b33edc9f50d8d Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Mon, 15 Jan 2024 12:43:38 +0000
|
|
Subject: [PATCH] net: sfp-bus: fix SFP mode detect from bitrate
|
|
|
|
The referenced commit moved the setting of the Autoneg and pause bits
|
|
early in sfp_parse_support(). However, we check whether the modes are
|
|
empty before using the bitrate to set some modes. Setting these bits
|
|
so early causes that test to always be false, preventing this working,
|
|
and thus some modules that used to work no longer do.
|
|
|
|
Move them just before the call to the quirk.
|
|
|
|
Fixes: 8110633db49d ("net: sfp-bus: allow SFP quirks to override Autoneg and pause bits")
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
|
|
Link: https://lore.kernel.org/r/E1rPMJW-001Ahf-L0@rmk-PC.armlinux.org.uk
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/phy/sfp-bus.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/phy/sfp-bus.c
|
|
+++ b/drivers/net/phy/sfp-bus.c
|
|
@@ -151,10 +151,6 @@ void sfp_parse_support(struct sfp_bus *b
|
|
unsigned int br_min, br_nom, br_max;
|
|
__ETHTOOL_DECLARE_LINK_MODE_MASK(modes) = { 0, };
|
|
|
|
- phylink_set(modes, Autoneg);
|
|
- phylink_set(modes, Pause);
|
|
- phylink_set(modes, Asym_Pause);
|
|
-
|
|
/* Decode the bitrate information to MBd */
|
|
br_min = br_nom = br_max = 0;
|
|
if (id->base.br_nominal) {
|
|
@@ -339,6 +335,10 @@ void sfp_parse_support(struct sfp_bus *b
|
|
}
|
|
}
|
|
|
|
+ phylink_set(modes, Autoneg);
|
|
+ phylink_set(modes, Pause);
|
|
+ phylink_set(modes, Asym_Pause);
|
|
+
|
|
if (bus->sfp_quirk && bus->sfp_quirk->modes)
|
|
bus->sfp_quirk->modes(id, modes, interfaces);
|
|
|