* [PATCH net] netsec: restore phy power state after controller reset
@ 2021-03-18 8:50 Mian Yousaf Kaukab
2021-03-18 18:40 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Mian Yousaf Kaukab @ 2021-03-18 8:50 UTC (permalink / raw)
To: jaswinder.singh, ilias.apalodimas, davem, kuba, masahisa.kojima,
osaki.yoshitoyo
Cc: netdev, linux-kernel, Mian Yousaf Kaukab, stable
Since commit 8e850f25b581 ("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: 8e850f25b581 ("net: socionext: Stop PHY before resetting netsec")
Cc: stable@vger.kernel.org
Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
---
drivers/net/ethernet/socionext/netsec.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
index 3c53051bdacf..200785e703c8 100644
--- a/drivers/net/ethernet/socionext/netsec.c
+++ b/drivers/net/ethernet/socionext/netsec.c
@@ -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);
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] netsec: restore phy power state after controller reset
2021-03-18 8:50 [PATCH net] netsec: restore phy power state after controller reset Mian Yousaf Kaukab
@ 2021-03-18 18:40 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-03-18 18:40 UTC (permalink / raw)
To: Mian Yousaf Kaukab
Cc: jaswinder.singh, ilias.apalodimas, davem, kuba, masahisa.kojima,
osaki.yoshitoyo, netdev, linux-kernel, stable
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Thu, 18 Mar 2021 09:50:26 +0100 you wrote:
> Since commit 8e850f25b581 ("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.
>
> [...]
Here is the summary with links:
- [net] netsec: restore phy power state after controller reset
https://git.kernel.org/netdev/net/c/804741ac7b9f
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-18 18:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-18 8:50 [PATCH net] netsec: restore phy power state after controller reset Mian Yousaf Kaukab
2021-03-18 18:40 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).