patch-2.4.27 linux-2.4.27/drivers/net/e1000/e1000_main.c
Next file: linux-2.4.27/drivers/net/e1000/e1000_osdep.h
Previous file: linux-2.4.27/drivers/net/e1000/e1000_hw.h
Back to the patch index
Back to the overall index
- Lines: 540
- Date:
2004-08-07 16:26:05.107365391 -0700
- Orig file:
linux-2.4.26/drivers/net/e1000/e1000_main.c
- Orig date:
2004-04-14 06:05:30.000000000 -0700
diff -urN linux-2.4.26/drivers/net/e1000/e1000_main.c linux-2.4.27/drivers/net/e1000/e1000_main.c
@@ -27,47 +27,32 @@
*******************************************************************************/
#include "e1000.h"
+#include <linux/rtnetlink.h>
/* Change Log
*
- * 5.2.30.1 1/29/03
- * o Set VLAN filtering to IEEE 802.1Q after reset so we don't break
- * SoL connections that use VLANs.
- * o Allow 1000/Full setting for AutoNeg param for Fiber connections
- * Jon D Mason [jonmason@us.ibm.com].
- * o Race between Tx queue and Tx clean fixed with a spin lock.
- * o Added netpoll support.
- * o Fixed endianess bug causing ethtool loopback diags to fail on ppc.
- * o Use pdev->irq rather than netdev->irq in preparation for MSI support.
- * o Report driver message on user override of InterruptThrottleRate
- * module parameter.
- * o Change I/O address storage from uint32_t to unsigned long.
- *
- * 5.2.22 10/15/03
- * o Bug fix: SERDES devices might be connected to a back-plane
- * switch that doesn't support auto-neg, so add the capability
- * to force 1000/Full. Also, since forcing 1000/Full, sample
- * RxSynchronize bit to detect link state.
- * o Bug fix: Flow control settings for hi/lo watermark didn't
- * consider changes in the Rx FIFO size, which could occur with
- * Jumbo Frames or with the reduced FIFO in 82547.
- * o Better propagation of error codes. [Janice Girouard
- * (janiceg@us.ibm.com)].
- * o Bug fix: hang under heavy Tx stress when running out of Tx
- * descriptors; wasn't clearing context descriptor when backing
- * out of send because of no-resource condition.
- * o Bug fix: check netif_running in dev->poll so we don't have to
- * hang in dev->close until all polls are finished. [Robert
- * Ollson (robert.olsson@data.slu.se)].
- * o Revert TxDescriptor ring size back to 256 since change to 1024
- * wasn't accepted into the kernel.
- *
- * 5.2.16 8/8/03
+ * 5.2.51 5/14/04
+ * o set default configuration to 'NAPI disabled'. NAPI enabled driver
+ * causes kernel panic when the interface is shutdown while data is being
+ * transferred.
+ * 5.2.47 5/04/04
+ * o fixed ethtool -t implementation
+ * 5.2.45 4/29/04
+ * o fixed ethtool -e implementation
+ * o Support for ethtool ops [Stephen Hemminger (shemminger@osdl.org)]
+ * 5.2.42 4/26/04
+ * o Added support for the DPRINTK macro for enhanced error logging. Some
+ * parts of the patch were supplied by Jon Mason.
+ * o Move the register_netdevice() donw in the probe routine due to a
+ * loading/unloading test issue.
+ * o Added a long RX byte count the the extra ethtool data members for BER
+ * testing purposes.
+ * 5.2.39 3/12/04
*/
char e1000_driver_name[] = "e1000";
char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
-char e1000_driver_version[] = "5.2.30.1-k1";
+char e1000_driver_version[] = "5.2.52-k3";
char e1000_copyright[] = "Copyright (c) 1999-2004 Intel Corporation.";
/* e1000_pci_tbl - PCI Device ID Table
@@ -162,6 +147,7 @@
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);
+void set_ethtool_ops(struct net_device *netdev);
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,
@@ -198,7 +184,7 @@
/* Exported from other modules */
extern void e1000_check_options(struct e1000_adapter *adapter);
-extern int e1000_ethtool_ioctl(struct net_device *netdev, struct ifreq *ifr);
+
static struct pci_driver e1000_driver = {
.name = e1000_driver_name,
@@ -216,6 +202,10 @@
MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
MODULE_LICENSE("GPL");
+static int debug = 3;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+
/**
* e1000_init_module - Driver Registration Routine
*
@@ -309,7 +299,7 @@
void
e1000_reset(struct e1000_adapter *adapter)
{
- uint32_t pba;
+ uint32_t pba, manc;
/* Repartition Pba for greater than 9k mtu
* To take effect CTRL.RST is required.
*/
@@ -327,14 +317,16 @@
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;
+ (E1000_PBA_40K - pba) << E1000_PBA_BYTES_SHIFT;
atomic_set(&adapter->tx_fifo_stall, 0);
}
E1000_WRITE_REG(&adapter->hw, PBA, pba);
/* flow control settings */
- adapter->hw.fc_high_water = pba - E1000_FC_HIGH_DIFF;
- adapter->hw.fc_low_water = pba - E1000_FC_LOW_DIFF;
+ adapter->hw.fc_high_water =
+ (pba << E1000_PBA_BYTES_SHIFT) - E1000_FC_HIGH_DIFF;
+ adapter->hw.fc_low_water =
+ (pba << E1000_PBA_BYTES_SHIFT) - E1000_FC_LOW_DIFF;
adapter->hw.fc_pause_time = E1000_FC_PAUSE_TIME;
adapter->hw.fc_send_xon = 1;
adapter->hw.fc = adapter->hw.original_fc;
@@ -349,6 +341,12 @@
e1000_reset_adaptive(&adapter->hw);
e1000_phy_get_info(&adapter->hw, &adapter->phy_info);
+
+ if(adapter->en_mng_pt) {
+ manc = E1000_READ_REG(&adapter->hw, MANC);
+ manc |= (E1000_MANC_ARP_EN | E1000_MANC_EN_MNG2HOST);
+ E1000_WRITE_REG(&adapter->hw, MANC, manc);
+ }
}
/**
@@ -402,12 +400,19 @@
}
SET_MODULE_OWNER(netdev);
+ SET_NETDEV_DEV(netdev, &pdev->dev);
pci_set_drvdata(pdev, netdev);
adapter = netdev->priv;
adapter->netdev = netdev;
adapter->pdev = pdev;
adapter->hw.back = adapter;
+ adapter->msg_enable = (1 << debug) - 1;
+
+ rtnl_lock();
+ /* we need to set the name early since the DPRINTK macro needs it set */
+ if (dev_alloc_name(netdev, netdev->name) < 0)
+ goto err_free_unlock;
mmio_start = pci_resource_start(pdev, BAR_0);
mmio_len = pci_resource_len(pdev, BAR_0);
@@ -435,6 +440,7 @@
netdev->set_mac_address = &e1000_set_mac;
netdev->change_mtu = &e1000_change_mtu;
netdev->do_ioctl = &e1000_ioctl;
+ set_ethtool_ops(netdev);
netdev->tx_timeout = &e1000_tx_timeout;
netdev->watchdog_timeo = 5 * HZ;
#ifdef CONFIG_E1000_NAPI
@@ -470,14 +476,21 @@
}
#ifdef NETIF_F_TSO
+#ifdef BROKEN_ON_NON_IA_ARCHS
+ /* Disbaled for now until root-cause is found for
+ * hangs reported against non-IA archs. TSO can be
+ * enabled using ethtool -K eth<x> tso on */
if((adapter->hw.mac_type >= e1000_82544) &&
(adapter->hw.mac_type != e1000_82547))
netdev->features |= NETIF_F_TSO;
#endif
+#endif
if(pci_using_dac)
netdev->features |= NETIF_F_HIGHDMA;
+ adapter->en_mng_pt = e1000_enable_mng_pass_thru(&adapter->hw);
+
/* before reading the EEPROM, reset the controller to
* put the device in a known good starting state */
@@ -486,7 +499,7 @@
/* make sure the EEPROM is good */
if(e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
- printk(KERN_ERR "The EEPROM Checksum Is Not Valid\n");
+ DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
err = -EIO;
goto err_eeprom;
}
@@ -520,15 +533,12 @@
INIT_TQUEUE(&adapter->tx_timeout_task,
(void (*)(void *))e1000_tx_timeout_task, netdev);
- register_netdev(netdev);
-
/* we're going to reset, so assume we have no link for now */
netif_carrier_off(netdev);
netif_stop_queue(netdev);
- printk(KERN_INFO "%s: Intel(R) PRO/1000 Network Connection\n",
- netdev->name);
+ DPRINTK(PROBE, INFO, "Intel(R) PRO/1000 Network Connection\n");
e1000_check_options(adapter);
/* Initial Wake on LAN setting
@@ -562,13 +572,21 @@
e1000_reset(adapter);
+ /* since we are holding the rtnl lock already, call the no-lock version */
+ if((err = register_netdevice(netdev)))
+ goto err_register;
+
cards_found++;
+ rtnl_unlock();
return 0;
+err_register:
err_sw_init:
err_eeprom:
iounmap(adapter->hw.hw_addr);
err_ioremap:
+err_free_unlock:
+ rtnl_unlock();
free_netdev(netdev);
err_alloc_etherdev:
pci_release_regions(pdev);
@@ -646,7 +664,7 @@
/* identify the MAC */
if (e1000_set_mac_type(hw)) {
- E1000_ERR("Unknown MAC Type\n");
+ DPRINTK(PROBE, ERR, "Unknown MAC Type\n");
return -EIO;
}
@@ -1373,9 +1391,8 @@
&adapter->link_speed,
&adapter->link_duplex);
- printk(KERN_INFO
- "e1000: %s NIC Link is Up %d Mbps %s\n",
- netdev->name, adapter->link_speed,
+ DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s\n",
+ adapter->link_speed,
adapter->link_duplex == FULL_DUPLEX ?
"Full Duplex" : "Half Duplex");
@@ -1388,9 +1405,7 @@
if(netif_carrier_ok(netdev)) {
adapter->link_speed = 0;
adapter->link_duplex = 0;
- printk(KERN_INFO
- "e1000: %s NIC Link is Down\n",
- netdev->name);
+ DPRINTK(LINK, INFO, "NIC Link is Down\n");
netif_carrier_off(netdev);
netif_stop_queue(netdev);
mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
@@ -1542,33 +1557,17 @@
static inline int
e1000_tx_map(struct e1000_adapter *adapter, struct sk_buff *skb,
- unsigned int first)
+ unsigned int first, unsigned int max_per_txd,
+ unsigned int nr_frags, unsigned int mss)
{
struct e1000_desc_ring *tx_ring = &adapter->tx_ring;
- struct e1000_tx_desc *tx_desc;
struct e1000_buffer *buffer_info;
- unsigned int len = skb->len, max_per_txd = E1000_MAX_DATA_PER_TXD;
+ unsigned int len = skb->len;
unsigned int offset = 0, size, count = 0, i;
-#ifdef NETIF_F_TSO
- unsigned int mss;
-#endif
- unsigned int nr_frags;
unsigned int f;
-
-#ifdef NETIF_F_TSO
- mss = skb_shinfo(skb)->tso_size;
- /* The controller does a simple calculation to
- * make sure there is enough room in the FIFO before
- * initiating the DMA for each buffer. The calc is:
- * 4 = ceil(buffer len/mss). To make sure we don't
- * overrun the FIFO, adjust the max buffer len if mss
- * drops. */
- if(mss)
- max_per_txd = min(mss << 2, max_per_txd);
-#endif
- nr_frags = skb_shinfo(skb)->nr_frags;
len -= skb->data_len;
+
i = tx_ring->next_to_use;
while(len) {
@@ -1640,46 +1639,6 @@
if(++i == tx_ring->count) i = 0;
}
}
-
- if(E1000_DESC_UNUSED(&adapter->tx_ring) < count + 2) {
-
- /* There aren't enough descriptors available to queue up
- * this send (need: count + 1 context desc + 1 desc gap
- * to keep tail from touching head), so undo the mapping
- * and abort the send. We could have done the check before
- * we mapped the skb, but because of all the workarounds
- * (above), it's too difficult to predict how many we're
- * going to need.*/
- i = adapter->tx_ring.next_to_use;
-
- if(i == first) {
- /* Cleanup after e1000_tx_[csum|tso] scribbling
- * on descriptors. */
- tx_desc = E1000_TX_DESC(*tx_ring, first);
- tx_desc->buffer_addr = 0;
- tx_desc->lower.data = 0;
- tx_desc->upper.data = 0;
- }
-
- while(count--) {
- buffer_info = &tx_ring->buffer_info[i];
-
- if(buffer_info->dma) {
- pci_unmap_page(adapter->pdev,
- buffer_info->dma,
- buffer_info->length,
- PCI_DMA_TODEVICE);
- buffer_info->dma = 0;
- }
-
- if(++i == tx_ring->count) i = 0;
- }
-
- adapter->tx_ring.next_to_use = first;
-
- return 0;
- }
-
i = (i == 0) ? tx_ring->count - 1 : i - 1;
tx_ring->buffer_info[i].skb = skb;
tx_ring->buffer_info[first].next_to_watch = i;
@@ -1774,27 +1733,72 @@
return 0;
}
+#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )
static int
e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
{
struct e1000_adapter *adapter = netdev->priv;
- unsigned int first;
+ unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD;
+ unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;
unsigned int tx_flags = 0;
unsigned long flags;
- int count;
-
+ unsigned int len = skb->len;
+ int count = 0;
+ unsigned int mss = 0;
+ unsigned int nr_frags = 0;
+ unsigned int f;
+ nr_frags = skb_shinfo(skb)->nr_frags;
+ len -= skb->data_len;
if(skb->len <= 0) {
dev_kfree_skb_any(skb);
return 0;
}
+#ifdef NETIF_F_TSO
+ mss = skb_shinfo(skb)->tso_size;
+ /* The controller does a simple calculation to
+ * make sure there is enough room in the FIFO before
+ * initiating the DMA for each buffer. The calc is:
+ * 4 = ceil(buffer len/mss). To make sure we don't
+ * overrun the FIFO, adjust the max buffer len if mss
+ * drops. */
+ if(mss) {
+ max_per_txd = min(mss << 2, max_per_txd);
+ max_txd_pwr = fls(max_per_txd) - 1;
+ }
+ if((mss) || (skb->ip_summed == CHECKSUM_HW))
+ count++;
+ count++; /*for sentinel desc*/
+#else
+ if(skb->ip_summed == CHECKSUM_HW)
+ count++;
+#endif
+
+ count += TXD_USE_COUNT(len, max_txd_pwr);
+ if(adapter->pcix_82544)
+ count++;
+
+ nr_frags = skb_shinfo(skb)->nr_frags;
+ for(f = 0; f < nr_frags; f++)
+ count += TXD_USE_COUNT(skb_shinfo(skb)->frags[f].size,
+ max_txd_pwr);
+ if(adapter->pcix_82544)
+ count += nr_frags;
+
spin_lock_irqsave(&adapter->tx_lock, flags);
+ /* need: count + 2 desc gap to keep tail from touching
+ * head, otherwise try next time */
+ if(E1000_DESC_UNUSED(&adapter->tx_ring) < count + 2 ) {
+ netif_stop_queue(netdev);
+ spin_unlock_irqrestore(&adapter->tx_lock, flags);
+ return 1;
+ }
+ spin_unlock_irqrestore(&adapter->tx_lock, flags);
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);
- spin_unlock_irqrestore(&adapter->tx_lock, flags);
return 1;
}
}
@@ -1811,18 +1815,12 @@
else if(e1000_tx_csum(adapter, skb))
tx_flags |= E1000_TX_FLAGS_CSUM;
- if((count = e1000_tx_map(adapter, skb, first)))
- e1000_tx_queue(adapter, count, tx_flags);
- else {
- netif_stop_queue(netdev);
- spin_unlock_irqrestore(&adapter->tx_lock, flags);
- return 1;
- }
+ e1000_tx_queue(adapter,
+ e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss),
+ tx_flags);
netdev->trans_start = jiffies;
- spin_unlock_irqrestore(&adapter->tx_lock, flags);
-
return 0;
}
@@ -1885,7 +1883,7 @@
if((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) ||
(max_frame > MAX_JUMBO_FRAME_SIZE)) {
- E1000_ERR("Invalid MTU setting\n");
+ DPRINTK(PROBE, ERR, "Invalid MTU setting\n");
return -EINVAL;
}
@@ -1893,7 +1891,7 @@
adapter->rx_buffer_len = E1000_RXBUFFER_2048;
} else if(adapter->hw.mac_type < e1000_82543) {
- E1000_ERR("Jumbo Frames not supported on 82542\n");
+ DPRINTK(PROBE, ERR, "Jumbo Frames not supported on 82542\n");
return -EINVAL;
} else if(max_frame <= E1000_RXBUFFER_4096) {
@@ -2122,26 +2120,10 @@
__netif_rx_schedule(netdev);
}
#else
- /* Writing IMC and IMS is needed for 82547.
- Due to Hub Link bus being occupied, an interrupt
- de-assertion message is not able to be sent.
- When an interrupt assertion message is generated later,
- two messages are re-ordered and sent out.
- That causes APIC to think 82547 is in de-assertion
- state, while 82547 is in assertion state, resulting
- in dead lock. Writing IMC forces 82547 into
- de-assertion state.
- */
- if(hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2)
- e1000_irq_disable(adapter);
-
for(i = 0; i < E1000_MAX_INTR; i++)
if(!e1000_clean_rx_irq(adapter) &
!e1000_clean_tx_irq(adapter))
break;
-
- if(hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2)
- e1000_irq_enable(adapter);
#endif
return IRQ_HANDLED;
@@ -2169,6 +2151,7 @@
if(work_done < work_to_do || !netif_running(netdev)) {
netif_rx_complete(netdev);
e1000_irq_enable(adapter);
+ return 0;
}
return (work_done >= work_to_do);
@@ -2191,7 +2174,6 @@
unsigned int i, eop;
boolean_t cleaned = FALSE;
- spin_lock(&adapter->tx_lock);
i = tx_ring->next_to_clean;
eop = tx_ring->buffer_info[i].next_to_watch;
@@ -2234,6 +2216,8 @@
tx_ring->next_to_clean = i;
+ spin_lock(&adapter->tx_lock);
+
if(cleaned && netif_queue_stopped(netdev) && netif_carrier_ok(netdev))
netif_wake_queue(netdev);
@@ -2294,7 +2278,8 @@
/* All receives must fit into a single buffer */
- E1000_DBG("Receive packet consumed multiple buffers\n");
+ E1000_DBG("%s: Receive packet consumed multiple buffers\n",
+ netdev->name);
dev_kfree_skb_irq(skb);
rx_desc->status = 0;
@@ -2511,8 +2496,6 @@
case SIOCGMIIREG:
case SIOCSMIIREG:
return e1000_mii_ioctl(netdev, ifr, cmd);
- case SIOCETHTOOL:
- return e1000_ethtool_ioctl(netdev, ifr);
default:
return -EOPNOTSUPP;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)