[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250709104210.3807203-4-o.rempel@pengutronix.de>
Date: Wed, 9 Jul 2025 12:42:10 +0200
From: Oleksij Rempel <o.rempel@...gutronix.de>
To: Andrew Lunn <andrew@...n.ch>,
Heiner Kallweit <hkallweit1@...il.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>
Cc: Oleksij Rempel <o.rempel@...gutronix.de>,
Lukas Wunner <lukas@...ner.de>,
kernel@...gutronix.de,
linux-kernel@...r.kernel.org,
Russell King <linux@...linux.org.uk>,
netdev@...r.kernel.org,
Andre Edich <andre.edich@...rochip.com>
Subject: [PATCH net v2 3/3] net: phy: smsc: recover missed link-up IRQs on LAN8700 with adaptive polling
Fix unreliable link detection on the LAN8700 PHY (integrated in LAN9512
and related USB adapters) when configured for 10 Mbit/s half- or
full-duplex with autonegotiation disabled, and connected to a link
partner that still advertises autonegotiation.
In this scenario, the PHY may emit several link-down interrupts during
negotiation but fail to raise a final link-up interrupt. As a result,
phylib never observes the transition and the kernel keeps the network
interface down, even though the link is actually up.
To handle this, add a get_next_update_time() callback that performs 1 Hz
polling for up to 30 seconds after the last interrupt, but only while
the PHY is in this problematic configuration and the link is still down.
This ensures link-up detection without unnecessary long delays or
full-time polling.
After 30 seconds with no further interrupt, the driver switches back to
IRQ-only mode. In all other configurations, IRQ-only mode is used
immediately.
This patch depends on:
- commit 8bf47e4d7b87 ("net: phy: Add support for driver-specific next
update time")
- a prior patch in this series:
net: phy: enable polling when driver implements get_next_update_time
net: phy: allow drivers to disable polling via get_next_update_time()
Fixes: 1ce8b37241ed ("usbnet: smsc95xx: Forward PHY interrupts to PHY driver to avoid polling")
Signed-off-by: Oleksij Rempel <o.rempel@...gutronix.de>
Cc: Lukas Wunner <lukas@...ner.de>
---
changes v2:
- Switch to hybrid approach: 1 Hz polling for 30 seconds after last IRQ
instead of relaxed 30s polling while link is up
- Only enable polling in problematic 10M autoneg-off mode while link is down
- Return PHY_STATE_IRQ in all other configurations
- Updated commit message and comments to reflect new logic
---
drivers/net/phy/smsc.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index b6489da5cfcd..88eb15700dbd 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -39,6 +39,9 @@
/* interval between phylib state machine runs in ms */
#define PHY_STATE_MACH_MS 1000
+/* max retry window for missed link-up */
+#define SMSC_IRQ_MAX_POLLING_TIME secs_to_jiffies(30)
+
struct smsc_hw_stat {
const char *string;
u8 reg;
@@ -54,6 +57,7 @@ struct smsc_phy_priv {
unsigned int edpd_mode_set_by_user:1;
unsigned int edpd_max_wait_ms;
bool wol_arp;
+ unsigned long last_irq;
};
static int smsc_phy_ack_interrupt(struct phy_device *phydev)
@@ -100,6 +104,7 @@ static int smsc_phy_config_edpd(struct phy_device *phydev)
irqreturn_t smsc_phy_handle_interrupt(struct phy_device *phydev)
{
+ struct smsc_phy_priv *priv = phydev->priv;
int irq_status;
irq_status = phy_read(phydev, MII_LAN83C185_ISF);
@@ -113,6 +118,8 @@ irqreturn_t smsc_phy_handle_interrupt(struct phy_device *phydev)
if (!(irq_status & MII_LAN83C185_ISF_INT_PHYLIB_EVENTS))
return IRQ_NONE;
+ WRITE_ONCE(priv->last_irq, jiffies);
+
phy_trigger_machine(phydev);
return IRQ_HANDLED;
@@ -684,6 +691,38 @@ int smsc_phy_probe(struct phy_device *phydev)
}
EXPORT_SYMBOL_GPL(smsc_phy_probe);
+static unsigned int smsc_phy_get_next_update(struct phy_device *phydev)
+{
+ struct smsc_phy_priv *priv = phydev->priv;
+
+ /* If interrupts are disabled, fall back to default polling */
+ if (phydev->irq == PHY_POLL)
+ return PHY_STATE_TIME;
+
+ /*
+ * LAN8700 may miss the final link-up IRQ when forced to 10 Mbps
+ * (half/full duplex) and connected to an autonegotiating partner.
+ *
+ * To recover, poll at 1 Hz for up to 30 seconds after the last
+ * interrupt - but only in this specific configuration and while
+ * the link is still down.
+ *
+ * This keeps link-up latency low in common cases while reliably
+ * detecting rare transitions. Outside of this mode, rely on IRQs.
+ */
+ if (phydev->autoneg == AUTONEG_DISABLE && phydev->speed == SPEED_10 &&
+ !phydev->link) {
+ unsigned long last_irq = READ_ONCE(priv->last_irq);
+
+ if (!time_is_before_jiffies(last_irq +
+ SMSC_IRQ_MAX_POLLING_TIME))
+ return PHY_STATE_TIME;
+ }
+
+ /* switching to IRQ without polling */
+ return PHY_STATE_IRQ;
+}
+
static struct phy_driver smsc_phy_driver[] = {
{
.phy_id = 0x0007c0a0, /* OUI=0x00800f, Model#=0x0a */
@@ -749,6 +788,7 @@ static struct phy_driver smsc_phy_driver[] = {
/* IRQ related */
.config_intr = smsc_phy_config_intr,
.handle_interrupt = smsc_phy_handle_interrupt,
+ .get_next_update_time = smsc_phy_get_next_update,
/* Statistics */
.get_sset_count = smsc_get_sset_count,
--
2.39.5
Powered by blists - more mailing lists