patch-2.4.21 linux-2.4.21/drivers/net/e1000/e1000_main.c
Next file: linux-2.4.21/drivers/net/e1000/e1000_osdep.h
Previous file: linux-2.4.21/drivers/net/e1000/e1000_hw.h
Back to the patch index
Back to the overall index
- Lines: 1250
- Date:
2003-06-13 07:51:34.000000000 -0700
- Orig file:
linux-2.4.20/drivers/net/e1000/e1000_main.c
- Orig date:
2002-11-28 15:53:13.000000000 -0800
diff -urN linux-2.4.20/drivers/net/e1000/e1000_main.c linux-2.4.21/drivers/net/e1000/e1000_main.c
@@ -1,7 +1,7 @@
/*******************************************************************************
- Copyright(c) 1999 - 2002 Intel Corporation. All rights reserved.
+ Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
@@ -26,45 +26,43 @@
*******************************************************************************/
-#define __E1000_MAIN__
#include "e1000.h"
/* Change Log
*
+ * 5.0.43 3/5/03
+ * o Feature: Added support for 82541 and 82547 hardware.
+ * o Feature: Added support for Intel Gigabit PHY (IGP) and a variety of
+ * eeproms.
+ * o Feature: Added support for TCP Segmentation Offload (TSO).
+ * o Feature: Added MII ioctl.
+ * o Feature: Added support for statistics reporting through ethtool.
+ * o Cleanup: Removed proprietary hooks for ANS.
+ * o Cleanup: Miscellaneous code changes to improve CPU utilization.
+ * - Replaced "%" with conditionals and "+-" operators.
+ * - Implemented dynamic Interrupt Throttle Rate (ITR).
+ * - Reduced expensive PCI reads of ICR in interrupt.
+ * o Bug fix: Request IRQ after descriptor ring setup to avoid panic in
+ * shared interrupt instances.
+ *
+ * 4.4.18 11/27/02
+ * o Feature: Added user-settable knob for interrupt throttle rate (ITR).
+ * o Cleanup: removed large static array allocations.
+ * o Cleanup: C99 struct initializer format.
+ * o Bug fix: restore VLAN settings when interface is brought up.
+ * o Bug fix: return cleanly in probe if error in detecting MAC type.
+ * o Bug fix: Wake up on magic packet by default only if enabled in eeprom.
+ * o Bug fix: Validate MAC address in set_mac.
+ * o Bug fix: Throw away zero-length Tx skbs.
+ * o Bug fix: Make ethtool EEPROM acceses work on older versions of ethtool.
+ *
* 4.4.12 10/15/02
- * o Clean up: use members of pci_device rather than direct calls to
- * pci_read_config_word.
- * o Bug fix: changed default flow control settings.
- * o Clean up: ethtool file now has an inclusive list for adapters in the
- * Wake-On-LAN capabilities instead of an exclusive list.
- * o Bug fix: miscellaneous WoL bug fixes.
- * o Added software interrupt for clearing rx ring
- * o Bug fix: easier to undo "forcing" of 1000/fd using ethtool.
- * o Now setting netdev->mem_end in e1000_probe.
- * o Clean up: Moved tx_timeout from interrupt context to process context
- * using schedule_task.
- *
- * 4.3.15 8/9/02
- * o Converted from Dual BSD/GPL license to GPL license.
- * o Clean up: use pci_[clear|set]_mwi rather than direct calls to
- * pci_write_config_word.
- * o Bug fix: added read-behind-write calls to post writes before delays.
- * o Bug fix: removed mdelay busy-waits in interrupt context.
- * o Clean up: direct clear of descriptor bits rather than using memset.
- * o Bug fix: added wmb() for ia-64 between descritor writes and advancing
- * descriptor tail.
- * o Feature: added locking mechanism for asf functionality.
- * o Feature: exposed two Tx and one Rx interrupt delay knobs for finer
- * control over interurpt rate tuning.
- * o Misc ethtool bug fixes.
- *
- * 4.3.2 7/5/02
*/
-
+
char e1000_driver_name[] = "e1000";
char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
-char e1000_driver_version[] = "4.4.12-k1";
-char e1000_copyright[] = "Copyright (c) 1999-2002 Intel Corporation.";
+char e1000_driver_version[] = "5.0.43-k1";
+char e1000_copyright[] = "Copyright (c) 1999-2003 Intel Corporation.";
/* e1000_pci_tbl - PCI Device ID Table
*
@@ -108,6 +106,8 @@
{0x8086, 0x1016, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0x8086, 0x1017, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0x8086, 0x101E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x8086, 0x1013, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x8086, 0x1019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
/* required last entry */
{0,}
};
@@ -116,7 +116,7 @@
static char *e1000_strings[] = {
"Intel(R) PRO/1000 Network Connection",
- "Compaq Gigabit Ethernet Server Adapter",
+ "HP Gigabit Ethernet Server Adapter",
"IBM Mobile, Desktop & Server Adapters"
};
@@ -125,6 +125,7 @@
int e1000_up(struct e1000_adapter *adapter);
void e1000_down(struct e1000_adapter *adapter);
void e1000_reset(struct e1000_adapter *adapter);
+int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
static int e1000_init_module(void);
static void e1000_exit_module(void);
@@ -145,6 +146,7 @@
static void e1000_set_multi(struct net_device *netdev);
static void e1000_update_phy_info(unsigned long data);
static void e1000_watchdog(unsigned long data);
+static void e1000_82547_tx_fifo_stall(unsigned long data);
static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
static struct net_device_stats * e1000_get_stats(struct net_device *netdev);
static int e1000_change_mtu(struct net_device *netdev, int new_mtu);
@@ -153,10 +155,12 @@
static inline void e1000_irq_disable(struct e1000_adapter *adapter);
static inline void e1000_irq_enable(struct e1000_adapter *adapter);
static void e1000_intr(int irq, void *data, struct pt_regs *regs);
-static void e1000_clean_tx_irq(struct e1000_adapter *adapter);
-static void e1000_clean_rx_irq(struct e1000_adapter *adapter);
+static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter);
+static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter);
static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter);
static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);
+static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
+ int cmd);
static void e1000_enter_82542_rst(struct e1000_adapter *adapter);
static void e1000_leave_82542_rst(struct e1000_adapter *adapter);
static inline void e1000_rx_checksum(struct e1000_adapter *adapter,
@@ -164,13 +168,16 @@
struct sk_buff *skb);
static void e1000_tx_timeout(struct net_device *dev);
static void e1000_tx_timeout_task(struct net_device *dev);
+static void e1000_smartspeed(struct e1000_adapter *adapter);
+static inline int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
+ struct sk_buff *skb);
static void e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp);
static void e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);
static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);
+static void e1000_restore_vlan(struct e1000_adapter *adapter);
static int e1000_notify_reboot(struct notifier_block *, unsigned long event, void *ptr);
-static int e1000_notify_netdev(struct notifier_block *, unsigned long event, void *ptr);
static int e1000_suspend(struct pci_dev *pdev, uint32_t state);
#ifdef CONFIG_PM
static int e1000_resume(struct pci_dev *pdev);
@@ -182,17 +189,10 @@
.priority = 0
};
-struct notifier_block e1000_notifier_netdev = {
- .notifier_call = e1000_notify_netdev,
- .next = NULL,
- .priority = 0
-};
/* Exported from other modules */
extern void e1000_check_options(struct e1000_adapter *adapter);
-extern void e1000_proc_dev_setup(struct e1000_adapter *adapter);
-extern void e1000_proc_dev_free(struct e1000_adapter *adapter);
extern int e1000_ethtool_ioctl(struct net_device *netdev, struct ifreq *ifr);
static struct pci_driver e1000_driver = {
@@ -228,10 +228,8 @@
printk(KERN_INFO "%s\n", e1000_copyright);
ret = pci_module_init(&e1000_driver);
- if(ret >= 0) {
+ if(ret >= 0)
register_reboot_notifier(&e1000_notifier_reboot);
- register_netdevice_notifier(&e1000_notifier_netdev);
- }
return ret;
}
@@ -248,7 +246,6 @@
e1000_exit_module(void)
{
unregister_reboot_notifier(&e1000_notifier_reboot);
- unregister_netdevice_notifier(&e1000_notifier_netdev);
pci_unregister_driver(&e1000_driver);
}
@@ -260,19 +257,25 @@
{
struct net_device *netdev = adapter->netdev;
- if(request_irq(netdev->irq, &e1000_intr, SA_SHIRQ | SA_SAMPLE_RANDOM,
- netdev->name, netdev))
- return -1;
-
/* hardware has been reset, we need to reload some things */
e1000_set_multi(netdev);
+ e1000_restore_vlan(adapter);
+
e1000_configure_tx(adapter);
e1000_setup_rctl(adapter);
e1000_configure_rx(adapter);
e1000_alloc_rx_buffers(adapter);
+ if(request_irq(netdev->irq, &e1000_intr, SA_SHIRQ | SA_SAMPLE_RANDOM,
+ netdev->name, netdev)) {
+ e1000_reset_hw(&adapter->hw);
+ e1000_free_tx_resources(adapter);
+ e1000_free_rx_resources(adapter);
+ return -1;
+ }
+
mod_timer(&adapter->watchdog_timer, jiffies);
e1000_irq_enable(adapter);
@@ -286,6 +289,7 @@
e1000_irq_disable(adapter);
free_irq(netdev->irq, netdev);
+ del_timer_sync(&adapter->tx_fifo_stall_timer);
del_timer_sync(&adapter->watchdog_timer);
del_timer_sync(&adapter->phy_info_timer);
adapter->link_speed = 0;
@@ -301,14 +305,28 @@
void
e1000_reset(struct e1000_adapter *adapter)
{
+ uint32_t pba;
/* Repartition Pba for greater than 9k mtu
* To take effect CTRL.RST is required.
*/
- if(adapter->rx_buffer_len > E1000_RXBUFFER_8192)
- E1000_WRITE_REG(&adapter->hw, PBA, E1000_JUMBO_PBA);
- else
- E1000_WRITE_REG(&adapter->hw, PBA, E1000_DEFAULT_PBA);
+ if(adapter->hw.mac_type < e1000_82547) {
+ if(adapter->rx_buffer_len > E1000_RXBUFFER_8192)
+ pba = E1000_PBA_40K;
+ else
+ pba = E1000_PBA_48K;
+ } else {
+ if(adapter->rx_buffer_len > E1000_RXBUFFER_8192)
+ pba = E1000_PBA_22K;
+ else
+ pba = E1000_PBA_30K;
+ adapter->tx_fifo_head = 0;
+ adapter->tx_head_addr = pba << E1000_TX_HEAD_ADDR_SHIFT;
+ adapter->tx_fifo_size =
+ (E1000_PBA_40K - pba) << E1000_TX_FIFO_SIZE_SHIFT;
+ atomic_set(&adapter->tx_fifo_stall, 0);
+ }
+ E1000_WRITE_REG(&adapter->hw, PBA, pba);
adapter->hw.fc = adapter->hw.original_fc;
e1000_reset_hw(&adapter->hw);
@@ -342,6 +360,7 @@
int mmio_len;
int pci_using_dac;
int i;
+ uint16_t eeprom_data;
if((i = pci_enable_device(pdev)))
return i;
@@ -398,7 +417,7 @@
netdev->change_mtu = &e1000_change_mtu;
netdev->do_ioctl = &e1000_ioctl;
netdev->tx_timeout = &e1000_tx_timeout;
- netdev->watchdog_timeo = HZ;
+ netdev->watchdog_timeo = 5 * HZ;
netdev->vlan_rx_register = e1000_vlan_rx_register;
netdev->vlan_rx_add_vid = e1000_vlan_rx_add_vid;
netdev->vlan_rx_kill_vid = e1000_vlan_rx_kill_vid;
@@ -418,9 +437,9 @@
if(adapter->hw.mac_type >= e1000_82543) {
netdev->features = NETIF_F_SG |
- NETIF_F_HW_CSUM |
- NETIF_F_HW_VLAN_TX |
- NETIF_F_HW_VLAN_RX |
+ NETIF_F_HW_CSUM |
+ NETIF_F_HW_VLAN_TX |
+ NETIF_F_HW_VLAN_RX |
NETIF_F_HW_VLAN_FILTER;
} else {
netdev->features = NETIF_F_SG;
@@ -448,13 +467,9 @@
e1000_get_bus_info(&adapter->hw);
- if((adapter->hw.mac_type == e1000_82544) &&
- (adapter->hw.bus_type == e1000_bus_type_pcix))
-
- adapter->max_data_per_txd = 4096;
- else
- adapter->max_data_per_txd = MAX_JUMBO_FRAME_SIZE;
-
+ init_timer(&adapter->tx_fifo_stall_timer);
+ adapter->tx_fifo_stall_timer.function = &e1000_82547_tx_fifo_stall;
+ adapter->tx_fifo_stall_timer.data = (unsigned long) adapter;
init_timer(&adapter->watchdog_timer);
adapter->watchdog_timer.function = &e1000_watchdog;
@@ -464,7 +479,7 @@
adapter->phy_info_timer.function = &e1000_update_phy_info;
adapter->phy_info_timer.data = (unsigned long) adapter;
- INIT_TQUEUE(&adapter->tx_timeout_task,
+ INIT_TQUEUE(&adapter->tx_timeout_task,
(void (*)(void *))e1000_tx_timeout_task, netdev);
register_netdev(netdev);
@@ -478,17 +493,18 @@
printk(KERN_INFO "%s: %s\n", netdev->name, adapter->id_string);
e1000_check_options(adapter);
- e1000_proc_dev_setup(adapter);
/* Initial Wake on LAN setting
* If APM wake is enabled in the EEPROM,
* enable the ACPI Magic Packet filter
*/
+ e1000_read_eeprom(&adapter->hw, EEPROM_INIT_CONTROL2_REG,1, &eeprom_data);
if((adapter->hw.mac_type >= e1000_82544) &&
- (E1000_READ_REG(&adapter->hw, WUC) & E1000_WUC_APME))
+ (eeprom_data & E1000_EEPROM_APME))
adapter->wol |= E1000_WUFC_MAG;
+
/* reset the hardware with the new settings */
e1000_reset(adapter);
@@ -535,7 +551,6 @@
e1000_phy_hw_reset(&adapter->hw);
- e1000_proc_dev_free(adapter);
iounmap(adapter->hw.hw_addr);
pci_release_regions(pdev);
@@ -567,11 +582,12 @@
hw->subsystem_id = pdev->subsystem_device;
pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
+
pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
adapter->rx_buffer_len = E1000_RXBUFFER_2048;
hw->max_frame_size = netdev->mtu +
- ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
+ ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;
hw->min_frame_size = MINIMUM_ETHERNET_FRAME_SIZE;
/* identify the MAC */
@@ -581,6 +597,10 @@
return -1;
}
+ /* initialize eeprom parameters */
+
+ e1000_init_eeprom_params(hw);
+
/* flow control settings */
hw->fc_high_water = E1000_FC_HIGH_THRESH;
@@ -588,6 +608,9 @@
hw->fc_pause_time = E1000_FC_PAUSE_TIME;
hw->fc_send_xon = 1;
+ if((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547))
+ hw->phy_init_script = 1;
+
/* Media type - copper or fiber */
if(hw->mac_type >= e1000_82543) {
@@ -611,7 +634,7 @@
hw->adaptive_ifs = TRUE;
/* Copper options */
-
+
if(hw->media_type == e1000_media_type_copper) {
hw->mdix = AUTO_ALL_MODES;
hw->disable_polarity_correction = FALSE;
@@ -785,7 +808,7 @@
tctl &= ~E1000_TCTL_CT;
tctl |= E1000_TCTL_EN | E1000_TCTL_PSP |
- (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT);
+ (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT);
E1000_WRITE_REG(&adapter->hw, TCTL, tctl);
@@ -855,8 +878,8 @@
rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
rctl |= E1000_RCTL_EN | E1000_RCTL_BAM |
- E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
- (adapter->hw.mc_filter_type << E1000_RCTL_MO_SHIFT);
+ E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
+ (adapter->hw.mc_filter_type << E1000_RCTL_MO_SHIFT);
if(adapter->hw.tbi_compatibility_on == 1)
rctl |= E1000_RCTL_SBP;
@@ -910,12 +933,9 @@
if(adapter->hw.mac_type >= e1000_82540) {
E1000_WRITE_REG(&adapter->hw, RADV, adapter->rx_abs_int_delay);
-
- /* Set the interrupt throttling rate. Value is calculated
- * as DEFAULT_ITR = 1/(MAX_INTS_PER_SEC * 256ns) */
-#define MAX_INTS_PER_SEC 8000
-#define DEFAULT_ITR 1000000000/(MAX_INTS_PER_SEC * 256)
- E1000_WRITE_REG(&adapter->hw, ITR, DEFAULT_ITR);
+ if(adapter->itr > 1)
+ E1000_WRITE_REG(&adapter->hw, ITR,
+ 1000000000 / (adapter->itr * 256));
}
/* Setup the Base and Length of the Rx Descriptor Ring */
@@ -1128,6 +1148,9 @@
struct e1000_adapter *adapter = netdev->priv;
struct sockaddr *addr = p;
+ if(!is_valid_ether_addr(addr->sa_data))
+ return -EADDRNOTAVAIL;
+
/* 82542 2.0 needs to be in reset to write receive address registers */
if(adapter->hw.mac_type == e1000_82542_rev2_0)
@@ -1150,7 +1173,7 @@
*
* The set_multi entry point is called whenever the multicast address
* list or the network interface flags are updated. This routine is
- * resposible for configuring the hardware for proper multicast,
+ * responsible for configuring the hardware for proper multicast,
* promiscuous mode, and all-multi behavior.
**/
@@ -1184,9 +1207,9 @@
if(hw->mac_type == e1000_82542_rev2_0)
e1000_enter_82542_rst(adapter);
- /* load the first 15 multicast address into the exact filters 1-15
+ /* load the first 14 multicast address into the exact filters 1-14
* RAR 0 is used for the station MAC adddress
- * if there are not 15 addresses, go ahead and clear the filters
+ * if there are not 14 addresses, go ahead and clear the filters
*/
mc_ptr = netdev->mc_list;
@@ -1216,6 +1239,40 @@
e1000_leave_82542_rst(adapter);
}
+static void
+e1000_tx_flush(struct e1000_adapter *adapter)
+{
+ uint32_t ctrl, tctl, txcw, icr;
+
+ e1000_irq_disable(adapter);
+
+ if(adapter->hw.mac_type < e1000_82543) {
+ /* Transmit Unit Reset */
+ tctl = E1000_READ_REG(&adapter->hw, TCTL);
+ E1000_WRITE_REG(&adapter->hw, TCTL, tctl | E1000_TCTL_RST);
+ E1000_WRITE_REG(&adapter->hw, TCTL, tctl);
+ e1000_clean_tx_ring(adapter);
+ e1000_configure_tx(adapter);
+ } else {
+ txcw = E1000_READ_REG(&adapter->hw, TXCW);
+ E1000_WRITE_REG(&adapter->hw, TXCW, txcw & ~E1000_TXCW_ANE);
+
+ ctrl = E1000_READ_REG(&adapter->hw, CTRL);
+ E1000_WRITE_REG(&adapter->hw, CTRL, ctrl | E1000_CTRL_SLU |
+ E1000_CTRL_ILOS);
+
+ mdelay(10);
+
+ e1000_clean_tx_irq(adapter);
+ E1000_WRITE_REG(&adapter->hw, CTRL, ctrl);
+ E1000_WRITE_REG(&adapter->hw, TXCW, txcw);
+
+ /* clear the link status change interrupts this caused */
+ icr = E1000_READ_REG(&adapter->hw, ICR);
+ }
+
+ e1000_irq_enable(adapter);
+}
/* need to wait a few seconds after link up to get diagnostic information from the phy */
@@ -1227,6 +1284,48 @@
}
/**
+ * e1000_82547_tx_fifo_stall - Timer Call-back
+ * @data: pointer to adapter cast into an unsigned long
+ **/
+
+static void
+e1000_82547_tx_fifo_stall(unsigned long data)
+{
+ struct e1000_adapter *adapter = (struct e1000_adapter *) data;
+ struct net_device *netdev = adapter->netdev;
+ uint32_t tctl;
+
+ if(atomic_read(&adapter->tx_fifo_stall)) {
+ if((E1000_READ_REG(&adapter->hw, TDT) ==
+ E1000_READ_REG(&adapter->hw, TDH)) &&
+ (E1000_READ_REG(&adapter->hw, TDFT) ==
+ E1000_READ_REG(&adapter->hw, TDFH)) &&
+ (E1000_READ_REG(&adapter->hw, TDFTS) ==
+ E1000_READ_REG(&adapter->hw, TDFHS))) {
+ tctl = E1000_READ_REG(&adapter->hw, TCTL);
+ E1000_WRITE_REG(&adapter->hw, TCTL,
+ tctl & ~E1000_TCTL_EN);
+ E1000_WRITE_REG(&adapter->hw, TDFT,
+ adapter->tx_head_addr);
+ E1000_WRITE_REG(&adapter->hw, TDFH,
+ adapter->tx_head_addr);
+ E1000_WRITE_REG(&adapter->hw, TDFTS,
+ adapter->tx_head_addr);
+ E1000_WRITE_REG(&adapter->hw, TDFHS,
+ adapter->tx_head_addr);
+ E1000_WRITE_REG(&adapter->hw, TCTL, tctl);
+ E1000_WRITE_FLUSH(&adapter->hw);
+
+ adapter->tx_fifo_head = 0;
+ atomic_set(&adapter->tx_fifo_stall, 0);
+ netif_wake_queue(netdev);
+ } else {
+ mod_timer(&adapter->tx_fifo_stall_timer, jiffies + 1);
+ }
+ }
+}
+
+/**
* e1000_watchdog - Timer Call-back
* @data: pointer to netdev cast into an unsigned long
**/
@@ -1256,6 +1355,7 @@
netif_carrier_on(netdev);
netif_wake_queue(netdev);
mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
+ adapter->smartspeed = 0;
}
} else {
if(netif_carrier_ok(netdev)) {
@@ -1268,11 +1368,34 @@
netif_stop_queue(netdev);
mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
}
+
+ e1000_smartspeed(adapter);
}
e1000_update_stats(adapter);
e1000_update_adaptive(&adapter->hw);
+ if(!netif_carrier_ok(netdev)) {
+ if(E1000_DESC_UNUSED(txdr) + 1 < txdr->count) {
+ unsigned long flags;
+ spin_lock_irqsave(&netdev->xmit_lock, flags);
+ e1000_tx_flush(adapter);
+ spin_unlock_irqrestore(&netdev->xmit_lock, flags);
+ }
+ }
+
+ /* Dynamic mode for Interrupt Throttle Rate (ITR) */
+ if(adapter->hw.mac_type >= e1000_82540 && adapter->itr == 1) {
+ /* Symmetric Tx/Rx gets a reduced ITR=2000; Total
+ * asymmetrical Tx or Rx gets ITR=8000; everyone
+ * else is between 2000-8000. */
+ uint32_t goc = (adapter->gotcl + adapter->gorcl) / 10000;
+ uint32_t dif = (adapter->gotcl > adapter->gorcl ?
+ adapter->gotcl - adapter->gorcl :
+ adapter->gorcl - adapter->gotcl) / 10000;
+ uint32_t itr = goc > 0 ? (dif * 6000 / goc + 2000) : 8000;
+ E1000_WRITE_REG(&adapter->hw, ITR, 1000000000 / (itr * 256));
+ }
/* Cause software interrupt to ensure rx ring is cleaned */
E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_RXDMT0);
@@ -1314,7 +1437,7 @@
context_desc->cmd_and_length =
cpu_to_le32(adapter->txd_cmd | E1000_TXD_CMD_DEXT);
- i = (i + 1) % adapter->tx_ring.count;
+ if(++i == adapter->tx_ring.count) i = 0;
adapter->tx_ring.next_to_use = i;
return TRUE;
@@ -1323,23 +1446,22 @@
return FALSE;
}
+#define E1000_MAX_TXD_PWR 12
+#define E1000_MAX_DATA_PER_TXD (1<<E1000_MAX_TXD_PWR)
+
static inline int
e1000_tx_map(struct e1000_adapter *adapter, struct sk_buff *skb)
{
struct e1000_desc_ring *tx_ring = &adapter->tx_ring;
- int len, offset, size, count, i;
+ int len = skb->len, offset = 0, size, count = 0, i;
int f;
- len = skb->len - skb->data_len;
+ len -= skb->data_len;
- i = (tx_ring->next_to_use + tx_ring->count - 1) % tx_ring->count;
- count = 0;
-
- offset = 0;
+ i = tx_ring->next_to_use;
while(len) {
- i = (i + 1) % tx_ring->count;
- size = min(len, adapter->max_data_per_txd);
+ size = min(len, E1000_MAX_DATA_PER_TXD);
tx_ring->buffer_info[i].length = size;
tx_ring->buffer_info[i].dma =
pci_map_single(adapter->pdev,
@@ -1351,6 +1473,7 @@
len -= size;
offset += size;
count++;
+ if(++i == tx_ring->count) i = 0;
}
for(f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
@@ -1361,8 +1484,7 @@
offset = 0;
while(len) {
- i = (i + 1) % tx_ring->count;
- size = min(len, adapter->max_data_per_txd);
+ size = min(len, E1000_MAX_DATA_PER_TXD);
tx_ring->buffer_info[i].length = size;
tx_ring->buffer_info[i].dma =
pci_map_page(adapter->pdev,
@@ -1370,12 +1492,15 @@
frag->page_offset + offset,
size,
PCI_DMA_TODEVICE);
+ tx_ring->buffer_info[i].time_stamp = jiffies;
len -= size;
offset += size;
count++;
+ if(++i == tx_ring->count) i = 0;
}
}
+ if(--i < 0) i = tx_ring->count - 1;
tx_ring->buffer_info[i].skb = skb;
return count;
@@ -1410,7 +1535,7 @@
tx_desc->lower.data =
cpu_to_le32(txd_lower | tx_ring->buffer_info[i].length);
tx_desc->upper.data = cpu_to_le32(txd_upper);
- i = (i + 1) % tx_ring->count;
+ if(++i == tx_ring->count) i = 0;
}
tx_desc->lower.data |= cpu_to_le32(E1000_TXD_CMD_EOP);
@@ -1425,41 +1550,83 @@
E1000_WRITE_REG(&adapter->hw, TDT, i);
}
-#define TXD_USE_COUNT(S, X) (((S) / (X)) + (((S) % (X)) ? 1 : 0))
+/**
+ * 82547 workaround to avoid controller hang in half-duplex environment.
+ * The workaround is to avoid queuing a large packet that would span
+ * the internal Tx FIFO ring boundary by notifying the stack to resend
+ * the packet at a later time. This gives the Tx FIFO an opportunity to
+ * flush all packets. When that occurs, we reset the Tx FIFO pointers
+ * to the beginning of the Tx FIFO.
+ **/
+
+#define E1000_FIFO_HDR 0x10
+#define E1000_82547_PAD_LEN 0x3E0
+
+static inline int
+e1000_82547_fifo_workaround(struct e1000_adapter *adapter, struct sk_buff *skb)
+{
+ uint32_t fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
+ uint32_t skb_fifo_len = skb->len + E1000_FIFO_HDR;
+
+ E1000_ROUNDUP(skb_fifo_len, E1000_FIFO_HDR);
+
+ if(adapter->link_duplex != HALF_DUPLEX)
+ goto no_fifo_stall_required;
+
+ if(atomic_read(&adapter->tx_fifo_stall))
+ return 1;
+
+ if(skb_fifo_len >= (E1000_82547_PAD_LEN + fifo_space)) {
+ atomic_set(&adapter->tx_fifo_stall, 1);
+ return 1;
+ }
+
+no_fifo_stall_required:
+ adapter->tx_fifo_head += skb_fifo_len;
+ if(adapter->tx_fifo_head >= adapter->tx_fifo_size)
+ adapter->tx_fifo_head -= adapter->tx_fifo_size;
+ return 0;
+}
+
+/* Tx Descriptors needed, worst case */
+#define TXD_USE_COUNT(S) (((S) >> E1000_MAX_TXD_PWR) + \
+ (((S) & (E1000_MAX_DATA_PER_TXD - 1)) ? 1 : 0))
+#define DESC_NEEDED TXD_USE_COUNT(MAX_JUMBO_FRAME_SIZE) + \
+ MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1
static int
e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
{
struct e1000_adapter *adapter = netdev->priv;
- int tx_flags = 0, count;
-
- int f;
+ int tx_flags = 0;
- count = TXD_USE_COUNT(skb->len - skb->data_len,
- adapter->max_data_per_txd);
- for(f = 0; f < skb_shinfo(skb)->nr_frags; f++)
- count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size,
- adapter->max_data_per_txd);
-
- if(skb->ip_summed == CHECKSUM_HW)
- count++;
+ if(skb->len <= 0) {
+ dev_kfree_skb_any(skb);
+ return 0;
+ }
- if(E1000_DESC_UNUSED(&adapter->tx_ring) < count) {
+ if(E1000_DESC_UNUSED(&adapter->tx_ring) < DESC_NEEDED) {
netif_stop_queue(netdev);
return 1;
}
- if(e1000_tx_csum(adapter, skb))
- tx_flags |= E1000_TX_FLAGS_CSUM;
+ if(adapter->hw.mac_type == e1000_82547) {
+ if(e1000_82547_fifo_workaround(adapter, skb)) {
+ netif_stop_queue(netdev);
+ mod_timer(&adapter->tx_fifo_stall_timer, jiffies);
+ return 1;
+ }
+ }
if(adapter->vlgrp && vlan_tx_tag_present(skb)) {
tx_flags |= E1000_TX_FLAGS_VLAN;
tx_flags |= (vlan_tx_tag_get(skb) << E1000_TX_FLAGS_VLAN_SHIFT);
}
- count = e1000_tx_map(adapter, skb);
+ if(e1000_tx_csum(adapter, skb))
+ tx_flags |= E1000_TX_FLAGS_CSUM;
- e1000_tx_queue(adapter, count, tx_flags);
+ e1000_tx_queue(adapter, e1000_tx_map(adapter, skb), tx_flags);
netdev->trans_start = jiffies;
@@ -1580,7 +1747,8 @@
adapter->stats.crcerrs += E1000_READ_REG(hw, CRCERRS);
adapter->stats.gprc += E1000_READ_REG(hw, GPRC);
- adapter->stats.gorcl += E1000_READ_REG(hw, GORCL);
+ adapter->gorcl = E1000_READ_REG(hw, GORCL);
+ adapter->stats.gorcl += adapter->gorcl;
adapter->stats.gorch += E1000_READ_REG(hw, GORCH);
adapter->stats.bprc += E1000_READ_REG(hw, BPRC);
adapter->stats.mprc += E1000_READ_REG(hw, MPRC);
@@ -1611,7 +1779,8 @@
adapter->stats.xofftxc += E1000_READ_REG(hw, XOFFTXC);
adapter->stats.fcruc += E1000_READ_REG(hw, FCRUC);
adapter->stats.gptc += E1000_READ_REG(hw, GPTC);
- adapter->stats.gotcl += E1000_READ_REG(hw, GOTCL);
+ adapter->gotcl = E1000_READ_REG(hw, GOTCL);
+ adapter->stats.gotcl += adapter->gotcl;
adapter->stats.gotch += E1000_READ_REG(hw, GOTCH);
adapter->stats.rnbc += E1000_READ_REG(hw, RNBC);
adapter->stats.ruc += E1000_READ_REG(hw, RUC);
@@ -1734,21 +1903,22 @@
{
struct net_device *netdev = data;
struct e1000_adapter *adapter = netdev->priv;
- uint32_t icr;
- int i = E1000_MAX_INTR;
+ uint32_t icr = E1000_READ_REG(&adapter->hw, ICR);
+ int i;
- while(i && (icr = E1000_READ_REG(&adapter->hw, ICR))) {
+ if(!icr)
+ return; /* Not our interrupt */
- if(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
- adapter->hw.get_link_status = 1;
- mod_timer(&adapter->watchdog_timer, jiffies);
- }
+ if(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
+ adapter->hw.get_link_status = 1;
+ mod_timer(&adapter->watchdog_timer, jiffies);
+ }
- e1000_clean_rx_irq(adapter);
- e1000_clean_tx_irq(adapter);
- i--;
+ for(i = 0; i < E1000_MAX_INTR; i++)
+ if(!e1000_clean_rx_irq(adapter) &&
+ !e1000_clean_tx_irq(adapter))
+ break;
- }
}
/**
@@ -1756,20 +1926,22 @@
* @adapter: board private structure
**/
-static void
+static boolean_t
e1000_clean_tx_irq(struct e1000_adapter *adapter)
{
struct e1000_desc_ring *tx_ring = &adapter->tx_ring;
struct net_device *netdev = adapter->netdev;
struct pci_dev *pdev = adapter->pdev;
struct e1000_tx_desc *tx_desc;
- int i;
+ int i, cleaned = FALSE;
i = tx_ring->next_to_clean;
tx_desc = E1000_TX_DESC(*tx_ring, i);
while(tx_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) {
+ cleaned = TRUE;
+
if(tx_ring->buffer_info[i].dma) {
pci_unmap_page(pdev,
@@ -1787,19 +1959,20 @@
tx_ring->buffer_info[i].skb = NULL;
}
+ tx_desc->buffer_addr = 0;
+ tx_desc->lower.data = 0;
tx_desc->upper.data = 0;
- i = (i + 1) % tx_ring->count;
+ if(++i == tx_ring->count) i = 0;
tx_desc = E1000_TX_DESC(*tx_ring, i);
}
tx_ring->next_to_clean = i;
- if(netif_queue_stopped(netdev) && netif_carrier_ok(netdev) &&
- (E1000_DESC_UNUSED(tx_ring) > E1000_TX_QUEUE_WAKE)) {
-
+ if(cleaned && netif_queue_stopped(netdev) && netif_carrier_ok(netdev))
netif_wake_queue(netdev);
- }
+
+ return cleaned;
}
/**
@@ -1807,7 +1980,7 @@
* @adapter: board private structure
**/
-static void
+static boolean_t
e1000_clean_rx_irq(struct e1000_adapter *adapter)
{
struct e1000_desc_ring *rx_ring = &adapter->rx_ring;
@@ -1818,13 +1991,15 @@
unsigned long flags;
uint32_t length;
uint8_t last_byte;
- int i;
+ int i, cleaned = FALSE;
i = rx_ring->next_to_clean;
rx_desc = E1000_RX_DESC(*rx_ring, i);
while(rx_desc->status & E1000_RXD_STAT_DD) {
+ cleaned = TRUE;
+
pci_unmap_single(pdev,
rx_ring->buffer_info[i].dma,
rx_ring->buffer_info[i].length,
@@ -1843,7 +2018,7 @@
rx_desc->status = 0;
rx_ring->buffer_info[i].skb = NULL;
- i = (i + 1) % rx_ring->count;
+ if(++i == rx_ring->count) i = 0;
rx_desc = E1000_RX_DESC(*rx_ring, i);
continue;
@@ -1871,7 +2046,7 @@
rx_desc->status = 0;
rx_ring->buffer_info[i].skb = NULL;
- i = (i + 1) % rx_ring->count;
+ if(++i == rx_ring->count) i = 0;
rx_desc = E1000_RX_DESC(*rx_ring, i);
continue;
@@ -1896,7 +2071,7 @@
rx_desc->status = 0;
rx_ring->buffer_info[i].skb = NULL;
- i = (i + 1) % rx_ring->count;
+ if(++i == rx_ring->count) i = 0;
rx_desc = E1000_RX_DESC(*rx_ring, i);
}
@@ -1904,6 +2079,8 @@
rx_ring->next_to_clean = i;
e1000_alloc_rx_buffers(adapter);
+
+ return cleaned;
}
/**
@@ -1919,11 +2096,9 @@
struct pci_dev *pdev = adapter->pdev;
struct e1000_rx_desc *rx_desc;
struct sk_buff *skb;
- int reserve_len;
+ int reserve_len = 2;
int i;
- reserve_len = 2;
-
i = rx_ring->next_to_use;
while(!rx_ring->buffer_info[i].skb) {
@@ -1954,7 +2129,7 @@
rx_desc->buffer_addr = cpu_to_le64(rx_ring->buffer_info[i].dma);
- if(!(i % E1000_RX_BUFFER_WRITE)) {
+ if((i & ~(E1000_RX_BUFFER_WRITE - 1)) == i) {
/* Force memory writes to complete before letting h/w
* know there are new descriptors to fetch. (Only
* applicable for weak-ordered memory model archs,
@@ -1964,13 +2139,68 @@
E1000_WRITE_REG(&adapter->hw, RDT, i);
}
- i = (i + 1) % rx_ring->count;
+ if(++i == rx_ring->count) i = 0;
}
rx_ring->next_to_use = i;
}
/**
+ * e1000_smartspeed - Workaround for SmartSpeed on 82541 and 82547 controllers.
+ * @adapter:
+ **/
+
+static void
+e1000_smartspeed(struct e1000_adapter *adapter)
+{
+ uint16_t phy_status;
+ uint16_t phy_ctrl;
+
+ if((adapter->hw.phy_type != e1000_phy_igp) || !adapter->hw.autoneg ||
+ !(adapter->hw.autoneg_advertised & ADVERTISE_1000_FULL))
+ return;
+
+ if(adapter->smartspeed == 0) {
+ /* If Master/Slave config fault is asserted twice,
+ * we assume back-to-back */
+ e1000_read_phy_reg(&adapter->hw, PHY_1000T_STATUS, &phy_status);
+ if(!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;
+ e1000_read_phy_reg(&adapter->hw, PHY_1000T_STATUS, &phy_status);
+ if(!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;
+ e1000_read_phy_reg(&adapter->hw, PHY_1000T_CTRL, &phy_ctrl);
+ if(phy_ctrl & CR_1000T_MS_ENABLE) {
+ phy_ctrl &= ~CR_1000T_MS_ENABLE;
+ e1000_write_phy_reg(&adapter->hw, PHY_1000T_CTRL,
+ phy_ctrl);
+ adapter->smartspeed++;
+ if(!e1000_phy_setup_autoneg(&adapter->hw) &&
+ !e1000_read_phy_reg(&adapter->hw, PHY_CTRL,
+ &phy_ctrl)) {
+ phy_ctrl |= (MII_CR_AUTO_NEG_EN |
+ MII_CR_RESTART_AUTO_NEG);
+ e1000_write_phy_reg(&adapter->hw, PHY_CTRL,
+ phy_ctrl);
+ }
+ }
+ return;
+ } else if(adapter->smartspeed == E1000_SMARTSPEED_DOWNSHIFT) {
+ /* If still no link, perhaps using 2/3 pair cable */
+ e1000_read_phy_reg(&adapter->hw, PHY_1000T_CTRL, &phy_ctrl);
+ phy_ctrl |= CR_1000T_MS_ENABLE;
+ e1000_write_phy_reg(&adapter->hw, PHY_1000T_CTRL, phy_ctrl);
+ if(!e1000_phy_setup_autoneg(&adapter->hw) &&
+ !e1000_read_phy_reg(&adapter->hw, PHY_CTRL, &phy_ctrl)) {
+ phy_ctrl |= (MII_CR_AUTO_NEG_EN |
+ MII_CR_RESTART_AUTO_NEG);
+ e1000_write_phy_reg(&adapter->hw, PHY_CTRL, phy_ctrl);
+ }
+ }
+ /* Restart process after E1000_SMARTSPEED_MAX iterations */
+ if(adapter->smartspeed++ == E1000_SMARTSPEED_MAX)
+ adapter->smartspeed = 0;
+}
+
+/**
* e1000_ioctl -
* @netdev:
* @ifreq:
@@ -1981,6 +2211,10 @@
e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
{
switch (cmd) {
+ case SIOCGMIIPHY:
+ case SIOCGMIIREG:
+ case SIOCSMIIREG:
+ return e1000_mii_ioctl(netdev, ifr, cmd);
case SIOCETHTOOL:
return e1000_ethtool_ioctl(netdev, ifr);
default:
@@ -1989,6 +2223,86 @@
}
/**
+ * e1000_mii_ioctl -
+ * @netdev:
+ * @ifreq:
+ * @cmd:
+ **/
+
+static int
+e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+ struct e1000_adapter *adapter = netdev->priv;
+ struct mii_ioctl_data *data = (struct mii_ioctl_data *)&ifr->ifr_data;
+ int retval;
+ uint16_t mii_reg;
+ uint16_t spddplx;
+
+ if(adapter->hw.media_type == e1000_media_type_fiber)
+ return -EOPNOTSUPP;
+
+ switch (cmd) {
+ case SIOCGMIIPHY:
+ data->phy_id = adapter->hw.phy_addr;
+ break;
+ case SIOCGMIIREG:
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+ if (e1000_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,
+ &data->val_out))
+ return -EIO;
+ break;
+ case SIOCSMIIREG:
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+ if (data->reg_num & ~(0x1F))
+ return -EFAULT;
+ mii_reg = data->val_in;
+ if (e1000_write_phy_reg(&adapter->hw, data->reg_num,
+ data->val_in))
+ return -EIO;
+ if (adapter->hw.phy_type == e1000_phy_m88) {
+ switch (data->reg_num) {
+ case PHY_CTRL:
+ if(data->val_in & MII_CR_AUTO_NEG_EN) {
+ adapter->hw.autoneg = 1;
+ adapter->hw.autoneg_advertised = 0x2F;
+ } else {
+ if (data->val_in & 0x40)
+ spddplx = SPEED_1000;
+ else if (data->val_in & 0x2000)
+ spddplx = SPEED_100;
+ else
+ spddplx = SPEED_10;
+ spddplx += (data->val_in & 0x100)
+ ? FULL_DUPLEX :
+ HALF_DUPLEX;
+ retval = e1000_set_spd_dplx(adapter,
+ spddplx);
+ if(retval)
+ return retval;
+ }
+ if(netif_running(adapter->netdev)) {
+ e1000_down(adapter);
+ e1000_up(adapter);
+ } else
+ e1000_reset(adapter);
+ break;
+ case M88E1000_PHY_SPEC_CTRL:
+ case M88E1000_EXT_PHY_SPEC_CTRL:
+ if (e1000_phy_reset(&adapter->hw))
+ return -EIO;
+ break;
+ }
+ }
+ break;
+ default:
+ return -EOPNOTSUPP;
+ }
+ return E1000_SUCCESS;
+}
+
+/**
* e1000_rx_checksum - Receive Checksum Offload for 82543
* @adapter: board private structure
* @rx_desc: receive descriptor
@@ -2143,6 +2457,50 @@
e1000_write_vfta(&adapter->hw, index, vfta);
}
+static void
+e1000_restore_vlan(struct e1000_adapter *adapter)
+{
+ e1000_vlan_rx_register(adapter->netdev, adapter->vlgrp);
+
+ if(adapter->vlgrp) {
+ uint16_t vid;
+ for(vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
+ if(!adapter->vlgrp->vlan_devices[vid])
+ continue;
+ e1000_vlan_rx_add_vid(adapter->netdev, vid);
+ }
+ }
+}
+
+int
+e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx)
+{
+ adapter->hw.autoneg = 0;
+
+ switch(spddplx) {
+ case SPEED_10 + DUPLEX_HALF:
+ adapter->hw.forced_speed_duplex = e1000_10_half;
+ break;
+ case SPEED_10 + DUPLEX_FULL:
+ adapter->hw.forced_speed_duplex = e1000_10_full;
+ break;
+ case SPEED_100 + DUPLEX_HALF:
+ adapter->hw.forced_speed_duplex = e1000_100_half;
+ break;
+ case SPEED_100 + DUPLEX_FULL:
+ adapter->hw.forced_speed_duplex = e1000_100_full;
+ break;
+ case SPEED_1000 + DUPLEX_FULL:
+ adapter->hw.autoneg = 1;
+ adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
+ break;
+ case SPEED_1000 + DUPLEX_HALF: /* not supported */
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
static int
e1000_notify_reboot(struct notifier_block *nb, unsigned long event, void *p)
{
@@ -2160,42 +2518,25 @@
return NOTIFY_DONE;
}
-static int
-e1000_notify_netdev(struct notifier_block *nb, unsigned long event, void *p)
-{
- struct e1000_adapter *adapter;
- struct net_device *netdev = p;
- if(netdev == NULL)
- return NOTIFY_DONE;
-
- switch(event) {
- case NETDEV_CHANGENAME:
- if(netdev->open == e1000_open) {
- adapter = netdev->priv;
- /* rename the proc nodes the easy way */
- e1000_proc_dev_free(adapter);
- memcpy(adapter->ifname, netdev->name, IFNAMSIZ);
- adapter->ifname[IFNAMSIZ-1] = 0;
- e1000_proc_dev_setup(adapter);
- }
- break;
- }
- return NOTIFY_DONE;
-}
static int
e1000_suspend(struct pci_dev *pdev, uint32_t state)
{
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev->priv;
- uint32_t ctrl, ctrl_ext, rctl, manc;
+ uint32_t ctrl, ctrl_ext, rctl, manc, status;
+ uint32_t wufc = adapter->wol;
netif_device_detach(netdev);
if(netif_running(netdev))
e1000_down(adapter);
- if(adapter->wol) {
+ status = E1000_READ_REG(&adapter->hw, STATUS);
+ if(status & E1000_STATUS_LU)
+ wufc &= ~E1000_WUFC_LNKC;
+
+ if(wufc) {
e1000_setup_rctl(adapter);
e1000_set_multi(netdev);
@@ -2225,7 +2566,7 @@
}
E1000_WRITE_REG(&adapter->hw, WUC, E1000_WUC_PME_EN);
- E1000_WRITE_REG(&adapter->hw, WUFC, adapter->wol);
+ E1000_WRITE_REG(&adapter->hw, WUFC, wufc);
pci_enable_wake(pdev, 3, 1);
pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
} else {
@@ -2242,7 +2583,8 @@
if(manc & E1000_MANC_SMBUS_EN) {
manc |= E1000_MANC_ARP_EN;
E1000_WRITE_REG(&adapter->hw, MANC, manc);
- state = 0;
+ pci_enable_wake(pdev, 3, 1);
+ pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
}
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)