summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorRoland Stigge <stigge@antcom.de>2014-09-01 15:46:46 +0400
committerDavid S. Miller <davem@davemloft.net>2014-09-03 00:21:55 +0400
commitaff88a0695976596b39dcfa65da4896c802c938d (patch)
tree901808d7641ffc5c2b94997945cba1b5fc4748b6 /drivers/net/ethernet
parent0486a063b1ffce4f37ef80970689c64bf7b99e98 (diff)
downloadlinux-aff88a0695976596b39dcfa65da4896c802c938d.tar.xz
net: lpc_eth: Fix crash on ip link up
When a link is already up, the following sequence makes the kernel block completely: ip link set dev eth0 down ip link set dev eth0 up This is because on suspended phy, the following lines __lpc_eth_reset(pldat); __lpc_eth_init(pldat); make the LPC ethernet core block (see LPC32x0 manual). The PHY needs to be (re-)activated low-level first. Signed-off-by: Roland Stigge <stigge@antcom.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/nxp/lpc_eth.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 8706c0dbd0c3..a44a03c45014 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -1220,6 +1220,9 @@ static int lpc_eth_open(struct net_device *ndev)
__lpc_eth_clock_enable(pldat, true);
+ /* Suspended PHY makes LPC ethernet core block, so resume now */
+ phy_resume(pldat->phy_dev);
+
/* Reset and initialize */
__lpc_eth_reset(pldat);
__lpc_eth_init(pldat);