e1000 net driver update 4/4:

* Documentation/networking/e1000.txt: Updated with new device IDs,
updated parameters, updated known issues section.
* drivers/net/Config.help: Updated with new device IDs.
* Added license for Makefile
* Bug fix: ethtool GEEPROM was using word-addressing rather than
byte-addressing.
* Bug fix: Maximum Memory Read Byte Count in PCI-X config space set to
minimum of what device advertises, and what the BIOS assigns, rather
than the maximum, which is the device's default mode, and is incorrect
and will cause problems for large (jumbo frame) read operations.

Documentation/networking/e1000.txt

 Linux* Base Driver for the Intel(R) PRO/1000 Family of Adapters
 ===============================================================
 
-February 5, 2002
+April 23, 2002
 
 
 Contents
@@ -11,6 +11,7 @@ Contents
 - Supported Adapters
 - Command Line Parameters
 - Speed and Duplex Configuration
+- Additional Configurations
 - Known Issues
 - Support
 
@@ -19,17 +20,27 @@ In This Release
 ===============
 
 This file describes the Linux* Base Driver for the Intel(R) PRO/1000 Family
-of Adapters, version 4.2.x.
-This driver includes support for Itanium(TM)-based systems.
+of Adapters, version 4.2.x.  This driver includes support for 
+Itanium(TM)-based systems.
 
 This release version includes the following:
 
-   - support for the ethtool 1.4 interface. A third-party application can use
+   - Support for the ethtool 1.5 interface. A third-party application can use
      the ethtool interface to get and set driver parameters.
 
-   - the zero copy feature. Zero copy provides faster information throughput.
-     By default, this feature is enabled if using a kernel that supports it.
-     Zero copy is not supported on the original PWLA8490 (plain) adapter.
+   - Zero copy. This feature provides faster data throughput. Enabled by
+     default in supporting kernels. It is not supported on the Intel(R)
+     PRO/1000 Gigabit Server Adapter.
+
+New features include:
+
+   - Support for the 82545 and 82546-based adapters listed below
+
+   - Wake on LAN* support via ethtool for 82540, 82544, 82545, and 82546-
+     based adapters
+
+   - Adaptive IFS for increased performance at half duplex
+
 
 
 Supported Adapters
@@ -43,8 +54,7 @@ release:
 
    82542       PRO/1000 Gigabit Server Adapter      700262-xxx, 717037-xxx
 
-   82543       PRO/1000 F Server Adapter        738640-xxx, A38888-xxx,
-                                                A06512-xxx
+   82543       PRO/1000 F Server Adapter            738640-xxx, A38888-xxx
 
    82543       PRO/1000 T Server Adapter            A19845-xxx, A33948-xxx
 
@@ -54,6 +64,18 @@ release:
 
    82544       PRO/1000 T Desktop Adapter           A62947-xxx
 
+   82540       PRO/1000 MT Desktop Adapter          A78408-xxx
+
+   82545       PRO/1000 MT Server Adapter           A92165-xxx
+
+   82546       PRO/1000 MT Dual Port Server Adapter A92111-xxx
+
+   82545       PRO/1000 MF Server Adapter           A91622-xxx
+
+   82545       PRO/1000 MF Server Adapter(LX)       A91624-xxx
+
+   82546       PRO/1000 MF Dual Port Server Adapter A91620-xxx
+
 
 To verify your Intel adapter is supported, find the board ID number on the
 adapter. Look for a label that has a barcode and a number in the format of
@@ -86,14 +108,14 @@ For more information about the AutoNeg, Duplex, and Speed parameters, see the
 "Speed and Duplex Configuration" section in this document.
 
 
-AutoNeg (Intel PRO/1000 T and PRO/1000 XT server adapters only)
-Valid Range: 0-0x0F, 0x20-0x2F
+AutoNeg (adapters using copper connections only)
+Valid Range: 0x01-0x0F, 0x20-0x2F
 Default Value: 0x2F
     This parameter is a bit mask that specifies which speed and duplex
     settings the board advertises. When this parameter is used, the Speed and
     Duplex parameters must not be specified.
 
-Duplex (Intel PRO/1000 T and PRO/1000 XT server adapters only)
+Duplex (adapters using copper connections only)
 Valid Range: 0-2 (0=auto-negotiate, 1=half, 2=full)
 Default Value: 0
     Defines the direction in which data is allowed to flow. Can by either one
@@ -109,17 +131,18 @@ Default: Read flow control settings from the EEPROM
 
 RxDescriptors
 Valid Range: 80-256 for 82542 and 82543-based adapters
-             80-4096 for 82544-based adapters
-Default Value: 256
+             80-4096 for 82540, 82544, 82545, and 82546-based adapters
+Default Value: 80
     This value is the number of receive descriptors allocated by the driver.
     Increasing this value allows the driver to buffer more incoming packets.
     Each descriptor is 16 bytes.  A receive buffer is also allocated for each
     descriptor and can be either 2048, 4096, 8192, or 16384 bytes, depending
-    on the MTU setting.
+    on the MTU setting. The maximum MTU size is 16110.
 
 RxIntDelay
 Valid Range: 0-65535 (0=off)
-Default Value: 64
+Default Value: 64 (82542, 82543, and 82544-based adapters)
+               128 (82540, 82545, and 82546-based adapters)
     This value delays the generation of receive interrupts in units of 1.024
     microseconds.  Receive interrupt reduction can improve CPU efficiency if
     properly tuned for specific network traffic. Increasing this value adds
@@ -128,7 +151,7 @@ Default Value: 64
     may be set too high, causing the driver to run out of available receive
     descriptors.
 
-Speed (Intel PRO/1000 T and PRO/1000 XT server adapters only)
+Speed (adapters using copper connections only)
 Valid Settings: 0, 10, 100, 1000
 Default Value: 0 (auto-negotiate at all supported speeds)
     Speed forces the line speed to the specified value in megabits per second
@@ -138,21 +161,12 @@ Default Value: 0 (auto-negotiate at all supported speeds)
 
 TxDescriptors
 Valid Range: 80-256 for 82542 and 82543-based adapters
-             80-4096 for 82544-based adapters
+             80-4096 for 82540, 82544, 82545, and 82546-based adapters
 Default Value: 256
     This value is the number of transmit descriptors allocated by the driver.
     Increasing this value allows the driver to queue more transmits. Each
     descriptor is 16 bytes.
 
-TxIntDelay
-Valid Range: 0-65535 (0=off)
-Default Value: 64
-    This value delays the generation of transmit interrupts in units of 1.024
-    microseconds.  Transmit interrupt reduction can improve CPU efficiency if
-    properly tuned for specific network traffic.  If the system is reporting
-    dropped transmits, this value may be set too high causing the driver to
-    run out of available transmit descriptors.
-
 XsumRX (not available on the PRO/1000 Gigabit Server Adapter)
 Valid Range: 0-1
 Default Value: 1
@@ -163,9 +177,8 @@ Default Value: 1
 Speed and Duplex Configuration
 ==============================
 
-Three keywords are used to control the speed and duplex configuration of the
-PRO/1000 T and PRO/1000 XT server adapters. These keywords are Speed, Duplex,
-and AutoNeg.
+Three keywords are used to control the speed and duplex configuration. These
+keywords are Speed, Duplex, and AutoNeg.
 
 If the board uses a fiber interface, these keywords are ignored, and the
 fiber interface board only links at 1000 Mbps full-duplex.
@@ -199,16 +212,32 @@ set to auto-negotiate. If the link partner is forced speed/duplex, the
 adapter MUST be forced to the same speed/duplex.
 
 
+Additional Configurations
+=========================
+
+  Jumbo Frames
+  ------------
+
+  The driver supports Jumbo Frames for all adapters except 82542-based
+  adapters.  Jumbo Frames support is enabled by changing the MTU to a value
+  larger than the default of 1500.  Use the ifconfig command to increase the
+  MTU size. For example:
+
+        ifconfig ethx mtu 9000 up
+
+
 Known Issues
 ============
 
-  Driver Hangs Under Heavy Traffic Loads
-  --------------------------------------
+  Inconsistent Driver Behavior Under Heavy Traffic Loads
+  ------------------------------------------------------
 
-  Intel is aware that previously released e1000 drivers may hang under very
-  specific types of heavy traffic loads. This version includes a workaround
-  that resets the adapter automatically if a hang condition is detected. This
-  workaround ensures network traffic flow is not affected when a hang occurs.
+  Adapters based on the Intel 82543 and 82544 LAN controllers may hang (stop
+  transmitting) under certain network conditions. If this occurs a message
+  is logged in the system event log. In addition, the controller is
+  automatically reset, restoring the network connection. To eliminate the
+  potential for the hang change the RxIntDelay parameter to zero. For details
+  on the RxIntDelay parameter see the Command Line Parameters section.
 
   Jumbo Frames System Requirement
   -------------------------------

drivers/net/Config.help

@@ -833,13 +833,18 @@ CONFIG_E1000
      82542       PRO/1000 Gigabit Server Adapter      700262-xxx,
                                                       717037-xxx
      82543       PRO/1000 F Server Adapter            738640-xxx,
-                                                  A38888-xxx,
-                                                  A06512-xxx
+                                                      A38888-xxx
      82543       PRO/1000 T Server Adapter            A19845-xxx,
                                                       A33948-xxx
      82544       PRO/1000 XT Server Adapter           A51580-xxx
      82544       PRO/1000 XF Server Adapter           A50484-xxx
      82544       PRO/1000 T Desktop Adapter           A62947-xxx
+     82540       PRO/1000 MT Desktop Adapter          A78408-xxx
+     82545       PRO/1000 MT Server Adapter           A92165-xxx
+     82546       PRO/1000 MT Dual Port Server Adapter A92111-xxx
+     82545       PRO/1000 MF Server Adapter           A91622-xxx
+     82545       PRO/1000 MF Server Adapter(LX)       A91624-xxx
+     82546       PRO/1000 MF Dual Port Server Adapter A91620-xxx 
 
   For more information on how to identify your adapter, go to the
   Adapter & Driver ID Guide at:

drivers/net/e1000/Makefile

+################################################################################
+#
+# This software program is available to you under a choice of one of two
+# licenses. You may choose to be licensed under either the GNU General Public
+# License 2.0, June 1991, available at http://www.fsf.org/copyleft/gpl.html,
+# or the Intel BSD + Patent License, the text of which follows:
+# 
+# Recipient has requested a license and Intel Corporation ("Intel") is willing
+# to grant a license for the software entitled Linux Base Driver for the
+# Intel(R) PRO/1000 Family of Adapters (e1000) (the "Software") being provided
+# by Intel Corporation. The following definitions apply to this license:
+# 
+# "Licensed Patents" means patent claims licensable by Intel Corporation which
+# are necessarily infringed by the use of sale of the Software alone or when
+# combined with the operating system referred to below.
+# 
+# "Recipient" means the party to whom Intel delivers this Software.
+# 
+# "Licensee" means Recipient and those third parties that receive a license to
+# any operating system available under the GNU General Public License 2.0 or
+# later.
+# 
+# Copyright (c) 1999 - 2002 Intel Corporation.
+# All rights reserved.
+# 
+# The license is provided to Recipient and Recipient's Licensees under the
+# following terms.
+# 
+# Redistribution and use in source and binary forms of the Software, with or
+# without modification, are permitted provided that the following conditions
+# are met:
+# 
+# Redistributions of source code of the Software may retain the above
+# copyright notice, this list of conditions and the following disclaimer.
+# 
+# Redistributions in binary form of the Software may reproduce the above
+# copyright notice, this list of conditions and the following disclaimer in
+# the documentation and/or materials provided with the distribution.
+# 
+# Neither the name of Intel Corporation nor the names of its contributors
+# shall be used to endorse or promote products derived from this Software
+# without specific prior written permission.
+# 
+# Intel hereby grants Recipient and Licensees a non-exclusive, worldwide,
+# royalty-free patent license under Licensed Patents to make, use, sell, offer
+# to sell, import and otherwise transfer the Software, if any, in source code
+# and object code form. This license shall include changes to the Software
+# that are error corrections or other minor changes to the Software that do
+# not add functionality or features when the Software is incorporated in any
+# version of an operating system that has been distributed under the GNU
+# General Public License 2.0 or later. This patent license shall apply to the
+# combination of the Software and any operating system licensed under the GNU
+# General Public License 2.0 or later if, at the time Intel provides the
+# Software to Recipient, such addition of the Software to the then publicly
+# available versions of such operating systems available under the GNU General
+# Public License 2.0 or later (whether in gold, beta or alpha form) causes
+# such combination to be covered by the Licensed Patents. The patent license
+# shall not apply to any other combinations which include the Software. NO
+# hardware per se is licensed hereunder.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MECHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR IT CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# ANY LOSS OF USE; DATA, OR PROFITS; OR BUSINESS INTERUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR
+# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+################################################################################
+
 #
 # Makefile for the Intel(R) PRO/1000 ethernet driver
 #

drivers/net/e1000/e1000_ethtool.c

@@ -258,7 +258,7 @@ e1000_ethtool_geeprom(struct e1000_adapter *adapter,
 	if ((eeprom->offset + eeprom->len) > max_len)
 		eeprom->len = (max_len - eeprom->offset);
 
-	for(i = 0; i < max_len; i++)
+	for(i = 0; i < (max_len >> 1); i++)
 		e1000_read_eeprom(&adapter->hw, i, &eeprom_buff[i]);
 }
 

drivers/net/e1000/e1000_hw.c

@@ -198,6 +198,10 @@ e1000_init_hw(struct e1000_hw *hw)
     uint32_t i;
     int32_t ret_val;
     uint16_t pci_cmd_word;
+    uint16_t pcix_cmd_word;
+    uint16_t pcix_stat_hi_word;
+    uint16_t cmd_mmrbc;
+    uint16_t stat_mmrbc;
 
     DEBUGFUNC("e1000_init_hw");
 
@@ -272,6 +276,21 @@ e1000_init_hw(struct e1000_hw *hw)
         E1000_WRITE_REG(hw, CTRL, ctrl | E1000_CTRL_PRIOR);
     }
 
+    /* Workaround for PCI-X problem when BIOS sets MMRBC incorrectly. */
+    if(hw->bus_type == e1000_bus_type_pcix) {
+        e1000_read_pci_cfg(hw, PCIX_COMMAND_REGISTER, &pcix_cmd_word);
+        e1000_read_pci_cfg(hw, PCIX_STATUS_REGISTER_HI, &pcix_stat_hi_word);
+        cmd_mmrbc = (pcix_cmd_word & PCIX_COMMAND_MMRBC_MASK) >>
+            PCIX_COMMAND_MMRBC_SHIFT;
+        stat_mmrbc = (pcix_stat_hi_word & PCIX_STATUS_HI_MMRBC_MASK) >>
+            PCIX_STATUS_HI_MMRBC_SHIFT;
+        if(cmd_mmrbc > stat_mmrbc) {
+            pcix_cmd_word &= ~PCIX_COMMAND_MMRBC_MASK;
+            pcix_cmd_word |= stat_mmrbc << PCIX_COMMAND_MMRBC_SHIFT;
+            e1000_write_pci_cfg(hw, PCIX_COMMAND_REGISTER, &pcix_cmd_word);
+        }
+    }
+
     /* Call a subroutine to configure the link and setup flow control. */
     ret_val = e1000_setup_link(hw);
 

drivers/net/e1000/e1000_hw.h

@@ -262,6 +262,7 @@ void e1000_reset_adaptive(struct e1000_hw *hw);
 void e1000_update_adaptive(struct e1000_hw *hw);
 void e1000_tbi_adjust_stats(struct e1000_hw *hw, struct e1000_hw_stats *stats, uint32_t frame_len, uint8_t * mac_addr);
 void e1000_get_bus_info(struct e1000_hw *hw);
+void e1000_read_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t * value);
 void e1000_write_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t * value);
 
 /* PCI Device IDs */
@@ -1440,6 +1441,16 @@ struct e1000_hw {
 #define FC_DEFAULT_LO_THRESH        (0x4000)    /* 16KB */
 #define FC_DEFAULT_TX_TIMER         (0x100)     /* ~130 us */
 
+/* PCIX Config space */
+#define PCIX_COMMAND_REGISTER    0xE6
+#define PCIX_STATUS_REGISTER_LO  0xE8
+#define PCIX_STATUS_REGISTER_HI  0xEA
+
+#define PCIX_COMMAND_MMRBC_MASK      0x000C
+#define PCIX_COMMAND_MMRBC_SHIFT     0x2
+#define PCIX_STATUS_HI_MMRBC_MASK    0x0060
+#define PCIX_STATUS_HI_MMRBC_SHIFT   0x5
+
 
 /* The number of bits that we need to shift right to move the "pause"
  * bits from the EEPROM (bits 13:12) to the "pause" (bits 8:7) field

drivers/net/e1000/e1000_main.c

@@ -76,7 +76,7 @@
 
 char e1000_driver_name[] = "e1000";
 char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
-char e1000_driver_version[] = "4.2.9-k1";
+char e1000_driver_version[] = "4.2.17-k1";
 char e1000_copyright[] = "Copyright (c) 1999-2002 Intel Corporation.";
 
 /* e1000_pci_tbl - PCI Device ID Table
@@ -1922,9 +1922,6 @@ e1000_alloc_rx_buffers(struct e1000_adapter *adapter)
 	int reserve_len;
 	int i;
 
-	if(!netif_running(netdev))
-		return;
-
 	reserve_len = 2;
 
 	i = rx_ring->next_to_use;
@@ -2021,8 +2018,15 @@ e1000_rx_checksum(struct e1000_adapter *adapter,
 }
 
 void
-e1000_write_pci_cfg(struct e1000_hw *hw,
-                    uint32_t reg, uint16_t *value)
+e1000_read_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t *value)
+{
+	struct e1000_adapter *adapter = hw->back;
+
+	pci_read_config_word(adapter->pdev, reg, value);
+}
+
+void
+e1000_write_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t *value)
 {
 	struct e1000_adapter *adapter = hw->back;