|
@@ -1446,9 +1446,9 @@ static int phy_init(struct net_device *dev)
|
|
|
/* some phys clear out pause advertisment on reset, set it back */
|
|
|
mii_rw(dev, np->phyaddr, MII_ADVERTISE, reg);
|
|
|
|
|
|
- /* restart auto negotiation */
|
|
|
+ /* restart auto negotiation, power down phy */
|
|
|
mii_control = mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ);
|
|
|
- mii_control |= (BMCR_ANRESTART | BMCR_ANENABLE);
|
|
|
+ mii_control |= (BMCR_ANRESTART | BMCR_ANENABLE | BMCR_PDOWN);
|
|
|
if (mii_rw(dev, np->phyaddr, MII_BMCR, mii_control)) {
|
|
|
return PHY_ERROR;
|
|
|
}
|
|
@@ -5208,6 +5208,10 @@ static int nv_open(struct net_device *dev)
|
|
|
|
|
|
dprintk(KERN_DEBUG "nv_open: begin\n");
|
|
|
|
|
|
+ /* power up phy */
|
|
|
+ mii_rw(dev, np->phyaddr, MII_BMCR,
|
|
|
+ mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ) & ~BMCR_PDOWN);
|
|
|
+
|
|
|
/* erase previous misconfiguration */
|
|
|
if (np->driver_data & DEV_HAS_POWER_CNTRL)
|
|
|
nv_mac_reset(dev);
|
|
@@ -5401,6 +5405,10 @@ static int nv_close(struct net_device *dev)
|
|
|
if (np->wolenabled) {
|
|
|
writel(NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR, base + NvRegPacketFilterFlags);
|
|
|
nv_start_rx(dev);
|
|
|
+ } else {
|
|
|
+ /* power down phy */
|
|
|
+ mii_rw(dev, np->phyaddr, MII_BMCR,
|
|
|
+ mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ)|BMCR_PDOWN);
|
|
|
}
|
|
|
|
|
|
/* FIXME: power down nic */
|