mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
netsec: restore phy power state after controller reset
Since commit8e850f25b5
("net: socionext: Stop PHY before resetting netsec") netsec_netdev_init() power downs phy before resetting the controller. However, the state is not restored once the reset is complete. As a result it is not possible to bring up network on a platform with Broadcom BCM5482 phy. Fix the issue by restoring phy power state after controller reset is complete. Fixes:8e850f25b5
("net: socionext: Stop PHY before resetting netsec") Cc: stable@vger.kernel.org Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
dcc32f4f18
commit
804741ac7b
1 changed files with 6 additions and 3 deletions
|
@ -1715,14 +1715,17 @@ static int netsec_netdev_init(struct net_device *ndev)
|
|||
goto err1;
|
||||
|
||||
/* set phy power down */
|
||||
data = netsec_phy_read(priv->mii_bus, priv->phy_addr, MII_BMCR) |
|
||||
BMCR_PDOWN;
|
||||
netsec_phy_write(priv->mii_bus, priv->phy_addr, MII_BMCR, data);
|
||||
data = netsec_phy_read(priv->mii_bus, priv->phy_addr, MII_BMCR);
|
||||
netsec_phy_write(priv->mii_bus, priv->phy_addr, MII_BMCR,
|
||||
data | BMCR_PDOWN);
|
||||
|
||||
ret = netsec_reset_hardware(priv, true);
|
||||
if (ret)
|
||||
goto err2;
|
||||
|
||||
/* Restore phy power state */
|
||||
netsec_phy_write(priv->mii_bus, priv->phy_addr, MII_BMCR, data);
|
||||
|
||||
spin_lock_init(&priv->desc_ring[NETSEC_RING_TX].lock);
|
||||
spin_lock_init(&priv->desc_ring[NETSEC_RING_RX].lock);
|
||||
|
||||
|
|
Loading…
Reference in a new issue