Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp

3 files changed, 52 insertions, 21 deletions

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 88a82ba88f57..2baccf864328 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -183,6 +183,9 @@ e1000_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                 return -EINVAL;
         }
 
+        while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+                msleep(1);
+
         if (ecmd->autoneg == AUTONEG_ENABLE) {
                 hw->autoneg = 1;
                 if (hw->media_type == e1000_media_type_fiber)
@@ -199,16 +202,20 @@ e1000_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                                                   ADVERTISED_TP;
                 ecmd->advertising = hw->autoneg_advertised;
         } else
-                if (e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex))
+                if (e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) {
+                        clear_bit(__E1000_RESETTING, &adapter->flags);
                         return -EINVAL;
+                }
 
         /* reset the link */
 
-        if (netif_running(adapter->netdev))
-                e1000_reinit_locked(adapter);
-        else
+        if (netif_running(adapter->netdev)) {
+                e1000_down(adapter);
+                e1000_up(adapter);
+        } else
                 e1000_reset(adapter);
 
+        clear_bit(__E1000_RESETTING, &adapter->flags);
         return 0;
 }
 
@@ -238,9 +245,13 @@ e1000_set_pauseparam(struct net_device *netdev,
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
+        int retval = 0;
 
         adapter->fc_autoneg = pause->autoneg;
 
+        while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+                msleep(1);
+
         if (pause->rx_pause && pause->tx_pause)
                 hw->fc = e1000_fc_full;
         else if (pause->rx_pause && !pause->tx_pause)
@@ -253,15 +264,17 @@ e1000_set_pauseparam(struct net_device *netdev,
         hw->original_fc = hw->fc;
 
         if (adapter->fc_autoneg == AUTONEG_ENABLE) {
-                if (netif_running(adapter->netdev))
-                        e1000_reinit_locked(adapter);
-                else
+                if (netif_running(adapter->netdev)) {
+                        e1000_down(adapter);
+                        e1000_up(adapter);
+                } else
                         e1000_reset(adapter);
         } else
-                return ((hw->media_type == e1000_media_type_fiber) ?
-                        e1000_setup_link(hw) : e1000_force_mac_fc(hw));
+                retval = ((hw->media_type == e1000_media_type_fiber) ?
+                           e1000_setup_link(hw) : e1000_force_mac_fc(hw));
 
-        return 0;
+        clear_bit(__E1000_RESETTING, &adapter->flags);
+        return retval;
 }
 
 static uint32_t
@@ -1590,6 +1603,8 @@ e1000_diag_test_count(struct net_device *netdev)
         return E1000_TEST_LEN;
 }
 
+extern void e1000_power_up_phy(struct e1000_adapter *);
+
 static void
 e1000_diag_test(struct net_device *netdev,
                    struct ethtool_test *eth_test, uint64_t *data)
@@ -1606,6 +1621,8 @@ e1000_diag_test(struct net_device *netdev,
                 uint8_t forced_speed_duplex = adapter->hw.forced_speed_duplex;
                 uint8_t autoneg = adapter->hw.autoneg;
 
+                DPRINTK(HW, INFO, "offline testing starting\n");
+
                 /* Link test performed before hardware reset so autoneg doesn't
                  * interfere with test result */
                 if (e1000_link_test(adapter, &data[4]))
@@ -1629,6 +1646,8 @@ e1000_diag_test(struct net_device *netdev,
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
                 e1000_reset(adapter);
+                /* make sure the phy is powered up */
+                e1000_power_up_phy(adapter);
                 if (e1000_loopback_test(adapter, &data[3]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
 
@@ -1642,6 +1661,7 @@ e1000_diag_test(struct net_device *netdev,
                 if (if_running)
                         dev_open(netdev);
         } else {
+                DPRINTK(HW, INFO, "online testing starting\n");
                 /* Online tests */
                 if (e1000_link_test(adapter, &data[4]))
                         eth_test->flags |= ETH_TEST_FL_FAILED;
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index b3b919116e0f..f62d17848332 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -745,6 +745,17 @@ e1000_init_hw(struct e1000_hw *hw)
 
     DEBUGFUNC("e1000_init_hw");
 
+    /* force full DMA clock frequency for 10/100 on ICH8 A0-B0 */
+    if (hw->mac_type == e1000_ich8lan) {
+        reg_data = E1000_READ_REG(hw, TARC0);
+        reg_data |= 0x30000000;
+        E1000_WRITE_REG(hw, TARC0, reg_data);
+
+        reg_data = E1000_READ_REG(hw, STATUS);
+        reg_data &= ~0x80000000;
+        E1000_WRITE_REG(hw, STATUS, reg_data);
+    }
+
     /* Initialize Identification LED */
     ret_val = e1000_id_led_init(hw);
     if(ret_val) {
@@ -1351,11 +1362,14 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw)
     E1000_WRITE_REG(hw, LEDCTL, led_ctrl);
     }
 
-    /* disable lplu d3 during driver init */
-    ret_val = e1000_set_d3_lplu_state(hw, FALSE);
-    if (ret_val) {
-        DEBUGOUT("Error Disabling LPLU D3\n");
-        return ret_val;
+    /* The NVM settings will configure LPLU in D3 for IGP2 and IGP3 PHYs */
+    if (hw->phy_type == e1000_phy_igp) {
+        /* disable lplu d3 during driver init */
+        ret_val = e1000_set_d3_lplu_state(hw, FALSE);
+        if (ret_val) {
+            DEBUGOUT("Error Disabling LPLU D3\n");
+            return ret_val;
+        }
     }
 
     /* disable lplu d0 during driver init */
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 336435d81eca..0cf9ff2462ba 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -36,7 +36,7 @@ static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
 #else
 #define DRIVERNAPI "-NAPI"
 #endif
-#define DRV_VERSION "7.1.9-k4"DRIVERNAPI
+#define DRV_VERSION "7.1.9-k6"DRIVERNAPI
 char e1000_driver_version[] = DRV_VERSION;
 static char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
 
@@ -48,7 +48,6 @@ static char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
  *   {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
  */
 static struct pci_device_id e1000_pci_tbl[] = {
-        INTEL_E1000_ETHERNET_DEVICE(0x1000),
         INTEL_E1000_ETHERNET_DEVICE(0x1001),
         INTEL_E1000_ETHERNET_DEVICE(0x1004),
         INTEL_E1000_ETHERNET_DEVICE(0x1008),
@@ -485,7 +484,7 @@ e1000_up(struct e1000_adapter *adapter)
  *
  **/
 
-static void e1000_power_up_phy(struct e1000_adapter *adapter)
+void e1000_power_up_phy(struct e1000_adapter *adapter)
 {
         uint16_t mii_reg = 0;
 
@@ -1499,8 +1498,6 @@ e1000_configure_tx(struct e1000_adapter *adapter)
         } else if (hw->mac_type == e1000_80003es2lan) {
                 tarc = E1000_READ_REG(hw, TARC0);
                 tarc |= 1;
-                if (hw->media_type == e1000_media_type_internal_serdes)
-                        tarc |= (1 << 20);
                 E1000_WRITE_REG(hw, TARC0, tarc);
                 tarc = E1000_READ_REG(hw, TARC1);
                 tarc |= 1;
@@ -2545,7 +2542,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                         cmd_length = E1000_TXD_CMD_IP;
                         ipcse = skb->h.raw - skb->data - 1;
 #ifdef NETIF_F_TSO_IPV6
-                } else if (skb->protocol == ntohs(ETH_P_IPV6)) {
+                } else if (skb->protocol == htons(ETH_P_IPV6)) {
                         skb->nh.ipv6h->payload_len = 0;
                         skb->h.th->check =
                                 ~csum_ipv6_magic(&skb->nh.ipv6h->saddr,