This is a note to let you know that I've just added the patch titled
net: phy: handle state correctly in phy_stop_machine
to the 3.18-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-phy-handle-state-correctly-in-phy_stop_machine.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sun Apr 30 15:50:51 CEST 2017
From: Nathan Sullivan <nathan.sullivan@xxxxxx>
Date: Wed, 22 Mar 2017 15:27:01 -0500
Subject: net: phy: handle state correctly in phy_stop_machine
From: Nathan Sullivan <nathan.sullivan@xxxxxx>
[ Upstream commit 49d52e8108a21749dc2114b924c907db43358984 ]
If the PHY is halted on stop, then do not set the state to PHY_UP. This
ensures the phy will be restarted later in phy_start when the machine is
started again.
Fixes: 00db8189d984 ("This patch adds a PHY Abstraction Layer to the Linux Kernel, enabling ethernet drivers to remain as ignorant as is reasonable of the connected PHY's design and operation details.")
Signed-off-by: Nathan Sullivan <nathan.sullivan@xxxxxx>
Signed-off-by: Brad Mouring <brad.mouring@xxxxxx>
Acked-by: Xander Huff <xander.huff@xxxxxx>
Acked-by: Kyle Roeschley <kyle.roeschley@xxxxxx>
Reviewed-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/phy/phy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -506,7 +506,7 @@ void phy_stop_machine(struct phy_device
cancel_delayed_work_sync(&phydev->state_queue);
mutex_lock(&phydev->lock);
- if (phydev->state > PHY_UP)
+ if (phydev->state > PHY_UP && phydev->state != PHY_HALTED)
phydev->state = PHY_UP;
mutex_unlock(&phydev->lock);
}
Patches currently in stable-queue which might be from nathan.sullivan@xxxxxx are
queue-3.18/net-phy-handle-state-correctly-in-phy_stop_machine.patch