p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: phy: Call bus->reset() after releasing PHYs from reset 

The API convention makes it that a given MDIO bus reset should be able
to access PHY devices in its reset() callback and perform additional
MDIO accesses in order to bring the bus and PHYs in a working state.

Commit 69226896ad ("mdio_bus: Issue GPIO RESET to PHYs.") broke that
contract by first calling bus->reset() and then release all PHYs from
reset using their shared GPIO line, so restore the expected
functionality here.

Fixes: 69226896ad ("mdio_bus: Issue GPIO RESET to PHYs.")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2017-05-11 11:24:16 -07:00 committed by David S. Miller
parent 6832a333ed
commit df0c8d911a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/phy/mdio_bus.c
View File

@ -364,9 +364,6 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
mutex_init(&bus->mdio_lock); mutex_init(&bus->mdio_lock);
if (bus->reset)
bus->reset(bus);
/* de-assert bus level PHY GPIO resets */ /* de-assert bus level PHY GPIO resets */
if (bus->num_reset_gpios > 0) { if (bus->num_reset_gpios > 0) {
bus->reset_gpiod = devm_kcalloc(&bus->dev, bus->reset_gpiod = devm_kcalloc(&bus->dev,
@ -396,6 +393,9 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
} }
} }
if (bus->reset)
bus->reset(bus);
for (i = 0; i < PHY_MAX_ADDR; i++) { for (i = 0; i < PHY_MAX_ADDR; i++) {
if ((bus->phy_mask & (1 << i)) == 0) { if ((bus->phy_mask & (1 << i)) == 0) {
struct phy_device *phydev; struct phy_device *phydev;