1 files changed, 67 insertions, 28 deletions

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index f133ff0b0b94..6b9acc7f94a3 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -39,10 +39,10 @@ extern int e1000_up(struct e1000_adapter *adapter);
 extern void e1000_down(struct e1000_adapter *adapter);
 extern void e1000_reset(struct e1000_adapter *adapter);
 extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
-extern int e1000_setup_rx_resources(struct e1000_adapter *adapter);
-extern int e1000_setup_tx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_rx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_tx_resources(struct e1000_adapter *adapter);
+extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
+extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
+extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
+extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
 extern void e1000_update_stats(struct e1000_adapter *adapter);
 
 struct e1000_stats {
@@ -91,7 +91,8 @@ static const struct e1000_stats e1000_gstrings_stats[] = {
         { "tx_flow_control_xoff", E1000_STAT(stats.xofftxc) },
         { "rx_long_byte_count", E1000_STAT(stats.gorcl) },
         { "rx_csum_offload_good", E1000_STAT(hw_csum_good) },
-        { "rx_csum_offload_errors", E1000_STAT(hw_csum_err) }
+        { "rx_csum_offload_errors", E1000_STAT(hw_csum_err) },
+        { "rx_header_split", E1000_STAT(rx_hdr_split) },
 };
 #define E1000_STATS_LEN \
         sizeof(e1000_gstrings_stats) / sizeof(struct e1000_stats)
@@ -546,8 +547,10 @@ e1000_set_eeprom(struct net_device *netdev,
         ret_val = e1000_write_eeprom(hw, first_word,
                                      last_word - first_word + 1, eeprom_buff);
 
-        /* Update the checksum over the first part of the EEPROM if needed */
-        if((ret_val == 0) && first_word <= EEPROM_CHECKSUM_REG)
+        /* Update the checksum over the first part of the EEPROM if needed 
+         * and flush shadow RAM for 82573 conrollers */
+        if((ret_val == 0) && ((first_word <= EEPROM_CHECKSUM_REG) || 
+                                (hw->mac_type == e1000_82573)))
                 e1000_update_eeprom_checksum(hw);
 
         kfree(eeprom_buff);
@@ -576,8 +579,8 @@ e1000_get_ringparam(struct net_device *netdev,
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         e1000_mac_type mac_type = adapter->hw.mac_type;
-        struct e1000_desc_ring *txdr = &adapter->tx_ring;
-        struct e1000_desc_ring *rxdr = &adapter->rx_ring;
+        struct e1000_tx_ring *txdr = adapter->tx_ring;
+        struct e1000_rx_ring *rxdr = adapter->rx_ring;
 
         ring->rx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_RXD :
                 E1000_MAX_82544_RXD;
@@ -597,20 +600,40 @@ e1000_set_ringparam(struct net_device *netdev,
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         e1000_mac_type mac_type = adapter->hw.mac_type;
-        struct e1000_desc_ring *txdr = &adapter->tx_ring;
-        struct e1000_desc_ring *rxdr = &adapter->rx_ring;
-        struct e1000_desc_ring tx_old, tx_new, rx_old, rx_new;
-        int err;
+        struct e1000_tx_ring *txdr, *tx_old, *tx_new;
+        struct e1000_rx_ring *rxdr, *rx_old, *rx_new;
+        int i, err, tx_ring_size, rx_ring_size;
+
+        tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_queues;
+        rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_queues;
+
+        if (netif_running(adapter->netdev))
+                e1000_down(adapter);
 
         tx_old = adapter->tx_ring;
         rx_old = adapter->rx_ring;
 
+        adapter->tx_ring = kmalloc(tx_ring_size, GFP_KERNEL);
+        if (!adapter->tx_ring) {
+                err = -ENOMEM;
+                goto err_setup_rx;
+        }
+        memset(adapter->tx_ring, 0, tx_ring_size);
+
+        adapter->rx_ring = kmalloc(rx_ring_size, GFP_KERNEL);
+        if (!adapter->rx_ring) {
+                kfree(adapter->tx_ring);
+                err = -ENOMEM;
+                goto err_setup_rx;
+        }
+        memset(adapter->rx_ring, 0, rx_ring_size);
+
+        txdr = adapter->tx_ring;
+        rxdr = adapter->rx_ring;
+
         if((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
                 return -EINVAL;
 
-        if(netif_running(adapter->netdev))
-                e1000_down(adapter);
-
         rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
         rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
                 E1000_MAX_RXD : E1000_MAX_82544_RXD));
@@ -621,11 +644,16 @@ e1000_set_ringparam(struct net_device *netdev,
                 E1000_MAX_TXD : E1000_MAX_82544_TXD));
         E1000_ROUNDUP(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE); 
 
+        for (i = 0; i < adapter->num_queues; i++) {
+                txdr[i].count = txdr->count;
+                rxdr[i].count = rxdr->count;
+        }
+
         if(netif_running(adapter->netdev)) {
                 /* Try to get new resources before deleting old */
-                if((err = e1000_setup_rx_resources(adapter)))
+                if ((err = e1000_setup_all_rx_resources(adapter)))
                         goto err_setup_rx;
-                if((err = e1000_setup_tx_resources(adapter)))
+                if ((err = e1000_setup_all_tx_resources(adapter)))
                         goto err_setup_tx;
 
                 /* save the new, restore the old in order to free it,
@@ -635,8 +663,10 @@ e1000_set_ringparam(struct net_device *netdev,
                 tx_new = adapter->tx_ring;
                 adapter->rx_ring = rx_old;
                 adapter->tx_ring = tx_old;
-                e1000_free_rx_resources(adapter);
-                e1000_free_tx_resources(adapter);
+                e1000_free_all_rx_resources(adapter);
+                e1000_free_all_tx_resources(adapter);
+                kfree(tx_old);
+                kfree(rx_old);
                 adapter->rx_ring = rx_new;
                 adapter->tx_ring = tx_new;
                 if((err = e1000_up(adapter)))
@@ -645,7 +675,7 @@ e1000_set_ringparam(struct net_device *netdev,
 
         return 0;
 err_setup_tx:
-        e1000_free_rx_resources(adapter);
+        e1000_free_all_rx_resources(adapter);
 err_setup_rx:
         adapter->rx_ring = rx_old;
         adapter->tx_ring = tx_old;
@@ -696,6 +726,11 @@ e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data)
          * Some bits that get toggled are ignored.
          */
         switch (adapter->hw.mac_type) {
+        /* there are several bits on newer hardware that are r/w */
+        case e1000_82571:
+        case e1000_82572:
+                toggle = 0x7FFFF3FF;
+                break;
         case e1000_82573:
                 toggle = 0x7FFFF033;
                 break;
@@ -898,8 +933,8 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
 static void
 e1000_free_desc_rings(struct e1000_adapter *adapter)
 {
-        struct e1000_desc_ring *txdr = &adapter->test_tx_ring;
-        struct e1000_desc_ring *rxdr = &adapter->test_rx_ring;
+        struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
+        struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
         struct pci_dev *pdev = adapter->pdev;
         int i;
 
@@ -941,8 +976,8 @@ e1000_free_desc_rings(struct e1000_adapter *adapter)
 static int
 e1000_setup_desc_rings(struct e1000_adapter *adapter)
 {
-        struct e1000_desc_ring *txdr = &adapter->test_tx_ring;
-        struct e1000_desc_ring *rxdr = &adapter->test_rx_ring;
+        struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
+        struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
         struct pci_dev *pdev = adapter->pdev;
         uint32_t rctl;
         int size, i, ret_val;
@@ -1245,6 +1280,8 @@ e1000_set_phy_loopback(struct e1000_adapter *adapter)
         case e1000_82541_rev_2:
         case e1000_82547:
         case e1000_82547_rev_2:
+        case e1000_82571:
+        case e1000_82572:
         case e1000_82573:
                 return e1000_integrated_phy_loopback(adapter);
                 break;
@@ -1340,8 +1377,8 @@ e1000_check_lbtest_frame(struct sk_buff *skb, unsigned int frame_size)
 static int
 e1000_run_loopback_test(struct e1000_adapter *adapter)
 {
-        struct e1000_desc_ring *txdr = &adapter->test_tx_ring;
-        struct e1000_desc_ring *rxdr = &adapter->test_rx_ring;
+        struct e1000_tx_ring *txdr = &adapter->test_tx_ring;
+        struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
         struct pci_dev *pdev = adapter->pdev;
         int i, j, k, l, lc, good_cnt, ret_val=0;
         unsigned long time;
@@ -1509,6 +1546,7 @@ e1000_diag_test(struct net_device *netdev,
                 data[2] = 0;
                 data[3] = 0;
         }
+        msleep_interruptible(4 * 1000);
 }
 
 static void
@@ -1625,7 +1663,7 @@ e1000_phys_id(struct net_device *netdev, uint32_t data)
         if(!data || data > (uint32_t)(MAX_SCHEDULE_TIMEOUT / HZ))
                 data = (uint32_t)(MAX_SCHEDULE_TIMEOUT / HZ);
 
-        if(adapter->hw.mac_type < e1000_82573) {
+        if(adapter->hw.mac_type < e1000_82571) {
                 if(!adapter->blink_timer.function) {
                         init_timer(&adapter->blink_timer);
                         adapter->blink_timer.function = e1000_led_blink_callback;
@@ -1739,6 +1777,7 @@ struct ethtool_ops e1000_ethtool_ops = {
         .phys_id                = e1000_phys_id,
         .get_stats_count        = e1000_get_stats_count,
         .get_ethtool_stats      = e1000_get_ethtool_stats,
+        .get_perm_addr          = ethtool_op_get_perm_addr,
 };
 
 void e1000_set_ethtool_ops(struct net_device *netdev)