Merge http://gkernel.bkbits.net/net-drivers-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

Documentation/networking/e1000.txt

 Linux* Base Driver for the Intel(R) PRO/1000 Family of Adapters
 ===============================================================
 
-April 23, 2002
+June 11, 2002
 
 
 Contents
@@ -95,8 +95,8 @@ For the latest Intel network drivers for Linux, go to:
 Command Line Parameters
 =======================
 
-If the driver is built as a module, the following parameters are used by 
-entering them on the command line with the modprobe or insmod command. 
+If the driver is built as a module, the following optional parameters are 
+used by entering them on the command line with the modprobe or insmod command. 
 For example, with two PRO/1000 PCI adapters, entering:
 
     insmod e1000 TxDescriptors=80,128
@@ -141,7 +141,7 @@ Default Value: 80
 
 RxIntDelay
 Valid Range: 0-65535 (0=off)
-Default Value: 64 (82542, 82543, and 82544-based adapters)
+Default Value: 0 (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
@@ -151,6 +151,14 @@ Default Value: 64 (82542, 82543, and 82544-based adapters)
     may be set too high, causing the driver to run out of available receive
     descriptors.
 
+    CAUTION: When setting RxIntDelay to a value other than 0, 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 ensure that
+             RxIntDelay is set to 0.
+
 Speed (adapters using copper connections only)
 Valid Settings: 0, 10, 100, 1000
 Default Value: 0 (auto-negotiate at all supported speeds)
@@ -229,16 +237,6 @@ Additional Configurations
 Known Issues
 ============
 
-  Inconsistent Driver Behavior Under Heavy Traffic Loads
-  ------------------------------------------------------
-
-  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/8139cp.c

@@ -21,13 +21,13 @@
 	Contributors:
 	
 		Wake-on-LAN support - Felipe Damasio <felipewd@terra.com.br>
+		PCI suspend/resume  - Felipe Damasio <felipewd@terra.com.br>
 			
 	TODO, in rough priority order:
 	* dev->tx_timeout
 	* LinkChg interrupt
 	* Support forcing media type with a module parameter,
 	  like dl2k.c/sundance.c
-	* Implement PCI suspend/resume
 	* Constants (module parms?) for Rx work limit
 	* support 64-bit PCI DMA
 	* Complete reset on PciErr
@@ -360,6 +360,7 @@ struct cp_private {
 	unsigned int		board_type;
 
 	unsigned int		wol_enabled : 1; /* Is Wake-on-LAN enabled? */
+	u32			power_state[16];
 
 	struct mii_if_info	mii_if;
 };
@@ -976,11 +977,11 @@ static void cp_reset_hw (struct cp_private *cp)
 
 static inline void cp_start_hw (struct cp_private *cp)
 {
-	cpw8(Cmd, RxOn | TxOn);
 	if (cp->board_type == RTL8169)
 		cpw16(CpCmd, PCIMulRW | RxChkSum);
 	else
 		cpw16(CpCmd, PCIMulRW | RxChkSum | CpRxOn | CpTxOn);
+	cpw8(Cmd, RxOn | TxOn);
 }
 
 static void cp_init_hw (struct cp_private *cp)
@@ -1896,11 +1897,68 @@ static void __devexit cp_remove_one (struct pci_dev *pdev)
 	kfree(dev);
 }
 
+#ifdef CONFIG_PM
+static int cp_suspend (struct pci_dev *pdev, u32 state)
+{
+	struct net_device *dev;
+	struct cp_private *cp;
+	unsigned long flags;
+
+	dev = pci_get_drvdata (pdev);
+	cp  = dev->priv;
+
+	if (!dev || !netif_running (dev)) return 0;
+
+	netif_device_detach (dev);
+	netif_stop_queue (dev);
+
+	spin_lock_irqsave (&cp->lock, flags);
+
+	/* Disable Rx and Tx */
+	cpw16 (IntrMask, 0);
+	cpw8  (Cmd, cpr8 (Cmd) & (~RxOn | ~TxOn));
+
+	spin_unlock_irqrestore (&cp->lock, flags);
+
+	if (cp->pdev && cp->wol_enabled) {
+		pci_save_state (cp->pdev, cp->power_state);
+		cp_set_d3_state (cp);
+	}
+
+	return 0;
+}
+
+static int cp_resume (struct pci_dev *pdev)
+{
+	struct net_device *dev;
+	struct cp_private *cp;
+
+	dev = pci_get_drvdata (pdev);
+	cp  = dev->priv;
+
+	netif_device_attach (dev);
+	
+	if (cp->pdev && cp->wol_enabled) {
+		pci_set_power_state (cp->pdev, 0);
+		pci_restore_state (cp->pdev, cp->power_state);
+	}
+	
+	cp_init_hw (cp);
+	netif_start_queue (dev);
+	
+	return 0;
+}
+#endif /* CONFIG_PM */
+
 static struct pci_driver cp_driver = {
 	.name         = DRV_NAME,
 	.id_table     = cp_pci_tbl,
 	.probe        =	cp_init_one,
 	.remove       = __devexit_p(cp_remove_one),
+#ifdef CONFIG_PM
+	.resume       = cp_resume,
+	.suspend      = cp_suspend,
+#endif
 };
 
 static int __init cp_init (void)

drivers/net/e100/e100.h

@@ -91,13 +91,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <linux/version.h>
 #include <linux/string.h>
 #include <linux/wait.h>
+#include <linux/reboot.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <asm/processor.h>
-#ifdef SIOCETHTOOL
 #include <linux/ethtool.h>
 #include <linux/inetdevice.h>
-#endif
 
 #include <linux/if.h>
 #include <asm/uaccess.h>
@@ -147,6 +146,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define E100_MAX_SCB_WAIT	100	/* Max udelays in wait_scb */
 #define E100_MAX_CU_IDLE_WAIT	50	/* Max udelays in wait_cus_idle */
 
+/* HWI feature related constant */
+#define HWI_MAX_LOOP                    100
+#define MAX_SAME_RESULTS		3
+#define HWI_REGISTER_GRANULARITY        80	/* register granularity = 80 Cm */
+#define HWI_NEAR_END_BOUNDARY           1000	/* Near end is defined as < 10 meters */
+
 /* CPUSAVER_BUNDLE_MAX: Sets the maximum number of frames that will be bundled.
  * In some situations, such as the TCP windowing algorithm, it may be
  * better to limit the growth of the bundle size than let it go as
@@ -504,6 +509,7 @@ enum led_state_e {
 #define IS_ICH             0x00000020
 #define DF_SPEED_FORCED    0x00000040	/* set if speed is forced */
 #define LED_IS_ON	   0x00000080	/* LED is turned ON by the driver */
+#define DF_LINK_FC_TX_ONLY 0x00000100	/* Received PAUSE frames are honored*/
 
 typedef struct net_device_stats net_dev_stats_t;
 
@@ -774,15 +780,7 @@ typedef struct _tcb_ipcb_t {
 	u16 total_tcp_payload;
 } tcb_ipcb_t __attribute__ ((__packed__));
 
-#ifdef MAX_SKB_FRAGS
-#define E100_ZEROCOPY
-#endif
-
-#ifdef E100_ZEROCOPY
 #define E100_TBD_ARRAY_SIZE (2+MAX_SKB_FRAGS)
-#else
-#define E100_TBD_ARRAY_SIZE 2
-#endif /*E100_ZEROCOPY */
 
 /* Transmit Command Block (TCB)*/
 struct _tcb_t {
@@ -803,19 +801,15 @@ struct _tcb_t {
 	 */
 	tbd_t *tbd_ptr;
 
-#ifdef E100_ZEROCOPY
 	u32 tcb_tbd_dflt_ptr;	/* TBD address for non-segmented packet */
 	u32 tcb_tbd_expand_ptr;	/* TBD address for segmented packet */
-#endif				/*E100_ZEROCOPY */
 
 	struct sk_buff *tcb_skb;	/* the associated socket buffer */
 	dma_addr_t tcb_phys;	/* phys addr of the TCB */
 } __attribute__ ((__packed__));
 
-#ifndef _TCB_T_
 #define _TCB_T_
 typedef struct _tcb_t tcb_t;
-#endif
 
 /* Receive Frame Descriptor (RFD) - will be using the simple model*/
 struct _rfd_t {
@@ -836,10 +830,8 @@ struct _rfd_t {
 
 } __attribute__ ((__packed__));
 
-#ifndef _RFD_T_
 #define _RFD_T_
 typedef struct _rfd_t rfd_t;
-#endif
 
 /* Receive Buffer Descriptor (RBD)*/
 typedef struct _rbd_t {
@@ -901,14 +893,12 @@ struct cfg_params {
 	int PollingMaxWork;
 	u32 b_params;
 };
-#ifdef ETHTOOL_TEST 
 struct ethtool_lpbk_data{
         dma_addr_t dma_handle;
         tcb_t *tcb;
         rfd_t *rfd;
 
 };
-#endif
 
 struct e100_private {
 	u32 flags;		/* board management flags */
@@ -987,28 +977,33 @@ struct e100_private {
 
 	rwlock_t isolate_lock;
 	int driver_isolated;
+	char *id_string;
+	char *cable_status;
+	char *mdix_status;
+
+	/* Variables for HWI */
+	int saved_open_circut;
+	int saved_short_circut;
+	int saved_distance;
+	int saved_i;
+	int saved_same;
+	unsigned char hwi_started;
+	struct timer_list hwi_timer;	/* hwi timer id */
 
 	u32 speed_duplex_caps;	/* adapter's speed/duplex capabilities */
 
 	struct tasklet_struct polling_tasklet;
 
-#ifdef ETHTOOL_GWOL
 	/* WOL params for ethtool */
 	u32 wolsupported;
 	u32 wolopts;
 	u16 ip_lbytes;
-#endif
-#ifdef ETHTOOL_TEST 
 	struct ethtool_lpbk_data loopback;
-#endif
-#ifdef ETHTOOL_PHYS_ID
 	struct timer_list blink_timer;	/* led blink timer id */
-#endif
 
 #ifdef CONFIG_PM
 	u32 pci_state[16];
 #endif
-
 };
 
 #define E100_AUTONEG        0
@@ -1036,8 +1031,6 @@ extern void e100_deisolate_driver(struct e100_private *bdp,
 extern unsigned char e100_hw_reset_recover(struct e100_private *bdp,
 					   u32 reset_cmd);
 
-#ifdef ETHTOOL_TEST
-
 #define ROM_TEST_FAIL		0x01
 #define REGISTER_TEST_FAIL	0x02
 #define SELF_TEST_FAIL		0x04
@@ -1053,6 +1046,5 @@ enum test_offsets {
 	E100_LPBK_PHY_FAIL,
 	E100_MAX_TEST_RES
 };
-#endif
 
 #endif

drivers/net/e100/e100_config.c

@@ -86,10 +86,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *               operating system.                                     *
 *                                                                     *
 **********************************************************************/
-#ifdef SIOCETHTOOL
-#include <linux/ethtool.h>
-#endif
-
 #include "e100_config.h"
 
 static void e100_config_long_rx(struct e100_private *bdp, unsigned char enable);
@@ -308,85 +304,58 @@ e100_config(struct e100_private *bdp)
 
 /**
  * e100_config_fc - config flow-control state
- * @bdp: atapter's private data struct
+ * @bdp: adapter's private data struct
  *
  * This routine will enable or disable flow control support in the adapter's
  * config block. Flow control will be enable only if requested using the command
  * line option, and if the link is flow-contorl capable (both us and the link
- * partner).
- *
- * Returns:
- *      true: if then option was indeed changed
- *      false: if no change was needed
+ * partner). But, if link partner is capable of autoneg, but not capable of
+ * flow control, received PAUSE	frames are still honored.
  */
-unsigned char
+void
 e100_config_fc(struct e100_private *bdp)
 {
 	unsigned char enable = false;
-	unsigned char changed = false;
-
 	/* 82557 doesn't support fc. Don't touch this option */
 	if (!(bdp->flags & IS_BACHELOR))
-		return false;
+		return;
 
 	/* Enable fc if requested and if the link supports it */
-	if ((bdp->params.b_params & PRM_FC) && (bdp->flags & DF_LINK_FC_CAP)) {
+	if ((bdp->params.b_params & PRM_FC) && (bdp->flags & 
+		(DF_LINK_FC_CAP | DF_LINK_FC_TX_ONLY))) {
 		enable = true;
 	}
 
 	spin_lock_bh(&(bdp->config_lock));
 
 	if (enable) {
-
-		if (bdp->config[16] != DFLT_FC_DELAY_LSB) {
+		if (bdp->flags & DF_LINK_FC_TX_ONLY) {
+			/* If link partner is capable of autoneg, but  */
+			/* not capable of flow control, Received PAUSE */
+			/* frames are still honored, i.e.,             */
+			/* transmitted frames would be paused by       */
+			/* incoming PAUSE frames                       */
+			bdp->config[16] = DFLT_NO_FC_DELAY_LSB;
+			bdp->config[17] = DFLT_NO_FC_DELAY_MSB;
+			bdp->config[19] &= ~(CB_CFIG_FC_RESTOP | CB_CFIG_FC_RESTART);
+			bdp->config[19] |= CB_CFIG_FC_REJECT;
+			bdp->config[19] &= ~CB_CFIG_TX_FC_DIS;
+		} else {
 			bdp->config[16] = DFLT_FC_DELAY_LSB;
-			E100_CONFIG(bdp, 16);
-			changed = true;
-		}
-
-		if (bdp->config[17] != DFLT_FC_DELAY_LSB) {
 			bdp->config[17] = DFLT_FC_DELAY_MSB;
-			E100_CONFIG(bdp, 17);
-			changed = true;
-		}
-
-		/* check if *all* fc config options were already set */
-		if (((bdp->config[19] & CB_CFIG_FC_OPTS) != CB_CFIG_FC_OPTS) ||
-		    (bdp->config[19] & CB_CFIG_TX_FC_DIS)) {
-
 			bdp->config[19] |= CB_CFIG_FC_OPTS;
 			bdp->config[19] &= ~CB_CFIG_TX_FC_DIS;
-			E100_CONFIG(bdp, 19);
-			changed = true;
 		}
-
 	} else {
-		if (bdp->config[16] != DFLT_NO_FC_DELAY_LSB) {
-			bdp->config[16] = DFLT_NO_FC_DELAY_LSB;
-			E100_CONFIG(bdp, 16);
-			changed = true;
-		}
-
-		if (bdp->config[17] != DFLT_NO_FC_DELAY_MSB) {
-			bdp->config[17] = DFLT_NO_FC_DELAY_MSB;
-			E100_CONFIG(bdp, 17);
-			changed = true;
-		}
-
-		/* check if *any* fc config options was already set */
-		if ((bdp->config[19] & CB_CFIG_FC_OPTS) ||
-		    !(bdp->config[19] & CB_CFIG_TX_FC_DIS)) {
-
-			bdp->config[19] &= ~CB_CFIG_FC_OPTS;
-			bdp->config[19] |= CB_CFIG_TX_FC_DIS;
-			E100_CONFIG(bdp, 19);
-			changed = true;
-		}
+		bdp->config[16] = DFLT_NO_FC_DELAY_LSB;
+		bdp->config[17] = DFLT_NO_FC_DELAY_MSB;
+		bdp->config[19] &= ~CB_CFIG_FC_OPTS;
+		bdp->config[19] |= CB_CFIG_TX_FC_DIS;
 	}
-
+	E100_CONFIG(bdp, 19);
 	spin_unlock_bh(&(bdp->config_lock));
 
-	return changed;
+	return;
 }
 
 /**
@@ -566,7 +535,6 @@ e100_config_long_rx(struct e100_private *bdp, unsigned char enable)
 	}
 }
 
-#ifdef ETHTOOL_GWOL
 /**
  * e100_config_wol
  * @bdp: atapter's private data struct
@@ -591,7 +559,6 @@ e100_config_wol(struct e100_private *bdp)
 
 	spin_unlock_bh(&(bdp->config_lock));
 }
-#endif
 
 /**
  * e100_config_loopback_mode
@@ -618,7 +585,7 @@ e100_config_loopback_mode(struct e100_private *bdp, u8 mode)
 		config_byte = CB_CFIG_LOOPBACK_EXTERNAL;
 		break;
 	default:
-		printk(KERN_NOTICE "e100_config_loopback_mode: "
+		printk(KERN_NOTICE "e100: e100_config_loopback_mode: "
 		       "Invalid argument 'mode': %d\n", mode);
 		goto exit;
 	}

drivers/net/e100/e100_config.h

@@ -198,7 +198,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 extern void e100_config_init(struct e100_private *bdp);
 extern unsigned char e100_force_config(struct e100_private *bdp);
 extern unsigned char e100_config(struct e100_private *bdp);
-extern unsigned char e100_config_fc(struct e100_private *bdp);
+extern void e100_config_fc(struct e100_private *bdp);
 extern void e100_config_promisc(struct e100_private *bdp, unsigned char enable);
 extern void e100_config_brdcast_dsbl(struct e100_private *bdp);
 extern void e100_config_mulcast_enbl(struct e100_private *bdp,

drivers/net/e100/e100_eeprom.c

@@ -145,8 +145,6 @@ eeprom_set_semaphore(struct e100_private *adapter)
 		data |= SCB_GCR2_EEPROM_ACCESS_SEMAPHORE;
 		writeb(data, &CSR_GENERAL_CONTROL2_FIELD(adapter));
 
-		barrier();
-
 		// Check to see if this bit set or not.
 		data = readb(&CSR_GENERAL_CONTROL2_FIELD(adapter));
 
@@ -224,6 +222,7 @@ e100_eeprom_size(struct e100_private *adapter)
 		x &= ~EEDI;	// address consists of all zeros
 
 		writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+		readw(&(adapter->scb->scb_status));
 		udelay(EEPROM_STALL_TIME);
 		raise_clock(adapter, &x);
 		lower_clock(adapter, &x);

drivers/net/e100/e100_phy.c

@@ -96,9 +96,11 @@ e100_mdi_write(struct e100_private *bdp, u32 reg_addr, u32 phy_addr, u16 data)
 	int e100_retry;
 	u32 temp_val;
 
+	spin_lock_bh(&bdp->mdi_access_lock);
 	temp_val = (((u32) data) | (reg_addr << 16) |
 		    (phy_addr << 21) | (MDI_WRITE << 26));
 	writel(temp_val, &bdp->scb->scb_mdi_cntrl);
+	readw(&bdp->scb->scb_status);
 
 	/* wait 20usec before checking status */
 	udelay(20);
@@ -111,6 +113,7 @@ e100_mdi_write(struct e100_private *bdp, u32 reg_addr, u32 phy_addr, u16 data)
 		udelay(20);
 		e100_retry--;
 	}
+	spin_unlock_bh(&bdp->mdi_access_lock);
 }
 
 /* 
@@ -138,9 +141,11 @@ e100_mdi_read(struct e100_private *bdp, u32 reg_addr, u32 phy_addr, u16 *data)
 	int e100_retry;
 	u32 temp_val;
 
+	spin_lock_bh(&bdp->mdi_access_lock);
 	/* Issue the read command to the MDI control register. */
 	temp_val = ((reg_addr << 16) | (phy_addr << 21) | (MDI_READ << 26));
 	writel(temp_val, &bdp->scb->scb_mdi_cntrl);
+	readw(&bdp->scb->scb_status);
 
 	/* wait 20usec before checking status */
 	udelay(20);
@@ -156,6 +161,7 @@ e100_mdi_read(struct e100_private *bdp, u32 reg_addr, u32 phy_addr, u16 *data)
 
 	// return the lower word
 	*data = (u16) readl(&bdp->scb->scb_mdi_cntrl);
+	spin_unlock_bh(&bdp->mdi_access_lock);
 }
 
 static unsigned char __devinit
@@ -263,21 +269,22 @@ e100_phy_specific_setup(struct e100_private *bdp)
 		case E100_AUTONEG:
 			/* The adapter can't autoneg. so set to 10/HALF */
 			printk(KERN_INFO
-			       "503 serial component detected which "
+			       "e100: 503 serial component detected which "
 			       "cannot autonegotiate\n");
 			printk(KERN_INFO
-			       "speed/duplex forced to 10Mbps / Half duplex\n");
+			       "e100: speed/duplex forced to "
+			       "10Mbps / Half duplex\n");
 			bdp->params.e100_speed_duplex = E100_SPEED_10_HALF;
 			break;
 
 		case E100_SPEED_100_HALF:
 		case E100_SPEED_100_FULL:
 			printk(KERN_ERR
-			       "503 serial component detected which does not "
-			       "support 100Mbps\n");
+			       "e100: 503 serial component detected "
+			       "which does not support 100Mbps\n");
 			printk(KERN_ERR
-			       "Change the forced speed/duplex to a supported "
-			       "setting\n");
+			       "e100: Change the forced speed/duplex "
+			       "to a supported setting\n");
 			return false;
 		}
 
@@ -294,7 +301,7 @@ e100_phy_specific_setup(struct e100_private *bdp)
 		if ((bdp->params.e100_speed_duplex != E100_AUTONEG) &&
 		    (bdp->params.e100_speed_duplex != E100_SPEED_100_FULL)) {
 			/* just inform user about 100 full */
-			printk(KERN_ERR "NC3133 NIC can only run "
+			printk(KERN_ERR "e100: NC3133 NIC can only run "
 			       "at 100Mbps full duplex\n");
 		}
 
@@ -657,8 +664,6 @@ e100_force_speed_duplex(struct e100_private *bdp)
 
 	bdp->flags |= DF_SPEED_FORCED;
 
-	spin_lock_bh(&(bdp->mdi_access_lock));
-
 	e100_mdi_read(bdp, MII_BMCR, bdp->phy_addr, &control);
 	control &= ~BMCR_ANENABLE;
 
@@ -702,14 +707,10 @@ e100_force_speed_duplex(struct e100_private *bdp)
 		    time_after(jiffies, expires)) {
 			break;
 		} else {
-			spin_unlock_bh(&(bdp->mdi_access_lock));
 			yield();
-			spin_lock_bh(&(bdp->mdi_access_lock));
 		}
 
 	} while (true);
-
-	spin_unlock_bh(&(bdp->mdi_access_lock));
 }
 
 /* 
@@ -753,7 +754,12 @@ e100_set_fc(struct e100_private *bdp)
 		if (ad_reg & NWAY_AD_FC_SUPPORTED)
 			bdp->flags |= DF_LINK_FC_CAP;
 		else
-			bdp->flags &= ~DF_LINK_FC_CAP;
+			/* If link partner is capable of autoneg, but  */
+			/* not capable of flow control, Received PAUSE */
+			/* frames are still honored, i.e.,             */
+		        /* transmitted frames would be paused */
+			/* by incoming PAUSE frames           */
+			bdp->flags |= DF_LINK_FC_TX_ONLY;
 
 	} else {
 		bdp->flags &= ~DF_LINK_FC_CAP;
@@ -821,8 +827,6 @@ e100_auto_neg(struct e100_private *bdp, unsigned char force_restart)
 
 	bdp->flags &= ~DF_SPEED_FORCED;
 
-	spin_lock_bh(&(bdp->mdi_access_lock));
-
 	e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg);
 	e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg);
 
@@ -848,25 +852,30 @@ e100_auto_neg(struct e100_private *bdp, unsigned char force_restart)
 			    time_after(jiffies, expires) ) {
 				goto exit;
 			} else {
-				spin_unlock_bh(&(bdp->mdi_access_lock));
 				yield();
-				spin_lock_bh(&(bdp->mdi_access_lock));
 			}
 		} while (true);
 	}
 
 exit:
 	e100_find_speed_duplex(bdp);
-	spin_unlock_bh(&(bdp->mdi_access_lock));
 }
 
 void
 e100_phy_set_speed_duplex(struct e100_private *bdp, unsigned char force_restart)
 {
 	if (bdp->params.e100_speed_duplex == E100_AUTONEG) {
+        	if (bdp->rev_id >= D102_REV_ID) 
+			/* Enable MDI/MDI-X auto switching */
+                	e100_mdi_write(bdp, MII_NCONFIG, bdp->phy_addr,
+		                       MDI_MDIX_AUTO_SWITCH_ENABLE);
 		e100_auto_neg(bdp, force_restart);
 
 	} else {
+        	if (bdp->rev_id >= D102_REV_ID) 
+			/* Disable MDI/MDI-X auto switching */
+                	e100_mdi_write(bdp, MII_NCONFIG, bdp->phy_addr,
+		                       MDI_MDIX_RESET_ALL_MASK);
 		e100_force_speed_duplex(bdp);
 	}
 

drivers/net/e100/e100_phy.h

@@ -124,6 +124,27 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define NSC_CONG_CONTROL_REG	    0x17	/* National (TX) congestion control */
 #define NSC_SPEED_IND_REG	    0x19	/* National (TX) speed indication */
 
+#define HWI_CONTROL_REG             0x1D	/* HWI Control register */
+/* MDI/MDI-X Control Register bit definitions */
+#define MDI_MDIX_RES_TIMER          BIT_0_3	/* minimum slot time for resolution timer */
+#define MDI_MDIX_CONFIG_IS_OK       BIT_4	/* 1 = resolution algorithm completes OK */
+#define MDI_MDIX_STATUS             BIT_5	/* 1 = MDIX (croos over), 0 = MDI (straight through) */
+#define MDI_MDIX_SWITCH             BIT_6	/* 1 = Forces to MDIX, 0 = Forces to MDI */
+#define MDI_MDIX_AUTO_SWITCH_ENABLE BIT_7	/* 1 = MDI/MDI-X feature enabled */
+#define MDI_MDIX_CONCT_CONFIG       BIT_8	/* Sets the MDI/MDI-X connectivity configuration (test prupose only) */
+#define MDI_MDIX_CONCT_TEST_ENABLE  BIT_9	/* 1 = Enables connectivity testing */
+#define MDI_MDIX_RESET_ALL_MASK     0x0000
+
+/* HWI Control Register bit definitions */
+#define HWI_TEST_DISTANCE           BIT_0_8	/* distance to cable problem */
+#define HWI_TEST_HIGHZ_PROBLEM      BIT_9	/* 1 = Open Circuit */
+#define HWI_TEST_LOWZ_PROBLEM       BIT_10	/* 1 = Short Circuit */
+#define HWI_TEST_RESERVED           (BIT_11 | BIT_12)	/* reserved */
+#define HWI_TEST_EXECUTE            BIT_13	/* 1 = Execute the HWI test on the PHY */
+#define HWI_TEST_ABILITY            BIT_14	/* 1 = test passed */
+#define HWI_TEST_ENABLE             BIT_15	/* 1 = Enables the HWI feature */
+#define HWI_RESET_ALL_MASK          0x0000
+
 /* ############Start of 82555 specific defines################## */
 
 /* Intel 82555 specific registers */

drivers/net/e100/e100_test.c

@@ -72,7 +72,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "e100.h"
 #include "e100_config.h"
-#ifdef ETHTOOL_TEST
 
 extern u16 e100_eeprom_read(struct e100_private *, u16);
 extern int e100_wait_exec_cmplx(struct e100_private *, u32,u8);
@@ -380,11 +379,11 @@ e100_diag_loopback_cu_ru_exec(struct e100_private *bdp)
 {
 	/*load CU & RU base */ 
 	if (!e100_wait_exec_cmplx(bdp, 0, SCB_CUC_LOAD_BASE))
-		printk("@@@ SCB_CUC_LOAD_BASE failed\n");
+		printk("e100: SCB_CUC_LOAD_BASE failed\n");
 	if(!e100_wait_exec_cmplx(bdp, 0, SCB_RUC_LOAD_BASE))
-		printk("@@@ SCB_RUC_LOAD_BASE failed!\n");
+		printk("e100: SCB_RUC_LOAD_BASE failed!\n");
 	if(!e100_wait_exec_cmplx(bdp, bdp->loopback.dma_handle, SCB_RUC_START))
-		printk("@@@ SCB_RUC_START failed!\n");
+		printk("e100: SCB_RUC_START failed!\n");
 
 	bdp->next_cu_cmd = START_WAIT;
 	e100_start_cu(bdp, bdp->loopback.tcb);
@@ -457,5 +456,3 @@ e100_diag_loopback_free (struct e100_private *bdp)
 			    bdp->loopback.dma_handle);
 }
 
-#endif
-

drivers/net/e100/e100_vendor.h

@@ -125,6 +125,7 @@ enum e100_device_type {
 	E100_82559_LOM,
 	E100_82559_LOM_AOL,
 	E100_82559_LOM_AOL2,
+	E100_82559_LOM_DELL,
 	E100_IBM_MDS,
 	E100_CMPQ_S,
 	E100_PROVE_DA,
@@ -132,7 +133,8 @@ enum e100_device_type {
 	E100_PROVE_LOM,
 	E100_PROVE_NET,
 	E100_82562,
-	E100_ALL_BOARDS,
+	E100_82551QM,
+	E100_ALL_BOARDS
 };
 
 struct e100_vendor_info e100_vendor_info_array[] = {
@@ -147,6 +149,7 @@ struct e100_vendor_info e100_vendor_info_array[] = {
 	{ E100_BRD_100, "Intel(R) PRO/100+ PCI Adapter"},
 	{ E100_BRD_100M, "Intel(R) PRO/100+ Management Adapter"},
 	{ E100_BRD_AOL2, "Intel(R) PRO/100+ Alert on LAN* 2 Management Adapter"},
+	{ E100_82559_LOM_DELL, "Intel(R) 8255x Based Network Connection"},
 	{ E100_BRD_AOL, "Intel(R) PRO/100+ Alert on LAN* Management Adapter"},
 	{ E100_PROS_M, "Intel(R) PRO/100 S Management Adapter"},
 	{ E100_PROS_AM, "Intel(R) PRO/100 S Advanced Management Adapter"},
@@ -186,6 +189,7 @@ struct e100_vendor_info e100_vendor_info_array[] = {
 	{ E100_PROVE_LOM, "Intel(R) PRO/100 VE Network ConnectionPLC LOM" },
 	{ E100_PROVE_NET, "Intel(R) PRO/100 VE Network Connection"},
 	{ E100_82562, "Intel(R)82562 based Fast Ethernet Connection"},
+	{ E100_82551QM, "Intel(R) PRO/100 M Mobile Connection"},
 	{ E100_ALL_BOARDS, "Intel(R) 8255x-based Ethernet Adapter"},
 	{0,NULL}
 };
@@ -309,6 +313,7 @@ static struct pci_device_id e100_id_table[] __devinitdata = {
 	{0x8086, 0x1229, 0x0E11, 0xB144, 0, 0, E100_CMPQ_S},     
 	{0x8086, 0x1229, 0x0E11, 0xB163, 0, 0, E100_CMPQ_S},     
 	{0x8086, 0x1229, 0x0E11, 0xB164, 0, 0, E100_CMPQ_S},
+	{0x8086, 0x1229, 0x1028, PCI_ANY_ID, 0, 0, E100_82559_LOM_DELL},
 	{0x8086, 0x1229, PCI_ANY_ID, PCI_ANY_ID, 0, 0, E100_ALL_BOARDS},
 
 	{0x8086, 0x2449, 0x1014, 0x0265, 0, 0, E100_PROVE_D},
@@ -324,7 +329,11 @@ static struct pci_device_id e100_id_table[] __devinitdata = {
 	{0x8086, 0x2449, 0x0E11, PCI_ANY_ID, 0, 0, E100_PROVM_NET},
 	{0x8086, 0x2449, 0x1014, PCI_ANY_ID, 0, 0, E100_PROVE_D},	
 	{0x8086, 0x2449, PCI_ANY_ID, PCI_ANY_ID, 0, 0, E100_ALL_BOARDS},
-
+	
+	{0x8086, 0x1059, 0x1179, 0x0005, 0, 0, E100_82551QM},
+	{0x8086, 0x1059, 0x1033, 0x8191, 0, 0, E100_82551QM},
+	{0x8086, 0x1059, PCI_ANY_ID, PCI_ANY_ID, 0, 0, E100_82551QM},
+	
 	{0x8086, 0x1209, PCI_ANY_ID, PCI_ANY_ID, 0, 0, E100_ALL_BOARDS},
   	{0x8086, 0x1029, PCI_ANY_ID, PCI_ANY_ID, 0, 0, E100_ALL_BOARDS},
 	{0x8086, 0x1030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, E100_ALL_BOARDS},	

drivers/net/e1000/e1000.h

@@ -109,11 +109,11 @@
 #include <linux/list.h>
 #include <linux/reboot.h>
 #include <linux/ethtool.h>
-#ifdef NETIF_F_HW_VLAN_TX
 #include <linux/if_vlan.h>
-#endif
 
 #define BAR_0		0
+#define BAR_1		1
+#define BAR_5		5
 #define PCI_DMA_64BIT	0xffffffffffffffffULL
 #define PCI_DMA_32BIT	0x00000000ffffffffULL
 
@@ -150,6 +150,8 @@ struct e1000_adapter;
 #define E1000_JUMBO_PBA      0x00000028
 #define E1000_DEFAULT_PBA    0x00000030
 
+#define AUTO_ALL_MODES       0
+
 /* only works for sizes that are powers of 2 */
 #define E1000_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
 
@@ -195,9 +197,7 @@ struct e1000_adapter {
 #ifdef CONFIG_PROC_FS
 	struct list_head proc_list_head;
 #endif
-#ifdef NETIF_F_HW_VLAN_TX
 	struct vlan_group *vlgrp;
-#endif
 	char *id_string;
 	uint32_t bd_number;
 	uint32_t rx_buffer_len;
@@ -208,10 +208,8 @@ struct e1000_adapter {
 	spinlock_t stats_lock;
 	atomic_t irq_sem;
 
-#ifdef ETHTOOL_PHYS_ID
 	struct timer_list blink_timer;
 	unsigned long led_status;
-#endif
 
 	/* TX */
 	struct e1000_desc_ring tx_ring;

drivers/net/e1000/e1000_ethtool.c

@@ -249,17 +249,70 @@ e1000_ethtool_geeprom(struct e1000_adapter *adapter,
                       struct ethtool_eeprom *eeprom, uint16_t *eeprom_buff)
 {
 	struct e1000_hw *hw = &adapter->hw;
-	int i, max_len;
+	int i, max_len, first_word, last_word;
+
+	if(eeprom->len == 0) return;
 
 	eeprom->magic = hw->vendor_id | (hw->device_id << 16);
 
 	max_len = e1000_eeprom_size(hw);
 
-	if ((eeprom->offset + eeprom->len) > max_len)
+	if((eeprom->offset + eeprom->len) > max_len)
 		eeprom->len = (max_len - eeprom->offset);
 
-	for(i = 0; i < (max_len >> 1); i++)
-		e1000_read_eeprom(&adapter->hw, i, &eeprom_buff[i]);
+	first_word = eeprom->offset >> 1;
+	last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+
+	for(i = 0; i <= (last_word - first_word); i++)
+		e1000_read_eeprom(hw, first_word + i, &eeprom_buff[i]);
+}
+
+static int 
+e1000_ethtool_seeprom(struct e1000_adapter *adapter,
+                      struct ethtool_eeprom *eeprom, void *user_data)
+{
+	struct e1000_hw *hw = &adapter->hw;
+	uint16_t eeprom_buff[256];
+	int i, max_len, first_word, last_word;
+	void *ptr;
+
+	if(eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
+		return -EFAULT;
+
+	if(eeprom->len == 0) return 0;
+
+	max_len = e1000_eeprom_size(hw);
+
+	if((eeprom->offset + eeprom->len) > max_len)
+		eeprom->len = (max_len - eeprom->offset);
+
+	first_word = eeprom->offset >> 1;
+	last_word = (eeprom->offset + eeprom->len - 1) >> 1;
+	ptr = (void *)eeprom_buff;
+
+	if(eeprom->offset & 1) {
+		/* need read/modify/write of first changed EEPROM word */
+		/* only the second byte of the word is being modified */
+		e1000_read_eeprom(hw, first_word, &eeprom_buff[0]);
+		ptr++;
+	}
+	if((eeprom->offset + eeprom->len) & 1) {
+		/* need read/modify/write of last changed EEPROM word */
+		/* only the first byte of the word is being modified */
+		e1000_read_eeprom(hw, last_word,
+		                  &eeprom_buff[last_word - first_word]);
+	}
+	if(copy_from_user(ptr, user_data, eeprom->len))
+		return -EFAULT;
+
+	for(i = 0; i <= (last_word - first_word); i++)
+		e1000_write_eeprom(hw, first_word + i, eeprom_buff[i]);
+
+	/* Update the checksum over the first part of the EEPROM if needed */
+	if(first_word <= EEPROM_CHECKSUM_REG)
+		e1000_update_eeprom_checksum(hw);
+
+	return 0;
 }
 
 static void
@@ -339,7 +392,7 @@ e1000_ethtool_swol(struct e1000_adapter *adapter, struct ethtool_wolinfo *wol)
 	case E1000_DEV_ID_82545EM_COPPER:
 	case E1000_DEV_ID_82545EM_FIBER:
 	case E1000_DEV_ID_82546EB_COPPER:
-		if(wol->wolopts & WAKE_ARP)
+		if(wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE))
 			return -EOPNOTSUPP;
 
 		adapter->wol = 0;
@@ -359,7 +412,6 @@ e1000_ethtool_swol(struct e1000_adapter *adapter, struct ethtool_wolinfo *wol)
 	return 0;
 }
 
-#ifdef	ETHTOOL_PHYS_ID
 
 /* toggle LED 4 times per second = 2 "blinks" per second */
 #define E1000_ID_INTERVAL	(HZ/4)
@@ -405,7 +457,6 @@ e1000_ethtool_led_blink(struct e1000_adapter *adapter, struct ethtool_value *id)
 
 	return 0;
 }
-#endif	/* ETHTOOL_PHYS_ID */
 
 int
 e1000_ethtool_ioctl(struct net_device *netdev, struct ifreq *ifr)
@@ -463,14 +514,12 @@ e1000_ethtool_ioctl(struct net_device *netdev, struct ifreq *ifr)
 		e1000_up(adapter);
 		return 0;
 	}
-#ifdef	ETHTOOL_PHYS_ID
 	case ETHTOOL_PHYS_ID: {
 		struct ethtool_value id;
 		if(copy_from_user(&id, addr, sizeof(id)))
 			return -EFAULT;
 		return e1000_ethtool_led_blink(adapter, &id);
 	}
-#endif	/* ETHTOOL_PHYS_ID */
 	case ETHTOOL_GLINK: {
 		struct ethtool_value link = {ETHTOOL_GLINK};
 		link.data = netif_carrier_ok(netdev);
@@ -496,6 +545,7 @@ e1000_ethtool_ioctl(struct net_device *netdev, struct ifreq *ifr)
 	case ETHTOOL_GEEPROM: {
 		struct ethtool_eeprom eeprom = {ETHTOOL_GEEPROM};
 		uint16_t eeprom_buff[256];
+		void *ptr;
 
 		if(copy_from_user(&eeprom, addr, sizeof(eeprom)))
 			return -EFAULT;
@@ -506,11 +556,24 @@ e1000_ethtool_ioctl(struct net_device *netdev, struct ifreq *ifr)
 			return -EFAULT;
 
 		addr += offsetof(struct ethtool_eeprom, data);
+		ptr = ((void *)eeprom_buff) + (eeprom.offset & 1);
 
-		if(copy_to_user(addr, eeprom_buff + eeprom.offset, eeprom.len))
+		if(copy_to_user(addr, ptr, eeprom.len))
 			return -EFAULT;
 		return 0;
 	}
+	case ETHTOOL_SEEPROM: {
+		struct ethtool_eeprom eeprom;
+
+		if(!capable(CAP_NET_ADMIN))
+			return -EPERM;
+
+		if(copy_from_user(&eeprom, addr, sizeof(eeprom)))
+			return -EFAULT;
+
+		addr += offsetof(struct ethtool_eeprom, data);
+		return e1000_ethtool_seeprom(adapter, &eeprom, addr);
+	}
 	default:
 		return -EOPNOTSUPP;
 	}

drivers/net/e1000/e1000_hw.h

@@ -236,6 +236,8 @@ int32_t e1000_validate_mdi_setting(struct e1000_hw *hw);
 /* EEPROM Functions */
 int32_t e1000_read_eeprom(struct e1000_hw *hw, uint16_t reg, uint16_t *data);
 int32_t e1000_validate_eeprom_checksum(struct e1000_hw *hw);
+int32_t e1000_update_eeprom_checksum(struct e1000_hw *hw);
+int32_t e1000_write_eeprom(struct e1000_hw *hw, uint16_t reg, uint16_t data);
 int32_t e1000_read_part_num(struct e1000_hw *hw, uint32_t * part_num);
 int32_t e1000_read_mac_addr(struct e1000_hw * hw);
 
@@ -262,8 +264,19 @@ 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_pci_set_mwi(struct e1000_hw *hw);
+void e1000_pci_clear_mwi(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);
+/* Port I/O is only supported on 82544 and newer */
+uint32_t e1000_io_read(struct e1000_hw *hw, uint32_t port);
+uint32_t e1000_read_reg_io(struct e1000_hw *hw, uint32_t offset);
+void e1000_io_write(struct e1000_hw *hw, uint32_t port, uint32_t value);
+void e1000_write_reg_io(struct e1000_hw *hw, uint32_t offset, uint32_t value);
+#define E1000_READ_REG_IO(a, reg) \
+    e1000_read_reg_io((a), E1000_##reg)
+#define E1000_WRITE_REG_IO(a, reg, val) \
+    e1000_write_reg_io((a), E1000_##reg, val)
 
 /* PCI Device IDs */
 #define E1000_DEV_ID_82542          0x1000
@@ -878,6 +891,7 @@ struct e1000_hw {
     e1000_bus_speed bus_speed;
     e1000_bus_width bus_width;
     e1000_bus_type bus_type;
+    uint32_t io_base;
     uint32_t phy_id;
     uint32_t phy_addr;
     uint32_t original_fc;
@@ -1333,6 +1347,7 @@ struct e1000_hw {
 #define EEPROM_EWDS_OPCODE  0x10 /* EERPOM erast/write disable */
 
 /* EEPROM Word Offsets */
+#define EEPROM_COMPAT              0x0003
 #define EEPROM_ID_LED_SETTINGS     0x0004
 #define EEPROM_INIT_CONTROL1_REG   0x000A
 #define EEPROM_INIT_CONTROL2_REG   0x000F
@@ -1343,9 +1358,9 @@ struct e1000_hw {
 #define ID_LED_RESERVED_0000 0x0000
 #define ID_LED_RESERVED_FFFF 0xFFFF
 #define ID_LED_DEFAULT       ((ID_LED_OFF1_ON2 << 12) | \
-		              (ID_LED_OFF1_OFF2 << 8) | \
-		              (ID_LED_DEF1_DEF2 << 4) | \
-			      (ID_LED_DEF1_DEF2))
+                              (ID_LED_OFF1_OFF2 << 8) | \
+                              (ID_LED_DEF1_DEF2 << 4) | \
+                              (ID_LED_DEF1_DEF2))
 #define ID_LED_DEF1_DEF2     0x1
 #define ID_LED_DEF1_ON2      0x2
 #define ID_LED_DEF1_OFF2     0x3
@@ -1356,6 +1371,10 @@ struct e1000_hw {
 #define ID_LED_OFF1_ON2      0x8
 #define ID_LED_OFF1_OFF2     0x9
 
+/* Mask bits for fields in Word 0x03 of the EEPROM */
+#define EEPROM_COMPAT_SERVER 0x0400
+#define EEPROM_COMPAT_CLIENT 0x0200
+
 /* Mask bits for fields in Word 0x0a of the EEPROM */
 #define EEPROM_WORD0A_ILOS   0x0010
 #define EEPROM_WORD0A_SWDPIO 0x01E0

drivers/net/e1000/e1000_osdep.h

@@ -88,7 +88,8 @@
 #define usec_delay(x) udelay(x)
 #ifndef msec_delay
 #define msec_delay(x)	do { if(in_interrupt()) { \
-	                	mdelay(x); \
+				/* Don't mdelay in interrupt context! */ \
+	                	BUG(); \
 			} else { \
 				set_current_state(TASK_UNINTERRUPTIBLE); \
 				schedule_timeout((x * HZ)/1000); \
@@ -140,4 +141,6 @@ typedef enum {
         readl((a)->hw_addr + E1000_##reg + ((offset) << 2)) : \
         readl((a)->hw_addr + E1000_82542_##reg + ((offset) << 2)))
 
+#define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, STATUS);
+
 #endif /* _E1000_OSDEP_H_ */

drivers/net/e1000/e1000_param.c

@@ -196,38 +196,11 @@ E1000_PARAM(XsumRX, "Disable or enable Receive Checksum offload");
  *
  * Valid Range: 0-65535
  *
- * Default Value: 64/128
+ * Default Value: 0/128
  */
 
 E1000_PARAM(RxIntDelay, "Receive Interrupt Delay");
 
-/* MDI-X Support Enable/Disable - Applies only to Copper PHY
- *
- * Valid Range: 0, 3
- *  - 0 - Auto in all modes
- *  - 1 - MDI
- *  - 2 - MDI-X
- *  - 3 - Auto in 1000 Base-T mode (MDI in 10 Base-T and 100 Base-T)
- *
- * Default Value: 0 (Auto)
- */
-
-E1000_PARAM(MdiX, "Set MDI/MDI-X Mode");
-
-/* Automatic Correction of Reversed Cable Polarity Enable/Disable
- * This setting applies only to Copper PHY
- *
- * Valid Range: 0, 1
- *  - 0 - Disabled
- *  - 1 - Enabled
- *
- * Default Value: 1 (Enabled)
- */
-
-E1000_PARAM(DisablePolarityCorrection,
-	"Disable or enable Automatic Correction for Reversed Cable Polarity");
-
-
 #define AUTONEG_ADV_DEFAULT  0x2F
 #define AUTONEG_ADV_MASK     0x2F
 #define FLOW_CONTROL_DEFAULT FLOW_CONTROL_FULL
@@ -242,16 +215,11 @@ E1000_PARAM(DisablePolarityCorrection,
 #define MIN_RXD                       80
 #define MAX_82544_RXD               4096
 
-#define DEFAULT_RDTR                  64
+#define DEFAULT_RDTR                   0
 #define DEFAULT_RADV                 128
 #define MAX_RXDELAY               0xFFFF
 #define MIN_RXDELAY                    0
 
-#define DEFAULT_MDIX                   0
-#define MAX_MDIX                       3
-#define MIN_MDIX                       0
-
-
 struct e1000_option {
 	enum { enable_option, range_option, list_option } type;
 	char *name;
@@ -646,36 +614,6 @@ e1000_check_copper_options(struct e1000_adapter *adapter)
 		BUG();
 	}
 
-	/* a few other copper only options */
-
-	{ /* MDI/MDI-X */
-		struct e1000_option opt = {
-			type: range_option,
-			name: "MDI/MDI-X",
-			err:  "using default of " __MODULE_STRING(DEFAULT_MDIX),
-			def:  DEFAULT_MDIX,
-			arg: { r: { min: MIN_MDIX, max: MAX_MDIX }}
-		};
-
-		int mdix = MdiX[bd];
-		e1000_validate_option(&mdix, &opt);
-		adapter->hw.mdix = mdix;
-	}
-	{ /* Automatic Correction for Reverse Cable Polarity */
-	  /* option is actually to disable polarity correction,
-	   * so setting to OPTION_ENABLED turns the hardware feature off */
-		struct e1000_option opt = {
-			type: enable_option,
-			name: "Disable Polarity Correction",
-			err:  "defaulting to Disabled",
-			def:  OPTION_DISABLED,
-		};
-
-		int dpc = DisablePolarityCorrection[bd];
-		e1000_validate_option(&dpc, &opt);
-		adapter->hw.disable_polarity_correction = dpc;
-	}
-	
 	/* Speed, AutoNeg and MDI/MDI-X must all play nice */
 	if (e1000_validate_mdi_setting(&(adapter->hw)) < 0) {
 		printk(KERN_INFO "Speed, AutoNeg and MDI-X specifications are "

drivers/net/eepro100.c

@@ -25,6 +25,8 @@
 		Disabled FC and ER, to avoid lockups when when we get FCP interrupts.
 	2000 Jul 17 Goutham Rao <goutham.rao@intel.com>
 		PCI DMA API fixes, adding pci_dma_sync_single calls where neccesary
+    2000 Aug 31 David Mosberger <davidm@hpl.hp.com>
+	    RX_ALIGN support: enables rx DMA without causing unaligned accesses.
 */
 
 static const char *version =
@@ -41,14 +43,18 @@ static int rxfifo = 8;		/* Rx FIFO threshold, default 32 bytes. */
 static int txdmacount = 128;
 static int rxdmacount /* = 0 */;
 
+#if defined(__ia64__) || defined(__alpha__) || defined(__sparc__) || defined(__mips__) || \
+	defined(__arm__)
+  /* align rx buffers to 2 bytes so that IP header is aligned */
+# define RX_ALIGN
+# define RxFD_ALIGNMENT		__attribute__ ((aligned (2), packed))
+#else
+# define RxFD_ALIGNMENT
+#endif
+
 /* Set the copy breakpoint for the copy-only-tiny-buffer Rx method.
    Lower values use more memory, but are faster. */
-#if defined(__alpha__) || defined(__sparc__) || defined(__mips__) || \
-    defined(__arm__)
-static int rx_copybreak = 1518;
-#else
 static int rx_copybreak = 200;
-#endif
 
 /* Maximum events (Rx packets, etc.) to handle at each interrupt. */
 static int max_interrupt_work = 20;
@@ -377,18 +383,18 @@ enum SCBPort_cmds {
 
 /* The Speedo3 Rx and Tx frame/buffer descriptors. */
 struct descriptor {			    /* A generic descriptor. */
-	s32 cmd_status;				/* All command and status fields. */
+	volatile s32 cmd_status;	/* All command and status fields. */
 	u32 link;				    /* struct descriptor *  */
 	unsigned char params[0];
 };
 
 /* The Speedo3 Rx and Tx buffer descriptors. */
 struct RxFD {					/* Receive frame descriptor. */
-	s32 status;
+	volatile s32 status;
 	u32 link;					/* struct RxFD * */
 	u32 rx_buf_addr;			/* void * */
 	u32 count;
-};
+} RxFD_ALIGNMENT;
 
 /* Selected elements of the Tx/RxFD.status word. */
 enum RxFD_bits {
@@ -523,7 +529,12 @@ static const char is_mii[] = { 0, 1, 1, 0, 1, 1, 0, 1 };
 
 static int eepro100_init_one(struct pci_dev *pdev,
 		const struct pci_device_id *ent);
+
 static void eepro100_remove_one (struct pci_dev *pdev);
+#ifdef CONFIG_PM
+static int eepro100_suspend (struct pci_dev *pdev, u32 state);
+static int eepro100_resume (struct pci_dev *pdev);
+#endif
 
 static int do_eeprom_cmd(long ioaddr, int cmd, int cmd_len);
 static int mdio_read(long ioaddr, int phy_id, int location);
@@ -1229,6 +1240,9 @@ speedo_init_rx_ring(struct net_device *dev)
 	for (i = 0; i < RX_RING_SIZE; i++) {
 		struct sk_buff *skb;
 		skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD));
+#ifdef RX_ALIGN
+		skb_reserve(skb, 2);	/* Align IP on 16 byte boundary */
+#endif
 		sp->rx_skbuff[i] = skb;
 		if (skb == NULL)
 			break;			/* OK.  Just initially short of Rx bufs. */
@@ -1620,6 +1634,9 @@ static inline struct RxFD *speedo_rx_alloc(struct net_device *dev, int entry)
 	struct sk_buff *skb;
 	/* Get a fresh skbuff to replace the consumed one. */
 	skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD));
+#ifdef RX_ALIGN
+	skb_reserve(skb, 2);	/* Align IP on 16 byte boundary */
+#endif
 	sp->rx_skbuff[entry] = skb;
 	if (skb == NULL) {
 		sp->rx_ringp[entry] = NULL;
@@ -2303,7 +2320,9 @@ static struct pci_driver eepro100_driver = {
 	name:		"eepro100",
 	id_table:	eepro100_pci_tbl,
 	probe:		eepro100_init_one,
+# if defined(MODULE) || defined(CONFIG_HOTPLUG)
 	remove:		__devexit_p(eepro100_remove_one),
+# endif
 #ifdef CONFIG_PM
 	suspend:	eepro100_suspend,
 	resume:		eepro100_resume,