Patch "net: dsa: Do not override PHY interface if already configured" has been added to the 4.1-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: dsa: Do not override PHY interface if already configured
to the 4.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-dsa-do-not-override-phy-interface-if-already-configured.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sat Sep 26 11:13:07 PDT 2015
From: Florian Fainelli <[email protected]>
Date: Sat, 8 Aug 2015 12:58:57 -0700
Subject: net: dsa: Do not override PHY interface if already configured
From: Florian Fainelli <[email protected]>
[ Upstream commit 211c504a444710b1d8ce3431ac19f2578602ca27 ]
In case we need to divert reads/writes using the slave MII bus, we may have already fetched a valid PHY interface property from Device Tree, and that mode is used by the PHY driver to make configuration decisions.
If we could not fetch the "phy-mode" property, we will assign p->phy_interface to PHY_INTERFACE_MODE_NA, such that we can actually check for that condition as to whether or not we should override the interface value.
--- net/dsa/slave.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/dsa/slave.c +2 -1
@@ -732,7 +732,8 @@ static int dsa_slave_phy_connect(structreturn -ENODEV ;/* Use already configured phy mode */ - p->phy_interface = p->phy->interface; +if (p->phy_interface ==PHY_INTERFACE_MODE_NA ) + p->phy_interface = p->phy->interface;phy_connect_direct (slave_dev, p->phy, dsa_slave_adjust_link, p->phy_interface);
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/net-dsa-do-not-override-phy-interface-if-already-configured.patch