From: Greg Kroah-Hartman Date: Tue, 2 Jul 2024 08:52:33 +0000 (+0200) Subject: 6.9-stable patches X-Git-Tag: v4.19.317~56 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f8efb3289738df8044002b0fa2af08b33e02e28;p=thirdparty%2Fkernel%2Fstable-queue.git 6.9-stable patches added patches: revert-net-sfp-enhance-quirk-for-fibrestore-2.5g-copper-sfp-module.patch --- diff --git a/queue-6.9/revert-net-sfp-enhance-quirk-for-fibrestore-2.5g-copper-sfp-module.patch b/queue-6.9/revert-net-sfp-enhance-quirk-for-fibrestore-2.5g-copper-sfp-module.patch new file mode 100644 index 00000000000..d50a716f705 --- /dev/null +++ b/queue-6.9/revert-net-sfp-enhance-quirk-for-fibrestore-2.5g-copper-sfp-module.patch @@ -0,0 +1,72 @@ +From 514277d60844fc1488725c47f2dd6024c35dd016 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 2 Jul 2024 10:41:01 +0200 +Subject: Revert "net: sfp: enhance quirk for Fibrestore 2.5G copper SFP module" + +From: Greg Kroah-Hartman + +This reverts commit b3dcad0bfd62fcc9367d8092a71918db53804f53 which is +commit cd4a32e60061789676f7f018a94fcc9ec56732a0 upstream. + +Turned out that this should not have been applied to the stable tree. + +Link: https://lore.kernel.org/r/20240628172211.17ccefe9@dellmb +Reported-by: Marek Behún +Cc: Jiri Pirko +Cc: Jakub Kicinski +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/phy/sfp.c | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -385,23 +385,18 @@ static void sfp_fixup_rollball(struct sf + sfp->phy_t_retry = msecs_to_jiffies(1000); + } + +-static void sfp_fixup_fs_2_5gt(struct sfp *sfp) ++static void sfp_fixup_fs_10gt(struct sfp *sfp) + { ++ sfp_fixup_10gbaset_30m(sfp); + sfp_fixup_rollball(sfp); + +- /* The RollBall fixup is not enough for FS modules, the PHY chip inside ++ /* The RollBall fixup is not enough for FS modules, the AQR chip inside + * them does not return 0xffff for PHY ID registers in all MMDs for the + * while initializing. They need a 4 second wait before accessing PHY. + */ + sfp->module_t_wait = msecs_to_jiffies(4000); + } + +-static void sfp_fixup_fs_10gt(struct sfp *sfp) +-{ +- sfp_fixup_10gbaset_30m(sfp); +- sfp_fixup_fs_2_5gt(sfp); +-} +- + static void sfp_fixup_halny_gsfp(struct sfp *sfp) + { + /* Ignore the TX_FAULT and LOS signals on this module. +@@ -477,10 +472,6 @@ static const struct sfp_quirk sfp_quirks + // Rollball protocol to talk to the PHY. + SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt), + +- // Fiberstore SFP-2.5G-T uses Rollball protocol to talk to the PHY and +- // needs 4 sec wait before probing the PHY. +- SFP_QUIRK_F("FS", "SFP-2.5G-T", sfp_fixup_fs_2_5gt), +- + // Fiberstore GPON-ONU-34-20BI can operate at 2500base-X, but report 1.2GBd + // NRZ in their EEPROM + SFP_QUIRK("FS", "GPON-ONU-34-20BI", sfp_quirk_2500basex, +@@ -497,6 +488,9 @@ static const struct sfp_quirk sfp_quirks + SFP_QUIRK("HUAWEI", "MA5671A", sfp_quirk_2500basex, + sfp_fixup_ignore_tx_fault), + ++ // FS 2.5G Base-T ++ SFP_QUIRK_M("FS", "SFP-2.5G-T", sfp_quirk_oem_2_5g), ++ + // Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report + // 2500MBd NRZ in their EEPROM + SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex), diff --git a/queue-6.9/series b/queue-6.9/series index 40ab7033117..35ccbcba8c9 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -198,3 +198,4 @@ bcachefs-fix-sb-downgrade-validation.patch bcachefs-fix-bch2_sb_downgrade_update.patch bcachefs-fix-setting-of-downgrade-recovery-passes-errors.patch bcachefs-btree_gc-can-now-handle-unknown-btrees.patch +revert-net-sfp-enhance-quirk-for-fibrestore-2.5g-copper-sfp-module.patch