This is a note to let you know that I've just added the patch titled
net: sfp: fix state loss when updating state_hw_mask
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-sfp-fix-state-loss-when-updating-state_hw_mask.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 04361b8bb81819efb68bf39c276025e2250ac537 Mon Sep 17 00:00:00 2001
From: "Russell King (Oracle)" <rmk+kernel@xxxxxxxxxxxxxxx>
Date: Fri, 17 Mar 2023 07:28:00 +0000
Subject: net: sfp: fix state loss when updating state_hw_mask
From: Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx>
commit 04361b8bb81819efb68bf39c276025e2250ac537 upstream.
Andrew reports that the SFF modules on one of the ZII platforms do not
indicate link up due to the SFP code believing that LOS indicating that
there is no signal being received from the remote end, but in fact the
LOS signal is showing that there is signal.
What makes SFF modules different from SFPs is they typically have an
inverted LOS, which uncovered this issue. When we read the hardware
state, we mask it with state_hw_mask so we ignore anything we're not
interested in. However, we don't re-read when state_hw_mask changes,
leading to sfp->state being stale.
Arrange for a software poll of the module state after we have parsed
the EEPROM in sfp_sm_mod_probe() and updated state_*_mask. This will
generate any necessary events for signal changes for the state
machine as well as updating sfp->state.
Reported-by: Andrew Lunn <andrew@xxxxxxx>
Tested-by: Andrew Lunn <andrew@xxxxxxx>
Fixes: 8475c4b70b04 ("net: sfp: re-implement soft state polling setup")
Signed-off-by: Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/phy/sfp.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -2199,6 +2199,11 @@ static void sfp_sm_module(struct sfp *sf
break;
}
+ /* Force a poll to re-read the hardware signal state after
+ * sfp_sm_mod_probe() changed state_hw_mask.
+ */
+ mod_delayed_work(system_wq, &sfp->poll, 1);
+
err = sfp_hwmon_insert(sfp);
if (err)
dev_warn(sfp->dev, "hwmon probe failed: %pe\n",
Patches currently in stable-queue which might be from rmk+kernel@xxxxxxxxxxxxxxx are
queue-6.1/net-sfp-fix-state-loss-when-updating-state_hw_mask.patch
queue-6.1/net-bcmgenet-fix-eee-implementation.patch
