2bf9ea6a31
Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
177 lines
5 KiB
Diff
177 lines
5 KiB
Diff
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Date: Sun, 12 Feb 2017 17:27:17 +0100
|
|
Subject: [PATCH] phy: provide a hook for link up/link down events
|
|
|
|
Sometimes, we need to do additional work between the PHY coming up and
|
|
marking the carrier present - for example, we may need to wait for the
|
|
PHY to MAC link to finish negotiation. This changes phylib to provide
|
|
a notification function pointer which avoids the built-in
|
|
netif_carrier_on() and netif_carrier_off() functions.
|
|
|
|
Standard ->adjust_link functionality is provided by hooking a helper
|
|
into the new ->phy_link_change method.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
---
|
|
|
|
--- a/drivers/net/phy/phy.c
|
|
+++ b/drivers/net/phy/phy.c
|
|
@@ -955,6 +955,16 @@ void phy_start(struct phy_device *phydev
|
|
}
|
|
EXPORT_SYMBOL(phy_start);
|
|
|
|
+static void phy_link_up(struct phy_device *phydev)
|
|
+{
|
|
+ phydev->phy_link_change(phydev, true, true);
|
|
+}
|
|
+
|
|
+static void phy_link_down(struct phy_device *phydev, bool do_carrier)
|
|
+{
|
|
+ phydev->phy_link_change(phydev, false, do_carrier);
|
|
+}
|
|
+
|
|
/**
|
|
* phy_state_machine - Handle the state machine
|
|
* @work: work_struct that describes the work to be done
|
|
@@ -996,8 +1006,7 @@ void phy_state_machine(struct work_struc
|
|
/* If the link is down, give up on negotiation for now */
|
|
if (!phydev->link) {
|
|
phydev->state = PHY_NOLINK;
|
|
- netif_carrier_off(phydev->attached_dev);
|
|
- phydev->adjust_link(phydev->attached_dev);
|
|
+ phy_link_down(phydev, true);
|
|
break;
|
|
}
|
|
|
|
@@ -1009,9 +1018,7 @@ void phy_state_machine(struct work_struc
|
|
/* If AN is done, we're running */
|
|
if (err > 0) {
|
|
phydev->state = PHY_RUNNING;
|
|
- netif_carrier_on(phydev->attached_dev);
|
|
- phydev->adjust_link(phydev->attached_dev);
|
|
-
|
|
+ phy_link_up(phydev);
|
|
} else if (0 == phydev->link_timeout--)
|
|
needs_aneg = true;
|
|
break;
|
|
@@ -1036,8 +1043,7 @@ void phy_state_machine(struct work_struc
|
|
}
|
|
}
|
|
phydev->state = PHY_RUNNING;
|
|
- netif_carrier_on(phydev->attached_dev);
|
|
- phydev->adjust_link(phydev->attached_dev);
|
|
+ phy_link_up(phydev);
|
|
}
|
|
break;
|
|
case PHY_FORCING:
|
|
@@ -1047,13 +1053,12 @@ void phy_state_machine(struct work_struc
|
|
|
|
if (phydev->link) {
|
|
phydev->state = PHY_RUNNING;
|
|
- netif_carrier_on(phydev->attached_dev);
|
|
+ phy_link_up(phydev);
|
|
} else {
|
|
if (0 == phydev->link_timeout--)
|
|
needs_aneg = true;
|
|
+ phy_link_down(phydev, false);
|
|
}
|
|
-
|
|
- phydev->adjust_link(phydev->attached_dev);
|
|
break;
|
|
case PHY_RUNNING:
|
|
/* Only register a CHANGE if we are polling and link changed
|
|
@@ -1076,14 +1081,12 @@ void phy_state_machine(struct work_struc
|
|
|
|
if (phydev->link) {
|
|
phydev->state = PHY_RUNNING;
|
|
- netif_carrier_on(phydev->attached_dev);
|
|
+ phy_link_up(phydev);
|
|
} else {
|
|
phydev->state = PHY_NOLINK;
|
|
- netif_carrier_off(phydev->attached_dev);
|
|
+ phy_link_down(phydev, true);
|
|
}
|
|
|
|
- phydev->adjust_link(phydev->attached_dev);
|
|
-
|
|
if (phy_interrupt_is_valid(phydev))
|
|
err = phy_config_interrupt(phydev,
|
|
PHY_INTERRUPT_ENABLED);
|
|
@@ -1091,8 +1094,7 @@ void phy_state_machine(struct work_struc
|
|
case PHY_HALTED:
|
|
if (phydev->link) {
|
|
phydev->link = 0;
|
|
- netif_carrier_off(phydev->attached_dev);
|
|
- phydev->adjust_link(phydev->attached_dev);
|
|
+ phy_link_down(phydev, true);
|
|
do_suspend = true;
|
|
}
|
|
break;
|
|
@@ -1112,11 +1114,11 @@ void phy_state_machine(struct work_struc
|
|
|
|
if (phydev->link) {
|
|
phydev->state = PHY_RUNNING;
|
|
- netif_carrier_on(phydev->attached_dev);
|
|
+ phy_link_up(phydev);
|
|
} else {
|
|
phydev->state = PHY_NOLINK;
|
|
+ phy_link_down(phydev, false);
|
|
}
|
|
- phydev->adjust_link(phydev->attached_dev);
|
|
} else {
|
|
phydev->state = PHY_AN;
|
|
phydev->link_timeout = PHY_AN_TIMEOUT;
|
|
@@ -1128,11 +1130,11 @@ void phy_state_machine(struct work_struc
|
|
|
|
if (phydev->link) {
|
|
phydev->state = PHY_RUNNING;
|
|
- netif_carrier_on(phydev->attached_dev);
|
|
+ phy_link_up(phydev);
|
|
} else {
|
|
phydev->state = PHY_NOLINK;
|
|
+ phy_link_down(phydev, false);
|
|
}
|
|
- phydev->adjust_link(phydev->attached_dev);
|
|
}
|
|
break;
|
|
}
|
|
--- a/drivers/net/phy/phy_device.c
|
|
+++ b/drivers/net/phy/phy_device.c
|
|
@@ -645,6 +645,19 @@ struct phy_device *phy_find_first(struct
|
|
}
|
|
EXPORT_SYMBOL(phy_find_first);
|
|
|
|
+static void phy_link_change(struct phy_device *phydev, bool up, bool do_carrier)
|
|
+{
|
|
+ struct net_device *netdev = phydev->attached_dev;
|
|
+
|
|
+ if (do_carrier) {
|
|
+ if (up)
|
|
+ netif_carrier_on(netdev);
|
|
+ else
|
|
+ netif_carrier_off(netdev);
|
|
+ }
|
|
+ phydev->adjust_link(netdev);
|
|
+}
|
|
+
|
|
/**
|
|
* phy_prepare_link - prepares the PHY layer to monitor link status
|
|
* @phydev: target phy_device struct
|
|
@@ -899,6 +912,7 @@ int phy_attach_direct(struct net_device
|
|
goto error;
|
|
}
|
|
|
|
+ phydev->phy_link_change = phy_link_change;
|
|
phydev->attached_dev = dev;
|
|
dev->phydev = phydev;
|
|
|
|
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -426,6 +426,7 @@ struct phy_device {
|
|
|
|
u8 mdix;
|
|
|
|
+ void (*phy_link_change)(struct phy_device *, bool up, bool do_carrier);
|
|
void (*adjust_link)(struct net_device *dev);
|
|
};
|
|
#define to_phy_device(d) container_of(to_mdio_device(d), \
|