diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2010-07-21 02:51:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-22 14:14:46 -0700 |
| commit | 4bee1f9ac066ef0350b961eab9fedc4d0bd0a549 (patch) | |
| tree | 6ca695f0f1387a322ae7d9ba2b1af8c90e2edb01 /drivers/net/fec.c | |
| parent | 8cd47ea19bf8c6f9d3a41b3c312237d007138ae0 (diff) | |
| download | kernel_samsung_espresso10-4bee1f9ac066ef0350b961eab9fedc4d0bd0a549.zip kernel_samsung_espresso10-4bee1f9ac066ef0350b961eab9fedc4d0bd0a549.tar.gz kernel_samsung_espresso10-4bee1f9ac066ef0350b961eab9fedc4d0bd0a549.tar.bz2 | |
net/fec: restore interrupt mask after software-reset in fec_stop()
After the change from mdio polling to irq, it became necessary to
restore the interrupt mask after resetting the chip in fec_stop().
Otherwise, with all irqs disabled, no communication with the PHY will be
possible after e.g. un-/replugging the cable and the device gets
stalled.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/fec.c')
| -rw-r--r-- | drivers/net/fec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 391a553..768b840 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -118,6 +118,8 @@ static unsigned char fec_mac_default[] = { #define FEC_ENET_MII ((uint)0x00800000) /* MII interrupt */ #define FEC_ENET_EBERR ((uint)0x00400000) /* SDMA bus error */ +#define FEC_DEFAULT_IMASK (FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII) + /* The FEC stores dest/src/type, data, and checksum for receive packets. */ #define PKT_MAXBUF_SIZE 1518 @@ -1213,8 +1215,7 @@ fec_restart(struct net_device *dev, int duplex) writel(0, fep->hwp + FEC_R_DES_ACTIVE); /* Enable interrupts we wish to service */ - writel(FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII, - fep->hwp + FEC_IMASK); + writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK); } static void @@ -1233,8 +1234,8 @@ fec_stop(struct net_device *dev) /* Whack a reset. We should wait for this. */ writel(1, fep->hwp + FEC_ECNTRL); udelay(10); - writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED); + writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK); } static int __devinit |