1 files changed, 41 insertions, 8 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 36342230a6de..d4843d014bc9 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -323,8 +323,8 @@ enum {
         NvRegMIIStatus = 0x180,
 #define NVREG_MIISTAT_ERROR             0x0001
 #define NVREG_MIISTAT_LINKCHANGE        0x0008
-#define NVREG_MIISTAT_MASK              0x000f
-#define NVREG_MIISTAT_MASK2             0x000f
+#define NVREG_MIISTAT_MASK_RW           0x0007
+#define NVREG_MIISTAT_MASK_ALL          0x000f
         NvRegMIIMask = 0x184,
 #define NVREG_MII_LINKCHANGE            0x0008
 
@@ -624,6 +624,9 @@ union ring_type {
 #define NV_MSI_X_VECTOR_TX    0x1
 #define NV_MSI_X_VECTOR_OTHER 0x2
 
+#define NV_RESTART_TX         0x1
+#define NV_RESTART_RX         0x2
+
 /* statistics */
 struct nv_ethtool_str {
         char name[ETH_GSTRING_LEN];
@@ -1061,7 +1064,7 @@ static int mii_rw(struct net_device *dev, int addr, int miireg, int value)
         u32 reg;
         int retval;
 
-        writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
+        writel(NVREG_MIISTAT_MASK_RW, base + NvRegMIIStatus);
 
         reg = readl(base + NvRegMIIControl);
         if (reg & NVREG_MIICTL_INUSE) {
@@ -1432,16 +1435,30 @@ static void nv_mac_reset(struct net_device *dev)
 {
         struct fe_priv *np = netdev_priv(dev);
         u8 __iomem *base = get_hwbase(dev);
+        u32 temp1, temp2, temp3;
 
         dprintk(KERN_DEBUG "%s: nv_mac_reset\n", dev->name);
+
         writel(NVREG_TXRXCTL_BIT2 | NVREG_TXRXCTL_RESET | np->txrxctl_bits, base + NvRegTxRxControl);
         pci_push(base);
+
+        /* save registers since they will be cleared on reset */
+        temp1 = readl(base + NvRegMacAddrA);
+        temp2 = readl(base + NvRegMacAddrB);
+        temp3 = readl(base + NvRegTransmitPoll);
+
         writel(NVREG_MAC_RESET_ASSERT, base + NvRegMacReset);
         pci_push(base);
         udelay(NV_MAC_RESET_DELAY);
         writel(0, base + NvRegMacReset);
         pci_push(base);
         udelay(NV_MAC_RESET_DELAY);
+
+        /* restore saved registers */
+        writel(temp1, base + NvRegMacAddrA);
+        writel(temp2, base + NvRegMacAddrB);
+        writel(temp3, base + NvRegTransmitPoll);
+
         writel(NVREG_TXRXCTL_BIT2 | np->txrxctl_bits, base + NvRegTxRxControl);
         pci_push(base);
 }
@@ -2767,6 +2784,7 @@ static int nv_update_linkspeed(struct net_device *dev)
         int mii_status;
         int retval = 0;
         u32 control_1000, status_1000, phyreg, pause_flags, txreg;
+        u32 txrxFlags = 0;
 
         /* BMSR_LSTATUS is latched, read it twice:
          * we want the current value.
@@ -2862,6 +2880,16 @@ set_speed:
         np->duplex = newdup;
         np->linkspeed = newls;
 
+        /* The transmitter and receiver must be restarted for safe update */
+        if (readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_START) {
+                txrxFlags |= NV_RESTART_TX;
+                nv_stop_tx(dev);
+        }
+        if (readl(base + NvRegReceiverControl) & NVREG_RCVCTL_START) {
+                txrxFlags |= NV_RESTART_RX;
+                nv_stop_rx(dev);
+        }
+
         if (np->gigabit == PHY_GIGABIT) {
                 phyreg = readl(base + NvRegRandomSeed);
                 phyreg &= ~(0x3FF00);
@@ -2950,6 +2978,11 @@ set_speed:
         }
         nv_update_pause(dev, pause_flags);
 
+        if (txrxFlags & NV_RESTART_TX)
+                nv_start_tx(dev);
+        if (txrxFlags & NV_RESTART_RX)
+                nv_start_rx(dev);
+
         return retval;
 }
 
@@ -2976,7 +3009,7 @@ static void nv_link_irq(struct net_device *dev)
         u32 miistat;
 
         miistat = readl(base + NvRegMIIStatus);
-        writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
+        writel(NVREG_MIISTAT_LINKCHANGE, base + NvRegMIIStatus);
         dprintk(KERN_INFO "%s: link change irq, status 0x%x.\n", dev->name, miistat);
 
         if (miistat & (NVREG_MIISTAT_LINKCHANGE))
@@ -4851,7 +4884,7 @@ static int nv_open(struct net_device *dev)
 
         writel(0, base + NvRegMIIMask);
         writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
-        writel(NVREG_MIISTAT_MASK2, base + NvRegMIIStatus);
+        writel(NVREG_MIISTAT_MASK_ALL, base + NvRegMIIStatus);
 
         writel(NVREG_MISC1_FORCE | NVREG_MISC1_HD, base + NvRegMisc1);
         writel(readl(base + NvRegTransmitterStatus), base + NvRegTransmitterStatus);
@@ -4889,7 +4922,7 @@ static int nv_open(struct net_device *dev)
 
         nv_disable_hw_interrupts(dev, np->irqmask);
         pci_push(base);
-        writel(NVREG_MIISTAT_MASK2, base + NvRegMIIStatus);
+        writel(NVREG_MIISTAT_MASK_ALL, base + NvRegMIIStatus);
         writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
         pci_push(base);
 
@@ -4912,7 +4945,7 @@ static int nv_open(struct net_device *dev)
         {
                 u32 miistat;
                 miistat = readl(base + NvRegMIIStatus);
-                writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
+                writel(NVREG_MIISTAT_MASK_ALL, base + NvRegMIIStatus);
                 dprintk(KERN_INFO "startup: got 0x%08x.\n", miistat);
         }
         /* set linkspeed to invalid value, thus force nv_update_linkspeed
@@ -5280,7 +5313,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 phystate &= ~NVREG_ADAPTCTL_RUNNING;
                 writel(phystate, base + NvRegAdapterControl);
         }
-        writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
+        writel(NVREG_MIISTAT_MASK_ALL, base + NvRegMIIStatus);
 
         if (id->driver_data & DEV_HAS_MGMT_UNIT) {
                 /* management unit running on the mac? */