r2657 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian: . patches patches/series

maximilian attems maks-guest@costa.debian.org
Tue, 08 Mar 2005 22:48:16 +0100


Author: maks-guest
Date: 2005-03-08 22:48:15 +0100 (Tue, 08 Mar 2005)
New Revision: 2657

Removed:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-tg3-readd.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
Log:
remove old tg3 patch first.


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-08 21:44:08 UTC (rev 2656)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-08 21:48:15 UTC (rev 2657)
@@ -10,8 +10,7 @@
 
   * Add newer scsi-changer patch (Maximilian Attems)
 
-  * Rework drivers-net-tg3-readd.dpatch, modular-ide-pnp.dpatch,
-    x86-i486_emu.dpatch (Maximilian Attems)
+  * modular-ide-pnp.dpatch, x86-i486_emu.dpatch (Maximilian Attems)
 
   * [powerpc] Added new powerbook thermal sensor i2c detection patch
     (Sven Luther)

Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-tg3-readd.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-tg3-readd.dpatch	2005-03-08 21:44:08 UTC (rev 2656)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-net-tg3-readd.dpatch	2005-03-08 21:48:15 UTC (rev 2657)
@@ -1,8135 +0,0 @@
-# origin: Debian (neroden)
-# cset: n/a
-# inclusion: rejected
-# description: re-add tg3.c with firmware loading support
-# revision date: 2005-01-02
-
---- orig/drivers/net/Kconfig	2004-08-14 03:27:18.000000000 -0400
-+++ mod/drivers/net/Kconfig	2004-08-14 03:27:34.000000000 -0400
-@@ -2075,6 +2075,7 @@
- config TIGON3
- 	tristate "Broadcom Tigon3 support"
- 	depends on PCI
-+	select FW_LOADER
- 	help
- 	  This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
-
---- /dev/null	2005-01-01 15:26:30.000000000 -0800
-+++ linux/drivers/net/tg3.c	2005-01-02 04:07:57.000000000 -0800
-@@ -0,0 +1,8116 @@
-+/*
-+ * tg3.c: Broadcom Tigon3 ethernet driver.
-+ *
-+ * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
-+ * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)
-+ * Copyright (C) 2004 Sun Microsystems Inc.
-+ * Portions copyright 2004 Nathanael Nerode  <neroden@gcc.gnu.org>
-+ *
-+ * Firmware is:
-+ * 	Copyright (C) 2000-2003 Broadcom Corporation.
-+ */
-+
-+#include <linux/config.h>
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/compiler.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+#include <linux/init.h>
-+#include <linux/ioport.h>
-+#include <linux/pci.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/ethtool.h>
-+#include <linux/mii.h>
-+#include <linux/if_vlan.h>
-+#include <linux/ip.h>
-+#include <linux/tcp.h>
-+#include <linux/workqueue.h>
-+
-+#include <linux/firmware.h>
-+
-+#include <net/checksum.h>
-+
-+#include <asm/system.h>
-+#include <asm/io.h>
-+#include <asm/byteorder.h>
-+#include <asm/uaccess.h>
-+
-+#ifdef CONFIG_SPARC64
-+#include <asm/idprom.h>
-+#include <asm/oplib.h>
-+#include <asm/pbm.h>
-+#endif
-+
-+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-+#define TG3_VLAN_TAG_USED 1
-+#else
-+#define TG3_VLAN_TAG_USED 0
-+#endif
-+
-+#ifdef NETIF_F_TSO
-+#define TG3_TSO_SUPPORT	1
-+#else
-+#define TG3_TSO_SUPPORT	0
-+#endif
-+
-+#include "tg3.h"
-+
-+#define DRV_MODULE_NAME		"tg3"
-+#define PFX DRV_MODULE_NAME	": "
-+#define DRV_MODULE_VERSION	"3.14"
-+#define DRV_MODULE_RELDATE	"November 15, 2004"
-+
-+#define TG3_DEF_MAC_MODE	0
-+#define TG3_DEF_RX_MODE		0
-+#define TG3_DEF_TX_MODE		0
-+#define TG3_DEF_MSG_ENABLE	  \
-+	(NETIF_MSG_DRV		| \
-+	 NETIF_MSG_PROBE	| \
-+	 NETIF_MSG_LINK		| \
-+	 NETIF_MSG_TIMER	| \
-+	 NETIF_MSG_IFDOWN	| \
-+	 NETIF_MSG_IFUP		| \
-+	 NETIF_MSG_RX_ERR	| \
-+	 NETIF_MSG_TX_ERR)
-+
-+/* length of time before we decide the hardware is borked,
-+ * and dev->tx_timeout() should be called to fix the problem
-+ */
-+#define TG3_TX_TIMEOUT			(5 * HZ)
-+
-+/* hardware minimum and maximum for a single frame's data payload */
-+#define TG3_MIN_MTU			60
-+#define TG3_MAX_MTU(tp)	\
-+	((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 && \
-+	  GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750) ? 9000 : 1500)
-+
-+/* These numbers seem to be hard coded in the NIC firmware somehow.
-+ * You can't change the ring sizes, but you can change where you place
-+ * them in the NIC onboard memory.
-+ */
-+#define TG3_RX_RING_SIZE		512
-+#define TG3_DEF_RX_RING_PENDING		200
-+#define TG3_RX_JUMBO_RING_SIZE		256
-+#define TG3_DEF_RX_JUMBO_RING_PENDING	100
-+
-+/* Do not place this n-ring entries value into the tp struct itself,
-+ * we really want to expose these constants to GCC so that modulo et
-+ * al.  operations are done with shifts and masks instead of with
-+ * hw multiply/modulo instructions.  Another solution would be to
-+ * replace things like '% foo' with '& (foo - 1)'.
-+ */
-+#define TG3_RX_RCB_RING_SIZE(tp)	\
-+	((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 || \
-+	  GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) ? \
-+	 512 : 1024)
-+
-+#define TG3_TX_RING_SIZE		512
-+#define TG3_DEF_TX_RING_PENDING		(TG3_TX_RING_SIZE - 1)
-+
-+#define TG3_RX_RING_BYTES	(sizeof(struct tg3_rx_buffer_desc) * \
-+				 TG3_RX_RING_SIZE)
-+#define TG3_RX_JUMBO_RING_BYTES	(sizeof(struct tg3_rx_buffer_desc) * \
-+			         TG3_RX_JUMBO_RING_SIZE)
-+#define TG3_RX_RCB_RING_BYTES(tp) (sizeof(struct tg3_rx_buffer_desc) * \
-+			           TG3_RX_RCB_RING_SIZE(tp))
-+#define TG3_TX_RING_BYTES	(sizeof(struct tg3_tx_buffer_desc) * \
-+				 TG3_TX_RING_SIZE)
-+#define TX_RING_GAP(TP)	\
-+	(TG3_TX_RING_SIZE - (TP)->tx_pending)
-+#define TX_BUFFS_AVAIL(TP)						\
-+	(((TP)->tx_cons <= (TP)->tx_prod) ?				\
-+	  (TP)->tx_cons + (TP)->tx_pending - (TP)->tx_prod :		\
-+	  (TP)->tx_cons - (TP)->tx_prod - TX_RING_GAP(TP))
-+#define NEXT_TX(N)		(((N) + 1) & (TG3_TX_RING_SIZE - 1))
-+
-+#define RX_PKT_BUF_SZ		(1536 + tp->rx_offset + 64)
-+#define RX_JUMBO_PKT_BUF_SZ	(9046 + tp->rx_offset + 64)
-+
-+/* minimum number of free TX descriptors required to wake up TX process */
-+#define TG3_TX_WAKEUP_THRESH		(TG3_TX_RING_SIZE / 4)
-+
-+/* number of ETHTOOL_GSTATS u64's */
-+#define TG3_NUM_STATS		(sizeof(struct tg3_ethtool_stats)/sizeof(u64))
-+
-+static char version[] __devinitdata =
-+	DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
-+
-+MODULE_AUTHOR("David S. Miller (davem@redhat.com) and Jeff Garzik (jgarzik@pobox.com)");
-+MODULE_DESCRIPTION("Broadcom Tigon3 ethernet driver");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION(DRV_MODULE_VERSION);
-+
-+static int tg3_debug = -1;	/* -1 == use TG3_DEF_MSG_ENABLE as value */
-+module_param(tg3_debug, int, 0);
-+MODULE_PARM_DESC(tg3_debug, "Tigon3 bitmapped debugging message enable value");
-+
-+static struct pci_device_id tg3_pci_tbl[] = {
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5700,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5701,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5702,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5703,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5702FE,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705_2,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705M,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705M_2,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5702X,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5703X,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704S,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5702A3,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5703A3,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5782,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5788,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5789,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5901,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5901_2,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704S_2,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705F,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5720,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5721,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750M,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751M,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751F,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753M,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5753F,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5781,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1001,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1003,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC9100,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_TIGON3,
-+	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
-+	{ 0, }
-+};
-+
-+MODULE_DEVICE_TABLE(pci, tg3_pci_tbl);
-+
-+static struct {
-+	const char string[ETH_GSTRING_LEN];
-+} ethtool_stats_keys[TG3_NUM_STATS] = {
-+	{ "rx_octets" },
-+	{ "rx_fragments" },
-+	{ "rx_ucast_packets" },
-+	{ "rx_mcast_packets" },
-+	{ "rx_bcast_packets" },
-+	{ "rx_fcs_errors" },
-+	{ "rx_align_errors" },
-+	{ "rx_xon_pause_rcvd" },
-+	{ "rx_xoff_pause_rcvd" },
-+	{ "rx_mac_ctrl_rcvd" },
-+	{ "rx_xoff_entered" },
-+	{ "rx_frame_too_long_errors" },
-+	{ "rx_jabbers" },
-+	{ "rx_undersize_packets" },
-+	{ "rx_in_length_errors" },
-+	{ "rx_out_length_errors" },
-+	{ "rx_64_or_less_octet_packets" },
-+	{ "rx_65_to_127_octet_packets" },
-+	{ "rx_128_to_255_octet_packets" },
-+	{ "rx_256_to_511_octet_packets" },
-+	{ "rx_512_to_1023_octet_packets" },
-+	{ "rx_1024_to_1522_octet_packets" },
-+	{ "rx_1523_to_2047_octet_packets" },
-+	{ "rx_2048_to_4095_octet_packets" },
-+	{ "rx_4096_to_8191_octet_packets" },
-+	{ "rx_8192_to_9022_octet_packets" },
-+
-+	{ "tx_octets" },
-+	{ "tx_collisions" },
-+
-+	{ "tx_xon_sent" },
-+	{ "tx_xoff_sent" },
-+	{ "tx_flow_control" },
-+	{ "tx_mac_errors" },
-+	{ "tx_single_collisions" },
-+	{ "tx_mult_collisions" },
-+	{ "tx_deferred" },
-+	{ "tx_excessive_collisions" },
-+	{ "tx_late_collisions" },
-+	{ "tx_collide_2times" },
-+	{ "tx_collide_3times" },
-+	{ "tx_collide_4times" },
-+	{ "tx_collide_5times" },
-+	{ "tx_collide_6times" },
-+	{ "tx_collide_7times" },
-+	{ "tx_collide_8times" },
-+	{ "tx_collide_9times" },
-+	{ "tx_collide_10times" },
-+	{ "tx_collide_11times" },
-+	{ "tx_collide_12times" },
-+	{ "tx_collide_13times" },
-+	{ "tx_collide_14times" },
-+	{ "tx_collide_15times" },
-+	{ "tx_ucast_packets" },
-+	{ "tx_mcast_packets" },
-+	{ "tx_bcast_packets" },
-+	{ "tx_carrier_sense_errors" },
-+	{ "tx_discards" },
-+	{ "tx_errors" },
-+
-+	{ "dma_writeq_full" },
-+	{ "dma_write_prioq_full" },
-+	{ "rxbds_empty" },
-+	{ "rx_discards" },
-+	{ "rx_errors" },
-+	{ "rx_threshold_hit" },
-+
-+	{ "dma_readq_full" },
-+	{ "dma_read_prioq_full" },
-+	{ "tx_comp_queue_full" },
-+
-+	{ "ring_set_send_prod_index" },
-+	{ "ring_status_update" },
-+	{ "nic_irqs" },
-+	{ "nic_avoided_irqs" },
-+	{ "nic_tx_threshold_hit" }
-+};
-+
-+static void tg3_write_indirect_reg32(struct tg3 *tp, u32 off, u32 val)
-+{
-+	if ((tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG) != 0) {
-+		unsigned long flags;
-+
-+		spin_lock_irqsave(&tp->indirect_lock, flags);
-+		pci_write_config_dword(tp->pdev, TG3PCI_REG_BASE_ADDR, off);
-+		pci_write_config_dword(tp->pdev, TG3PCI_REG_DATA, val);
-+		spin_unlock_irqrestore(&tp->indirect_lock, flags);
-+	} else {
-+		writel(val, tp->regs + off);
-+		if ((tp->tg3_flags & TG3_FLAG_5701_REG_WRITE_BUG) != 0)
-+			readl(tp->regs + off);
-+	}
-+}
-+
-+static void _tw32_flush(struct tg3 *tp, u32 off, u32 val)
-+{
-+	if ((tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG) != 0) {
-+		unsigned long flags;
-+
-+		spin_lock_irqsave(&tp->indirect_lock, flags);
-+		pci_write_config_dword(tp->pdev, TG3PCI_REG_BASE_ADDR, off);
-+		pci_write_config_dword(tp->pdev, TG3PCI_REG_DATA, val);
-+		spin_unlock_irqrestore(&tp->indirect_lock, flags);
-+	} else {
-+		void __iomem *dest = tp->regs + off;
-+		writel(val, dest);
-+		readl(dest);    /* always flush PCI write */
-+	}
-+}
-+
-+static inline void _tw32_rx_mbox(struct tg3 *tp, u32 off, u32 val)
-+{
-+	void __iomem *mbox = tp->regs + off;
-+	writel(val, mbox);
-+	if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)
-+		readl(mbox);
-+}
-+
-+static inline void _tw32_tx_mbox(struct tg3 *tp, u32 off, u32 val)
-+{
-+	void __iomem *mbox = tp->regs + off;
-+	writel(val, mbox);
-+	if (tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG)
-+		writel(val, mbox);
-+	if (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)
-+		readl(mbox);
-+}
-+
-+#define tw32_mailbox(reg, val)  writel(((val) & 0xffffffff), tp->regs + (reg))
-+#define tw32_rx_mbox(reg, val)  _tw32_rx_mbox(tp, reg, val)
-+#define tw32_tx_mbox(reg, val)  _tw32_tx_mbox(tp, reg, val)
-+
-+#define tw32(reg,val)		tg3_write_indirect_reg32(tp,(reg),(val))
-+#define tw32_f(reg,val)		_tw32_flush(tp,(reg),(val))
-+#define tw16(reg,val)		writew(((val) & 0xffff), tp->regs + (reg))
-+#define tw8(reg,val)		writeb(((val) & 0xff), tp->regs + (reg))
-+#define tr32(reg)		readl(tp->regs + (reg))
-+#define tr16(reg)		readw(tp->regs + (reg))
-+#define tr8(reg)		readb(tp->regs + (reg))
-+
-+static void tg3_write_mem(struct tg3 *tp, u32 off, u32 val)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&tp->indirect_lock, flags);
-+	pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
-+	pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
-+
-+	/* Always leave this as zero. */
-+	pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
-+	spin_unlock_irqrestore(&tp->indirect_lock, flags);
-+}
-+
-+static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&tp->indirect_lock, flags);
-+	pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
-+	pci_read_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
-+
-+	/* Always leave this as zero. */
-+	pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
-+	spin_unlock_irqrestore(&tp->indirect_lock, flags);
-+}
-+
-+static void tg3_disable_ints(struct tg3 *tp)
-+{
-+	tw32(TG3PCI_MISC_HOST_CTRL,
-+	     (tp->misc_host_ctrl | MISC_HOST_CTRL_MASK_PCI_INT));
-+	tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001);
-+	tr32(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW);
-+}
-+
-+static inline void tg3_cond_int(struct tg3 *tp)
-+{
-+	if (tp->hw_status->status & SD_STATUS_UPDATED)
-+		tw32(GRC_LOCAL_CTRL, tp->grc_local_ctrl | GRC_LCLCTRL_SETINT);
-+}
-+
-+static void tg3_enable_ints(struct tg3 *tp)
-+{
-+	tw32(TG3PCI_MISC_HOST_CTRL,
-+	     (tp->misc_host_ctrl & ~MISC_HOST_CTRL_MASK_PCI_INT));
-+	tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000000);
-+	tr32(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW);
-+
-+	tg3_cond_int(tp);
-+}
-+
-+/* tg3_restart_ints
-+ *  similar to tg3_enable_ints, but it can return without flushing the
-+ *  PIO write which reenables interrupts
-+ */
-+static void tg3_restart_ints(struct tg3 *tp)
-+{
-+	tw32(TG3PCI_MISC_HOST_CTRL,
-+		(tp->misc_host_ctrl & ~MISC_HOST_CTRL_MASK_PCI_INT));
-+	tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000000);
-+	mmiowb();
-+
-+	tg3_cond_int(tp);
-+}
-+
-+static inline void tg3_netif_stop(struct tg3 *tp)
-+{
-+	netif_poll_disable(tp->dev);
-+	netif_tx_disable(tp->dev);
-+}
-+
-+static inline void tg3_netif_start(struct tg3 *tp)
-+{
-+	netif_wake_queue(tp->dev);
-+	/* NOTE: unconditional netif_wake_queue is only appropriate
-+	 * so long as all callers are assured to have free tx slots
-+	 * (such as after tg3_init_hw)
-+	 */
-+	netif_poll_enable(tp->dev);
-+	tg3_cond_int(tp);
-+}
-+
-+static void tg3_switch_clocks(struct tg3 *tp)
-+{
-+	u32 clock_ctrl = tr32(TG3PCI_CLOCK_CTRL);
-+	u32 orig_clock_ctrl;
-+
-+	orig_clock_ctrl = clock_ctrl;
-+	clock_ctrl &= (CLOCK_CTRL_FORCE_CLKRUN |
-+		       CLOCK_CTRL_CLKRUN_OENABLE |
-+		       0x1f);
-+	tp->pci_clock_ctrl = clock_ctrl;
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+		if (orig_clock_ctrl & CLOCK_CTRL_625_CORE) {
-+			tw32_f(TG3PCI_CLOCK_CTRL,
-+			       clock_ctrl | CLOCK_CTRL_625_CORE);
-+			udelay(40);
-+		}
-+	} else if ((orig_clock_ctrl & CLOCK_CTRL_44MHZ_CORE) != 0) {
-+		tw32_f(TG3PCI_CLOCK_CTRL,
-+		     clock_ctrl |
-+		     (CLOCK_CTRL_44MHZ_CORE | CLOCK_CTRL_ALTCLK));
-+		udelay(40);
-+		tw32_f(TG3PCI_CLOCK_CTRL,
-+		     clock_ctrl | (CLOCK_CTRL_ALTCLK));
-+		udelay(40);
-+	}
-+	tw32_f(TG3PCI_CLOCK_CTRL, clock_ctrl);
-+	udelay(40);
-+}
-+
-+#define PHY_BUSY_LOOPS	5000
-+
-+static int tg3_readphy(struct tg3 *tp, int reg, u32 *val)
-+{
-+	u32 frame_val;
-+	int loops, ret;
-+
-+	if ((tp->mi_mode & MAC_MI_MODE_AUTO_POLL) != 0) {
-+		tw32_f(MAC_MI_MODE,
-+		     (tp->mi_mode & ~MAC_MI_MODE_AUTO_POLL));
-+		udelay(80);
-+	}
-+
-+	*val = 0xffffffff;
-+
-+	frame_val  = ((PHY_ADDR << MI_COM_PHY_ADDR_SHIFT) &
-+		      MI_COM_PHY_ADDR_MASK);
-+	frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
-+		      MI_COM_REG_ADDR_MASK);
-+	frame_val |= (MI_COM_CMD_READ | MI_COM_START);
-+	
-+	tw32_f(MAC_MI_COM, frame_val);
-+
-+	loops = PHY_BUSY_LOOPS;
-+	while (loops-- > 0) {
-+		udelay(10);
-+		frame_val = tr32(MAC_MI_COM);
-+
-+		if ((frame_val & MI_COM_BUSY) == 0) {
-+			udelay(5);
-+			frame_val = tr32(MAC_MI_COM);
-+			break;
-+		}
-+	}
-+
-+	ret = -EBUSY;
-+	if (loops > 0) {
-+		*val = frame_val & MI_COM_DATA_MASK;
-+		ret = 0;
-+	}
-+
-+	if ((tp->mi_mode & MAC_MI_MODE_AUTO_POLL) != 0) {
-+		tw32_f(MAC_MI_MODE, tp->mi_mode);
-+		udelay(80);
-+	}
-+
-+	return ret;
-+}
-+
-+static int tg3_writephy(struct tg3 *tp, int reg, u32 val)
-+{
-+	u32 frame_val;
-+	int loops, ret;
-+
-+	if ((tp->mi_mode & MAC_MI_MODE_AUTO_POLL) != 0) {
-+		tw32_f(MAC_MI_MODE,
-+		     (tp->mi_mode & ~MAC_MI_MODE_AUTO_POLL));
-+		udelay(80);
-+	}
-+
-+	frame_val  = ((PHY_ADDR << MI_COM_PHY_ADDR_SHIFT) &
-+		      MI_COM_PHY_ADDR_MASK);
-+	frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
-+		      MI_COM_REG_ADDR_MASK);
-+	frame_val |= (val & MI_COM_DATA_MASK);
-+	frame_val |= (MI_COM_CMD_WRITE | MI_COM_START);
-+	
-+	tw32_f(MAC_MI_COM, frame_val);
-+
-+	loops = PHY_BUSY_LOOPS;
-+	while (loops-- > 0) {
-+		udelay(10);
-+		frame_val = tr32(MAC_MI_COM);
-+		if ((frame_val & MI_COM_BUSY) == 0) {
-+			udelay(5);
-+			frame_val = tr32(MAC_MI_COM);
-+			break;
-+		}
-+	}
-+
-+	ret = -EBUSY;
-+	if (loops > 0)
-+		ret = 0;
-+
-+	if ((tp->mi_mode & MAC_MI_MODE_AUTO_POLL) != 0) {
-+		tw32_f(MAC_MI_MODE, tp->mi_mode);
-+		udelay(80);
-+	}
-+
-+	return ret;
-+}
-+
-+static void tg3_phy_set_wirespeed(struct tg3 *tp)
-+{
-+	u32 val;
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_NO_ETH_WIRE_SPEED)
-+		return;
-+
-+	tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x7007);
-+	tg3_readphy(tp, MII_TG3_AUX_CTRL, &val);
-+	tg3_writephy(tp, MII_TG3_AUX_CTRL, (val | (1 << 15) | (1 << 4)));
-+}
-+
-+static int tg3_bmcr_reset(struct tg3 *tp)
-+{
-+	u32 phy_control;
-+	int limit, err;
-+
-+	/* OK, reset it, and poll the BMCR_RESET bit until it
-+	 * clears or we time out.
-+	 */
-+	phy_control = BMCR_RESET;
-+	err = tg3_writephy(tp, MII_BMCR, phy_control);
-+	if (err != 0)
-+		return -EBUSY;
-+
-+	limit = 5000;
-+	while (limit--) {
-+		err = tg3_readphy(tp, MII_BMCR, &phy_control);
-+		if (err != 0)
-+			return -EBUSY;
-+
-+		if ((phy_control & BMCR_RESET) == 0) {
-+			udelay(40);
-+			break;
-+		}
-+		udelay(10);
-+	}
-+	if (limit <= 0)
-+		return -EBUSY;
-+
-+	return 0;
-+}
-+
-+static int tg3_wait_macro_done(struct tg3 *tp)
-+{
-+	int limit = 100;
-+
-+	while (limit--) {
-+		u32 tmp32;
-+
-+		tg3_readphy(tp, 0x16, &tmp32);
-+		if ((tmp32 & 0x1000) == 0)
-+			break;
-+	}
-+	if (limit <= 0)
-+		return -EBUSY;
-+
-+	return 0;
-+}
-+
-+static int tg3_phy_write_and_check_testpat(struct tg3 *tp, int *resetp)
-+{
-+	static const u32 test_pat[4][6] = {
-+	{ 0x00005555, 0x00000005, 0x00002aaa, 0x0000000a, 0x00003456, 0x00000003 },
-+	{ 0x00002aaa, 0x0000000a, 0x00003333, 0x00000003, 0x0000789a, 0x00000005 },
-+	{ 0x00005a5a, 0x00000005, 0x00002a6a, 0x0000000a, 0x00001bcd, 0x00000003 },
-+	{ 0x00002a5a, 0x0000000a, 0x000033c3, 0x00000003, 0x00002ef1, 0x00000005 }
-+	};
-+	int chan;
-+
-+	for (chan = 0; chan < 4; chan++) {
-+		int i;
-+
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
-+			     (chan * 0x2000) | 0x0200);
-+		tg3_writephy(tp, 0x16, 0x0002);
-+
-+		for (i = 0; i < 6; i++)
-+			tg3_writephy(tp, MII_TG3_DSP_RW_PORT,
-+				     test_pat[chan][i]);
-+
-+		tg3_writephy(tp, 0x16, 0x0202);
-+		if (tg3_wait_macro_done(tp)) {
-+			*resetp = 1;
-+			return -EBUSY;
-+		}
-+
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
-+			     (chan * 0x2000) | 0x0200);
-+		tg3_writephy(tp, 0x16, 0x0082);
-+		if (tg3_wait_macro_done(tp)) {
-+			*resetp = 1;
-+			return -EBUSY;
-+		}
-+
-+		tg3_writephy(tp, 0x16, 0x0802);
-+		if (tg3_wait_macro_done(tp)) {
-+			*resetp = 1;
-+			return -EBUSY;
-+		}
-+
-+		for (i = 0; i < 6; i += 2) {
-+			u32 low, high;
-+
-+			tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &low);
-+			tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &high);
-+			if (tg3_wait_macro_done(tp)) {
-+				*resetp = 1;
-+				return -EBUSY;
-+			}
-+			low &= 0x7fff;
-+			high &= 0x000f;
-+			if (low != test_pat[chan][i] ||
-+			    high != test_pat[chan][i+1]) {
-+				tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000b);
-+				tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x4001);
-+				tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x4005);
-+
-+				return -EBUSY;
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int tg3_phy_reset_chanpat(struct tg3 *tp)
-+{
-+	int chan;
-+
-+	for (chan = 0; chan < 4; chan++) {
-+		int i;
-+
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
-+			     (chan * 0x2000) | 0x0200);
-+		tg3_writephy(tp, 0x16, 0x0002);
-+		for (i = 0; i < 6; i++)
-+			tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x000);
-+		tg3_writephy(tp, 0x16, 0x0202);
-+		if (tg3_wait_macro_done(tp))
-+			return -EBUSY;
-+	}
-+
-+	return 0;
-+}
-+
-+static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
-+{
-+	u32 reg32, phy9_orig;
-+	int retries, do_phy_reset, err;
-+
-+	retries = 10;
-+	do_phy_reset = 1;
-+	do {
-+		if (do_phy_reset) {
-+			err = tg3_bmcr_reset(tp);
-+			if (err)
-+				return err;
-+			do_phy_reset = 0;
-+		}
-+
-+		/* Disable transmitter and interrupt.  */
-+		tg3_readphy(tp, MII_TG3_EXT_CTRL, &reg32);
-+		reg32 |= 0x3000;
-+		tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
-+
-+		/* Set full-duplex, 1000 mbps.  */
-+		tg3_writephy(tp, MII_BMCR,
-+			     BMCR_FULLDPLX | TG3_BMCR_SPEED1000);
-+
-+		/* Set to master mode.  */
-+		tg3_readphy(tp, MII_TG3_CTRL, &phy9_orig);
-+		tg3_writephy(tp, MII_TG3_CTRL,
-+			     (MII_TG3_CTRL_AS_MASTER |
-+			      MII_TG3_CTRL_ENABLE_AS_MASTER));
-+
-+		/* Enable SM_DSP_CLOCK and 6dB.  */
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
-+
-+		/* Block the PHY control access.  */
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8005);
-+		tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0800);
-+
-+		err = tg3_phy_write_and_check_testpat(tp, &do_phy_reset);
-+		if (!err)
-+			break;
-+	} while (--retries);
-+
-+	err = tg3_phy_reset_chanpat(tp);
-+	if (err)
-+		return err;
-+
-+	tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8005);
-+	tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0000);
-+
-+	tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8200);
-+	tg3_writephy(tp, 0x16, 0x0000);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
-+		/* Set Extended packet length bit for jumbo frames */
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x4400);
-+	}
-+	else {
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0400);
-+	}
-+
-+	tg3_writephy(tp, MII_TG3_CTRL, phy9_orig);
-+
-+	tg3_readphy(tp, MII_TG3_EXT_CTRL, &reg32);
-+	reg32 &= ~0x3000;
-+	tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
-+
-+	return err;
-+}
-+
-+/* This will reset the tigon3 PHY if there is no valid
-+ * link unless the FORCE argument is non-zero.
-+ */
-+static int tg3_phy_reset(struct tg3 *tp)
-+{
-+	u32 phy_status;
-+	int err;
-+
-+	err  = tg3_readphy(tp, MII_BMSR, &phy_status);
-+	err |= tg3_readphy(tp, MII_BMSR, &phy_status);
-+	if (err != 0)
-+		return -EBUSY;
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
-+		err = tg3_phy_reset_5703_4_5(tp);
-+		if (err)
-+			return err;
-+		goto out;
-+	}
-+
-+	err = tg3_bmcr_reset(tp);
-+	if (err)
-+		return err;
-+
-+out:
-+	if (tp->tg3_flags2 & TG3_FLG2_PHY_ADC_BUG) {
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x201f);
-+		tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x2aaa);
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a);
-+		tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0323);
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0400);
-+	}
-+	if (tp->tg3_flags2 & TG3_FLG2_PHY_5704_A0_BUG) {
-+		tg3_writephy(tp, 0x1c, 0x8d68);
-+		tg3_writephy(tp, 0x1c, 0x8d68);
-+	}
-+	if (tp->tg3_flags2 & TG3_FLG2_PHY_BER_BUG) {
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a);
-+		tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x310b);
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x201f);
-+		tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x9506);
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x401f);
-+		tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x14e2);
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0400);
-+	}
-+	/* Set Extended packet length bit (bit 14) on all chips that */
-+	/* support jumbo frames */
-+	if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401) {
-+		/* Cannot do read-modify-write on 5401 */
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x4c20);
-+	} else if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
-+		   GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750) {
-+		u32 phy_reg;
-+
-+		/* Set bit 14 with read-modify-write to preserve other bits */
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0007);
-+		tg3_readphy(tp, MII_TG3_AUX_CTRL, &phy_reg);
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, phy_reg | 0x4000);
-+	}
-+	tg3_phy_set_wirespeed(tp);
-+	return 0;
-+}
-+
-+static void tg3_frob_aux_power(struct tg3 *tp)
-+{
-+	struct tg3 *tp_peer = tp;
-+
-+	if ((tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) != 0)
-+		return;
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
-+		tp_peer = pci_get_drvdata(tp->pdev_peer);
-+		if (!tp_peer)
-+			BUG();
-+	}
-+
-+
-+	if ((tp->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0 ||
-+	    (tp_peer->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0) {
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
-+		    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) {
-+			tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-+			     (GRC_LCLCTRL_GPIO_OE0 |
-+			      GRC_LCLCTRL_GPIO_OE1 |
-+			      GRC_LCLCTRL_GPIO_OE2 |
-+			      GRC_LCLCTRL_GPIO_OUTPUT0 |
-+			      GRC_LCLCTRL_GPIO_OUTPUT1));
-+			udelay(100);
-+		} else {
-+			int no_gpio2;
-+			u32 grc_local_ctrl;
-+
-+			if (tp_peer != tp &&
-+			    (tp_peer->tg3_flags & TG3_FLAG_INIT_COMPLETE) != 0)
-+				return;
-+
-+			/* On 5753 and variants, GPIO2 cannot be used. */
-+			no_gpio2 = (tp->nic_sram_data_cfg &
-+				    NIC_SRAM_DATA_CFG_NO_GPIO2) != 0;
-+
-+			grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 |
-+					 GRC_LCLCTRL_GPIO_OE1 |
-+					 GRC_LCLCTRL_GPIO_OE2 |
-+					 GRC_LCLCTRL_GPIO_OUTPUT1 |
-+					 GRC_LCLCTRL_GPIO_OUTPUT2;
-+			if (no_gpio2) {
-+				grc_local_ctrl &= ~(GRC_LCLCTRL_GPIO_OE2 |
-+						    GRC_LCLCTRL_GPIO_OUTPUT2);
-+			}
-+			tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-+			       grc_local_ctrl);
-+			udelay(100);
-+
-+			grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 |
-+					 GRC_LCLCTRL_GPIO_OE1 |
-+					 GRC_LCLCTRL_GPIO_OE2 |
-+					 GRC_LCLCTRL_GPIO_OUTPUT0 |
-+					 GRC_LCLCTRL_GPIO_OUTPUT1 |
-+					 GRC_LCLCTRL_GPIO_OUTPUT2;
-+			if (no_gpio2) {
-+				grc_local_ctrl &= ~(GRC_LCLCTRL_GPIO_OE2 |
-+						    GRC_LCLCTRL_GPIO_OUTPUT2);
-+			}
-+			tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-+			       grc_local_ctrl);
-+			udelay(100);
-+
-+			grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 |
-+					 GRC_LCLCTRL_GPIO_OE1 |
-+					 GRC_LCLCTRL_GPIO_OE2 |
-+					 GRC_LCLCTRL_GPIO_OUTPUT0 |
-+					 GRC_LCLCTRL_GPIO_OUTPUT1;
-+			if (!no_gpio2) {
-+				tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-+				       grc_local_ctrl);
-+				udelay(100);
-+			}
-+		}
-+	} else {
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700 &&
-+		    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) {
-+			if (tp_peer != tp &&
-+			    (tp_peer->tg3_flags & TG3_FLAG_INIT_COMPLETE) != 0)
-+				return;
-+
-+			tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-+			     (GRC_LCLCTRL_GPIO_OE1 |
-+			      GRC_LCLCTRL_GPIO_OUTPUT1));
-+			udelay(100);
-+
-+			tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-+			     (GRC_LCLCTRL_GPIO_OE1));
-+			udelay(100);
-+
-+			tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
-+			     (GRC_LCLCTRL_GPIO_OE1 |
-+			      GRC_LCLCTRL_GPIO_OUTPUT1));
-+			udelay(100);
-+		}
-+	}
-+}
-+
-+static int tg3_setup_phy(struct tg3 *, int);
-+
-+#define RESET_KIND_SHUTDOWN	0
-+#define RESET_KIND_INIT		1
-+#define RESET_KIND_SUSPEND	2
-+
-+static void tg3_write_sig_post_reset(struct tg3 *, int);
-+
-+static int tg3_set_power_state(struct tg3 *tp, int state)
-+{
-+	u32 misc_host_ctrl;
-+	u16 power_control, power_caps;
-+	int pm = tp->pm_cap;
-+
-+	/* Make sure register accesses (indirect or otherwise)
-+	 * will function correctly.
-+	 */
-+	pci_write_config_dword(tp->pdev,
-+			       TG3PCI_MISC_HOST_CTRL,
-+			       tp->misc_host_ctrl);
-+
-+	pci_read_config_word(tp->pdev,
-+			     pm + PCI_PM_CTRL,
-+			     &power_control);
-+	power_control |= PCI_PM_CTRL_PME_STATUS;
-+	power_control &= ~(PCI_PM_CTRL_STATE_MASK);
-+	switch (state) {
-+	case 0:
-+		power_control |= 0;
-+		pci_write_config_word(tp->pdev,
-+				      pm + PCI_PM_CTRL,
-+				      power_control);
-+		tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
-+		udelay(100);
-+
-+		return 0;
-+
-+	case 1:
-+		power_control |= 1;
-+		break;
-+
-+	case 2:
-+		power_control |= 2;
-+		break;
-+
-+	case 3:
-+		power_control |= 3;
-+		break;
-+
-+	default:
-+		printk(KERN_WARNING PFX "%s: Invalid power state (%d) "
-+		       "requested.\n",
-+		       tp->dev->name, state);
-+		return -EINVAL;
-+	};
-+
-+	power_control |= PCI_PM_CTRL_PME_ENABLE;
-+
-+	misc_host_ctrl = tr32(TG3PCI_MISC_HOST_CTRL);
-+	tw32(TG3PCI_MISC_HOST_CTRL,
-+	     misc_host_ctrl | MISC_HOST_CTRL_MASK_PCI_INT);
-+
-+	if (tp->link_config.phy_is_low_power == 0) {
-+		tp->link_config.phy_is_low_power = 1;
-+		tp->link_config.orig_speed = tp->link_config.speed;
-+		tp->link_config.orig_duplex = tp->link_config.duplex;
-+		tp->link_config.orig_autoneg = tp->link_config.autoneg;
-+	}
-+
-+	if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
-+		tp->link_config.speed = SPEED_10;
-+		tp->link_config.duplex = DUPLEX_HALF;
-+		tp->link_config.autoneg = AUTONEG_ENABLE;
-+		tg3_setup_phy(tp, 0);
-+	}
-+
-+	pci_read_config_word(tp->pdev, pm + PCI_PM_PMC, &power_caps);
-+
-+	if (tp->tg3_flags & TG3_FLAG_WOL_ENABLE) {
-+		u32 mac_mode;
-+
-+		if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
-+			tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x5a);
-+			udelay(40);
-+
-+			mac_mode = MAC_MODE_PORT_MODE_MII;
-+
-+			if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700 ||
-+			    !(tp->tg3_flags & TG3_FLAG_WOL_SPEED_100MB))
-+				mac_mode |= MAC_MODE_LINK_POLARITY;
-+		} else {
-+			mac_mode = MAC_MODE_PORT_MODE_TBI;
-+		}
-+
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750)
-+			tw32(MAC_LED_CTRL, tp->led_ctrl);
-+
-+		if (((power_caps & PCI_PM_CAP_PME_D3cold) &&
-+		     (tp->tg3_flags & TG3_FLAG_WOL_ENABLE)))
-+			mac_mode |= MAC_MODE_MAGIC_PKT_ENABLE;
-+
-+		tw32_f(MAC_MODE, mac_mode);
-+		udelay(100);
-+
-+		tw32_f(MAC_RX_MODE, RX_MODE_ENABLE);
-+		udelay(10);
-+	}
-+
-+	if (!(tp->tg3_flags & TG3_FLAG_WOL_SPEED_100MB) &&
-+	    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
-+	     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)) {
-+		u32 base_val;
-+
-+		base_val = tp->pci_clock_ctrl;
-+		base_val |= (CLOCK_CTRL_RXCLK_DISABLE |
-+			     CLOCK_CTRL_TXCLK_DISABLE);
-+
-+		tw32_f(TG3PCI_CLOCK_CTRL, base_val |
-+		     CLOCK_CTRL_ALTCLK |
-+		     CLOCK_CTRL_PWRDOWN_PLL133);
-+		udelay(40);
-+	} else if (!((GET_ASIC_REV(tp->pci_chip_rev_id) == 5750) &&
-+		     (tp->tg3_flags & TG3_FLAG_ENABLE_ASF))) {
-+		u32 newbits1, newbits2;
-+
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
-+		    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) {
-+			newbits1 = (CLOCK_CTRL_RXCLK_DISABLE |
-+				    CLOCK_CTRL_TXCLK_DISABLE |
-+				    CLOCK_CTRL_ALTCLK);
-+			newbits2 = newbits1 | CLOCK_CTRL_44MHZ_CORE;
-+		} else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
-+			   GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+			newbits1 = CLOCK_CTRL_625_CORE;
-+			newbits2 = newbits1 | CLOCK_CTRL_ALTCLK;
-+		} else {
-+			newbits1 = CLOCK_CTRL_ALTCLK;
-+			newbits2 = newbits1 | CLOCK_CTRL_44MHZ_CORE;
-+		}
-+
-+		tw32_f(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl | newbits1);
-+		udelay(40);
-+
-+		tw32_f(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl | newbits2);
-+		udelay(40);
-+
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
-+		    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750) {
-+			u32 newbits3;
-+
-+			if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
-+			    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) {
-+				newbits3 = (CLOCK_CTRL_RXCLK_DISABLE |
-+					    CLOCK_CTRL_TXCLK_DISABLE |
-+					    CLOCK_CTRL_44MHZ_CORE);
-+			} else {
-+				newbits3 = CLOCK_CTRL_44MHZ_CORE;
-+			}
-+
-+			tw32_f(TG3PCI_CLOCK_CTRL,
-+					 tp->pci_clock_ctrl | newbits3);
-+			udelay(40);
-+		}
-+	}
-+
-+	tg3_frob_aux_power(tp);
-+
-+	/* Finally, set the new power state. */
-+	pci_write_config_word(tp->pdev, pm + PCI_PM_CTRL, power_control);
-+
-+	tg3_write_sig_post_reset(tp, RESET_KIND_SHUTDOWN);
-+
-+	return 0;
-+}
-+
-+static void tg3_link_report(struct tg3 *tp)
-+{
-+	if (!netif_carrier_ok(tp->dev)) {
-+		printk(KERN_INFO PFX "%s: Link is down.\n", tp->dev->name);
-+	} else {
-+		printk(KERN_INFO PFX "%s: Link is up at %d Mbps, %s duplex.\n",
-+		       tp->dev->name,
-+		       (tp->link_config.active_speed == SPEED_1000 ?
-+			1000 :
-+			(tp->link_config.active_speed == SPEED_100 ?
-+			 100 : 10)),
-+		       (tp->link_config.active_duplex == DUPLEX_FULL ?
-+			"full" : "half"));
-+
-+		printk(KERN_INFO PFX "%s: Flow control is %s for TX and "
-+		       "%s for RX.\n",
-+		       tp->dev->name,
-+		       (tp->tg3_flags & TG3_FLAG_TX_PAUSE) ? "on" : "off",
-+		       (tp->tg3_flags & TG3_FLAG_RX_PAUSE) ? "on" : "off");
-+	}
-+}
-+
-+static void tg3_setup_flow_control(struct tg3 *tp, u32 local_adv, u32 remote_adv)
-+{
-+	u32 new_tg3_flags = 0;
-+	u32 old_rx_mode = tp->rx_mode;
-+	u32 old_tx_mode = tp->tx_mode;
-+
-+	if (tp->tg3_flags & TG3_FLAG_PAUSE_AUTONEG) {
-+		if (local_adv & ADVERTISE_PAUSE_CAP) {
-+			if (local_adv & ADVERTISE_PAUSE_ASYM) {
-+				if (remote_adv & LPA_PAUSE_CAP)
-+					new_tg3_flags |=
-+						(TG3_FLAG_RX_PAUSE |
-+					 	TG3_FLAG_TX_PAUSE);
-+				else if (remote_adv & LPA_PAUSE_ASYM)
-+					new_tg3_flags |=
-+						(TG3_FLAG_RX_PAUSE);
-+			} else {
-+				if (remote_adv & LPA_PAUSE_CAP)
-+					new_tg3_flags |=
-+						(TG3_FLAG_RX_PAUSE |
-+					 	TG3_FLAG_TX_PAUSE);
-+			}
-+		} else if (local_adv & ADVERTISE_PAUSE_ASYM) {
-+			if ((remote_adv & LPA_PAUSE_CAP) &&
-+		    	(remote_adv & LPA_PAUSE_ASYM))
-+				new_tg3_flags |= TG3_FLAG_TX_PAUSE;
-+		}
-+
-+		tp->tg3_flags &= ~(TG3_FLAG_RX_PAUSE | TG3_FLAG_TX_PAUSE);
-+		tp->tg3_flags |= new_tg3_flags;
-+	} else {
-+		new_tg3_flags = tp->tg3_flags;
-+	}
-+
-+	if (new_tg3_flags & TG3_FLAG_RX_PAUSE)
-+		tp->rx_mode |= RX_MODE_FLOW_CTRL_ENABLE;
-+	else
-+		tp->rx_mode &= ~RX_MODE_FLOW_CTRL_ENABLE;
-+
-+	if (old_rx_mode != tp->rx_mode) {
-+		tw32_f(MAC_RX_MODE, tp->rx_mode);
-+	}
-+	
-+	if (new_tg3_flags & TG3_FLAG_TX_PAUSE)
-+		tp->tx_mode |= TX_MODE_FLOW_CTRL_ENABLE;
-+	else
-+		tp->tx_mode &= ~TX_MODE_FLOW_CTRL_ENABLE;
-+
-+	if (old_tx_mode != tp->tx_mode) {
-+		tw32_f(MAC_TX_MODE, tp->tx_mode);
-+	}
-+}
-+
-+static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8 *duplex)
-+{
-+	switch (val & MII_TG3_AUX_STAT_SPDMASK) {
-+	case MII_TG3_AUX_STAT_10HALF:
-+		*speed = SPEED_10;
-+		*duplex = DUPLEX_HALF;
-+		break;
-+
-+	case MII_TG3_AUX_STAT_10FULL:
-+		*speed = SPEED_10;
-+		*duplex = DUPLEX_FULL;
-+		break;
-+
-+	case MII_TG3_AUX_STAT_100HALF:
-+		*speed = SPEED_100;
-+		*duplex = DUPLEX_HALF;
-+		break;
-+
-+	case MII_TG3_AUX_STAT_100FULL:
-+		*speed = SPEED_100;
-+		*duplex = DUPLEX_FULL;
-+		break;
-+
-+	case MII_TG3_AUX_STAT_1000HALF:
-+		*speed = SPEED_1000;
-+		*duplex = DUPLEX_HALF;
-+		break;
-+
-+	case MII_TG3_AUX_STAT_1000FULL:
-+		*speed = SPEED_1000;
-+		*duplex = DUPLEX_FULL;
-+		break;
-+
-+	default:
-+		*speed = SPEED_INVALID;
-+		*duplex = DUPLEX_INVALID;
-+		break;
-+	};
-+}
-+
-+static int tg3_phy_copper_begin(struct tg3 *tp)
-+{
-+	u32 new_adv;
-+	int i;
-+
-+	if (tp->link_config.phy_is_low_power) {
-+		/* Entering low power mode.  Disable gigabit and
-+		 * 100baseT advertisements.
-+		 */
-+		tg3_writephy(tp, MII_TG3_CTRL, 0);
-+
-+		new_adv = (ADVERTISE_10HALF | ADVERTISE_10FULL |
-+			   ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
-+		if (tp->tg3_flags & TG3_FLAG_WOL_SPEED_100MB)
-+			new_adv |= (ADVERTISE_100HALF | ADVERTISE_100FULL);
-+
-+		tg3_writephy(tp, MII_ADVERTISE, new_adv);
-+	} else if (tp->link_config.speed == SPEED_INVALID) {
-+		tp->link_config.advertising =
-+			(ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
-+			 ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
-+			 ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full |
-+			 ADVERTISED_Autoneg | ADVERTISED_MII);
-+
-+		if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
-+			tp->link_config.advertising &=
-+				~(ADVERTISED_1000baseT_Half |
-+				  ADVERTISED_1000baseT_Full);
-+
-+		new_adv = (ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
-+		if (tp->link_config.advertising & ADVERTISED_10baseT_Half)
-+			new_adv |= ADVERTISE_10HALF;
-+		if (tp->link_config.advertising & ADVERTISED_10baseT_Full)
-+			new_adv |= ADVERTISE_10FULL;
-+		if (tp->link_config.advertising & ADVERTISED_100baseT_Half)
-+			new_adv |= ADVERTISE_100HALF;
-+		if (tp->link_config.advertising & ADVERTISED_100baseT_Full)
-+			new_adv |= ADVERTISE_100FULL;
-+		tg3_writephy(tp, MII_ADVERTISE, new_adv);
-+
-+		if (tp->link_config.advertising &
-+		    (ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full)) {
-+			new_adv = 0;
-+			if (tp->link_config.advertising & ADVERTISED_1000baseT_Half)
-+				new_adv |= MII_TG3_CTRL_ADV_1000_HALF;
-+			if (tp->link_config.advertising & ADVERTISED_1000baseT_Full)
-+				new_adv |= MII_TG3_CTRL_ADV_1000_FULL;
-+			if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY) &&
-+			    (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
-+			     tp->pci_chip_rev_id == CHIPREV_ID_5701_B0))
-+				new_adv |= (MII_TG3_CTRL_AS_MASTER |
-+					    MII_TG3_CTRL_ENABLE_AS_MASTER);
-+			tg3_writephy(tp, MII_TG3_CTRL, new_adv);
-+		} else {
-+			tg3_writephy(tp, MII_TG3_CTRL, 0);
-+		}
-+	} else {
-+		/* Asking for a specific link mode. */
-+		if (tp->link_config.speed == SPEED_1000) {
-+			new_adv = ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
-+			tg3_writephy(tp, MII_ADVERTISE, new_adv);
-+
-+			if (tp->link_config.duplex == DUPLEX_FULL)
-+				new_adv = MII_TG3_CTRL_ADV_1000_FULL;
-+			else
-+				new_adv = MII_TG3_CTRL_ADV_1000_HALF;
-+			if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
-+			    tp->pci_chip_rev_id == CHIPREV_ID_5701_B0)
-+				new_adv |= (MII_TG3_CTRL_AS_MASTER |
-+					    MII_TG3_CTRL_ENABLE_AS_MASTER);
-+			tg3_writephy(tp, MII_TG3_CTRL, new_adv);
-+		} else {
-+			tg3_writephy(tp, MII_TG3_CTRL, 0);
-+
-+			new_adv = ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP;
-+			if (tp->link_config.speed == SPEED_100) {
-+				if (tp->link_config.duplex == DUPLEX_FULL)
-+					new_adv |= ADVERTISE_100FULL;
-+				else
-+					new_adv |= ADVERTISE_100HALF;
-+			} else {
-+				if (tp->link_config.duplex == DUPLEX_FULL)
-+					new_adv |= ADVERTISE_10FULL;
-+				else
-+					new_adv |= ADVERTISE_10HALF;
-+			}
-+			tg3_writephy(tp, MII_ADVERTISE, new_adv);
-+		}
-+	}
-+
-+	if (tp->link_config.autoneg == AUTONEG_DISABLE &&
-+	    tp->link_config.speed != SPEED_INVALID) {
-+		u32 bmcr, orig_bmcr;
-+
-+		tp->link_config.active_speed = tp->link_config.speed;
-+		tp->link_config.active_duplex = tp->link_config.duplex;
-+
-+		bmcr = 0;
-+		switch (tp->link_config.speed) {
-+		default:
-+		case SPEED_10:
-+			break;
-+
-+		case SPEED_100:
-+			bmcr |= BMCR_SPEED100;
-+			break;
-+
-+		case SPEED_1000:
-+			bmcr |= TG3_BMCR_SPEED1000;
-+			break;
-+		};
-+
-+		if (tp->link_config.duplex == DUPLEX_FULL)
-+			bmcr |= BMCR_FULLDPLX;
-+
-+		tg3_readphy(tp, MII_BMCR, &orig_bmcr);
-+		if (bmcr != orig_bmcr) {
-+			tg3_writephy(tp, MII_BMCR, BMCR_LOOPBACK);
-+			for (i = 0; i < 1500; i++) {
-+				u32 tmp;
-+
-+				udelay(10);
-+				tg3_readphy(tp, MII_BMSR, &tmp);
-+				tg3_readphy(tp, MII_BMSR, &tmp);
-+				if (!(tmp & BMSR_LSTATUS)) {
-+					udelay(40);
-+					break;
-+				}
-+			}
-+			tg3_writephy(tp, MII_BMCR, bmcr);
-+			udelay(40);
-+		}
-+	} else {
-+		tg3_writephy(tp, MII_BMCR,
-+			     BMCR_ANENABLE | BMCR_ANRESTART);
-+	}
-+
-+	return 0;
-+}
-+
-+static int tg3_init_5401phy_dsp(struct tg3 *tp)
-+{
-+	int err;
-+
-+	/* Turn off tap power management. */
-+	/* Set Extended packet length bit */
-+	err  = tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x4c20);
-+
-+	err |= tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x0012);
-+	err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x1804);
-+
-+	err |= tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x0013);
-+	err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x1204);
-+
-+	err |= tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8006);
-+	err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0132);
-+
-+	err |= tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8006);
-+	err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0232);
-+
-+	err |= tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x201f);
-+	err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0a20);
-+
-+	udelay(40);
-+
-+	return err;
-+}
-+
-+static int tg3_copper_is_advertising_all(struct tg3 *tp)
-+{
-+	u32 adv_reg, all_mask;
-+
-+	tg3_readphy(tp, MII_ADVERTISE, &adv_reg);
-+	all_mask = (ADVERTISE_10HALF | ADVERTISE_10FULL |
-+		    ADVERTISE_100HALF | ADVERTISE_100FULL);
-+	if ((adv_reg & all_mask) != all_mask)
-+		return 0;
-+	if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY)) {
-+		u32 tg3_ctrl;
-+
-+		tg3_readphy(tp, MII_TG3_CTRL, &tg3_ctrl);
-+		all_mask = (MII_TG3_CTRL_ADV_1000_HALF |
-+			    MII_TG3_CTRL_ADV_1000_FULL);
-+		if ((tg3_ctrl & all_mask) != all_mask)
-+			return 0;
-+	}
-+	return 1;
-+}
-+
-+static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset)
-+{
-+	int current_link_up;
-+	u32 bmsr, dummy;
-+	u16 current_speed;
-+	u8 current_duplex;
-+	int i, err;
-+
-+	tw32(MAC_EVENT, 0);
-+
-+	tw32_f(MAC_STATUS,
-+	     (MAC_STATUS_SYNC_CHANGED |
-+	      MAC_STATUS_CFG_CHANGED |
-+	      MAC_STATUS_MI_COMPLETION |
-+	      MAC_STATUS_LNKSTATE_CHANGED));
-+	udelay(40);
-+
-+	tp->mi_mode = MAC_MI_MODE_BASE;
-+	tw32_f(MAC_MI_MODE, tp->mi_mode);
-+	udelay(80);
-+
-+	tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x02);
-+
-+	/* Some third-party PHYs need to be reset on link going
-+	 * down.
-+	 */
-+	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 ||
-+	     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
-+	     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) &&
-+	    netif_carrier_ok(tp->dev)) {
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+		if (!(bmsr & BMSR_LSTATUS))
-+			force_reset = 1;
-+	}
-+	if (force_reset)
-+		tg3_phy_reset(tp);
-+
-+	if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401) {
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+
-+		if (!(tp->tg3_flags & TG3_FLAG_INIT_COMPLETE))
-+			bmsr = 0;
-+
-+		if (!(bmsr & BMSR_LSTATUS)) {
-+			err = tg3_init_5401phy_dsp(tp);
-+			if (err)
-+				return err;
-+
-+			tg3_readphy(tp, MII_BMSR, &bmsr);
-+			for (i = 0; i < 1000; i++) {
-+				udelay(10);
-+				tg3_readphy(tp, MII_BMSR, &bmsr);
-+				if (bmsr & BMSR_LSTATUS) {
-+					udelay(40);
-+					break;
-+				}
-+			}
-+
-+			if ((tp->phy_id & PHY_ID_REV_MASK) == PHY_REV_BCM5401_B0 &&
-+			    !(bmsr & BMSR_LSTATUS) &&
-+			    tp->link_config.active_speed == SPEED_1000) {
-+				err = tg3_phy_reset(tp);
-+				if (!err)
-+					err = tg3_init_5401phy_dsp(tp);
-+				if (err)
-+					return err;
-+			}
-+		}
-+	} else if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
-+		   tp->pci_chip_rev_id == CHIPREV_ID_5701_B0) {
-+		/* 5701 {A0,B0} CRC bug workaround */
-+		tg3_writephy(tp, 0x15, 0x0a75);
-+		tg3_writephy(tp, 0x1c, 0x8c68);
-+		tg3_writephy(tp, 0x1c, 0x8d68);
-+		tg3_writephy(tp, 0x1c, 0x8c68);
-+	}
-+
-+	/* Clear pending interrupts... */
-+	tg3_readphy(tp, MII_TG3_ISTAT, &dummy);
-+	tg3_readphy(tp, MII_TG3_ISTAT, &dummy);
-+
-+	if (tp->tg3_flags & TG3_FLAG_USE_MI_INTERRUPT)
-+		tg3_writephy(tp, MII_TG3_IMASK, ~MII_TG3_INT_LINKCHG);
-+	else
-+		tg3_writephy(tp, MII_TG3_IMASK, ~0);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) {
-+		if (tp->led_ctrl == LED_CTRL_MODE_PHY_1)
-+			tg3_writephy(tp, MII_TG3_EXT_CTRL,
-+				     MII_TG3_EXT_CTRL_LNK3_LED_MODE);
-+		else
-+			tg3_writephy(tp, MII_TG3_EXT_CTRL, 0);
-+	}
-+
-+	current_link_up = 0;
-+	current_speed = SPEED_INVALID;
-+	current_duplex = DUPLEX_INVALID;
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_CAPACITIVE_COUPLING) {
-+		u32 val;
-+
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x4007);
-+		tg3_readphy(tp, MII_TG3_AUX_CTRL, &val);
-+		if (!(val & (1 << 10))) {
-+			val |= (1 << 10);
-+			tg3_writephy(tp, MII_TG3_AUX_CTRL, val);
-+			goto relink;
-+		}
-+	}
-+
-+	bmsr = 0;
-+	for (i = 0; i < 100; i++) {
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+		if (bmsr & BMSR_LSTATUS)
-+			break;
-+		udelay(40);
-+	}
-+
-+	if (bmsr & BMSR_LSTATUS) {
-+		u32 aux_stat, bmcr;
-+
-+		tg3_readphy(tp, MII_TG3_AUX_STAT, &aux_stat);
-+		for (i = 0; i < 2000; i++) {
-+			udelay(10);
-+			tg3_readphy(tp, MII_TG3_AUX_STAT, &aux_stat);
-+			if (aux_stat)
-+				break;
-+		}
-+
-+		tg3_aux_stat_to_speed_duplex(tp, aux_stat,
-+					     &current_speed,
-+					     &current_duplex);
-+
-+		bmcr = 0;
-+		for (i = 0; i < 200; i++) {
-+			tg3_readphy(tp, MII_BMCR, &bmcr);
-+			tg3_readphy(tp, MII_BMCR, &bmcr);
-+			if (bmcr && bmcr != 0x7fff)
-+				break;
-+			udelay(10);
-+		}
-+
-+		if (tp->link_config.autoneg == AUTONEG_ENABLE) {
-+			if (bmcr & BMCR_ANENABLE) {
-+				current_link_up = 1;
-+
-+				/* Force autoneg restart if we are exiting
-+				 * low power mode.
-+				 */
-+				if (!tg3_copper_is_advertising_all(tp))
-+					current_link_up = 0;
-+			} else {
-+				current_link_up = 0;
-+			}
-+		} else {
-+			if (!(bmcr & BMCR_ANENABLE) &&
-+			    tp->link_config.speed == current_speed &&
-+			    tp->link_config.duplex == current_duplex) {
-+				current_link_up = 1;
-+			} else {
-+				current_link_up = 0;
-+			}
-+		}
-+
-+		tp->link_config.active_speed = current_speed;
-+		tp->link_config.active_duplex = current_duplex;
-+	}
-+
-+	if (current_link_up == 1 &&
-+	    (tp->link_config.active_duplex == DUPLEX_FULL) &&
-+	    (tp->link_config.autoneg == AUTONEG_ENABLE)) {
-+		u32 local_adv, remote_adv;
-+
-+		tg3_readphy(tp, MII_ADVERTISE, &local_adv);
-+		local_adv &= (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
-+
-+		tg3_readphy(tp, MII_LPA, &remote_adv);
-+		remote_adv &= (LPA_PAUSE_CAP | LPA_PAUSE_ASYM);
-+
-+		/* If we are not advertising full pause capability,
-+		 * something is wrong.  Bring the link down and reconfigure.
-+		 */
-+		if (local_adv != ADVERTISE_PAUSE_CAP) {
-+			current_link_up = 0;
-+		} else {
-+			tg3_setup_flow_control(tp, local_adv, remote_adv);
-+		}
-+	}
-+relink:
-+	if (current_link_up == 0) {
-+		u32 tmp;
-+
-+		tg3_phy_copper_begin(tp);
-+
-+		tg3_readphy(tp, MII_BMSR, &tmp);
-+		tg3_readphy(tp, MII_BMSR, &tmp);
-+		if (tmp & BMSR_LSTATUS)
-+			current_link_up = 1;
-+	}
-+
-+	tp->mac_mode &= ~MAC_MODE_PORT_MODE_MASK;
-+	if (current_link_up == 1) {
-+		if (tp->link_config.active_speed == SPEED_100 ||
-+		    tp->link_config.active_speed == SPEED_10)
-+			tp->mac_mode |= MAC_MODE_PORT_MODE_MII;
-+		else
-+			tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
-+	} else
-+		tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
-+
-+	tp->mac_mode &= ~MAC_MODE_HALF_DUPLEX;
-+	if (tp->link_config.active_duplex == DUPLEX_HALF)
-+		tp->mac_mode |= MAC_MODE_HALF_DUPLEX;
-+
-+	tp->mac_mode &= ~MAC_MODE_LINK_POLARITY;
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700) {
-+		if ((tp->led_ctrl == LED_CTRL_MODE_PHY_2) ||
-+		    (current_link_up == 1 &&
-+		     tp->link_config.active_speed == SPEED_10))
-+			tp->mac_mode |= MAC_MODE_LINK_POLARITY;
-+	} else {
-+		if (current_link_up == 1)
-+			tp->mac_mode |= MAC_MODE_LINK_POLARITY;
-+	}
-+
-+	/* ??? Without this setting Netgear GA302T PHY does not
-+	 * ??? send/receive packets...
-+	 */
-+	if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5411 &&
-+	    tp->pci_chip_rev_id == CHIPREV_ID_5700_ALTIMA) {
-+		tp->mi_mode |= MAC_MI_MODE_AUTO_POLL;
-+		tw32_f(MAC_MI_MODE, tp->mi_mode);
-+		udelay(80);
-+	}
-+
-+	tw32_f(MAC_MODE, tp->mac_mode);
-+	udelay(40);
-+
-+	if (tp->tg3_flags & TG3_FLAG_USE_LINKCHG_REG) {
-+		/* Polled via timer. */
-+		tw32_f(MAC_EVENT, 0);
-+	} else {
-+		tw32_f(MAC_EVENT, MAC_EVENT_LNKSTATE_CHANGED);
-+	}
-+	udelay(40);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 &&
-+	    current_link_up == 1 &&
-+	    tp->link_config.active_speed == SPEED_1000 &&
-+	    ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ||
-+	     (tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED))) {
-+		udelay(120);
-+		tw32_f(MAC_STATUS,
-+		     (MAC_STATUS_SYNC_CHANGED |
-+		      MAC_STATUS_CFG_CHANGED));
-+		udelay(40);
-+		tg3_write_mem(tp,
-+			      NIC_SRAM_FIRMWARE_MBOX,
-+			      NIC_SRAM_FIRMWARE_MBOX_MAGIC2);
-+	}
-+
-+	if (current_link_up != netif_carrier_ok(tp->dev)) {
-+		if (current_link_up)
-+			netif_carrier_on(tp->dev);
-+		else
-+			netif_carrier_off(tp->dev);
-+		tg3_link_report(tp);
-+	}
-+
-+	return 0;
-+}
-+
-+struct tg3_fiber_aneginfo {
-+	int state;
-+#define ANEG_STATE_UNKNOWN		0
-+#define ANEG_STATE_AN_ENABLE		1
-+#define ANEG_STATE_RESTART_INIT		2
-+#define ANEG_STATE_RESTART		3
-+#define ANEG_STATE_DISABLE_LINK_OK	4
-+#define ANEG_STATE_ABILITY_DETECT_INIT	5
-+#define ANEG_STATE_ABILITY_DETECT	6
-+#define ANEG_STATE_ACK_DETECT_INIT	7
-+#define ANEG_STATE_ACK_DETECT		8
-+#define ANEG_STATE_COMPLETE_ACK_INIT	9
-+#define ANEG_STATE_COMPLETE_ACK		10
-+#define ANEG_STATE_IDLE_DETECT_INIT	11
-+#define ANEG_STATE_IDLE_DETECT		12
-+#define ANEG_STATE_LINK_OK		13
-+#define ANEG_STATE_NEXT_PAGE_WAIT_INIT	14
-+#define ANEG_STATE_NEXT_PAGE_WAIT	15
-+
-+	u32 flags;
-+#define MR_AN_ENABLE		0x00000001
-+#define MR_RESTART_AN		0x00000002
-+#define MR_AN_COMPLETE		0x00000004
-+#define MR_PAGE_RX		0x00000008
-+#define MR_NP_LOADED		0x00000010
-+#define MR_TOGGLE_TX		0x00000020
-+#define MR_LP_ADV_FULL_DUPLEX	0x00000040
-+#define MR_LP_ADV_HALF_DUPLEX	0x00000080
-+#define MR_LP_ADV_SYM_PAUSE	0x00000100
-+#define MR_LP_ADV_ASYM_PAUSE	0x00000200
-+#define MR_LP_ADV_REMOTE_FAULT1	0x00000400
-+#define MR_LP_ADV_REMOTE_FAULT2	0x00000800
-+#define MR_LP_ADV_NEXT_PAGE	0x00001000
-+#define MR_TOGGLE_RX		0x00002000
-+#define MR_NP_RX		0x00004000
-+
-+#define MR_LINK_OK		0x80000000
-+
-+	unsigned long link_time, cur_time;
-+
-+	u32 ability_match_cfg;
-+	int ability_match_count;
-+
-+	char ability_match, idle_match, ack_match;
-+
-+	u32 txconfig, rxconfig;
-+#define ANEG_CFG_NP		0x00000080
-+#define ANEG_CFG_ACK		0x00000040
-+#define ANEG_CFG_RF2		0x00000020
-+#define ANEG_CFG_RF1		0x00000010
-+#define ANEG_CFG_PS2		0x00000001
-+#define ANEG_CFG_PS1		0x00008000
-+#define ANEG_CFG_HD		0x00004000
-+#define ANEG_CFG_FD		0x00002000
-+#define ANEG_CFG_INVAL		0x00001f06
-+
-+};
-+#define ANEG_OK		0
-+#define ANEG_DONE	1
-+#define ANEG_TIMER_ENAB	2
-+#define ANEG_FAILED	-1
-+
-+#define ANEG_STATE_SETTLE_TIME	10000
-+
-+static int tg3_fiber_aneg_smachine(struct tg3 *tp,
-+				   struct tg3_fiber_aneginfo *ap)
-+{
-+	unsigned long delta;
-+	u32 rx_cfg_reg;
-+	int ret;
-+
-+	if (ap->state == ANEG_STATE_UNKNOWN) {
-+		ap->rxconfig = 0;
-+		ap->link_time = 0;
-+		ap->cur_time = 0;
-+		ap->ability_match_cfg = 0;
-+		ap->ability_match_count = 0;
-+		ap->ability_match = 0;
-+		ap->idle_match = 0;
-+		ap->ack_match = 0;
-+	}
-+	ap->cur_time++;
-+
-+	if (tr32(MAC_STATUS) & MAC_STATUS_RCVD_CFG) {
-+		rx_cfg_reg = tr32(MAC_RX_AUTO_NEG);
-+
-+		if (rx_cfg_reg != ap->ability_match_cfg) {
-+			ap->ability_match_cfg = rx_cfg_reg;
-+			ap->ability_match = 0;
-+			ap->ability_match_count = 0;
-+		} else {
-+			if (++ap->ability_match_count > 1) {
-+				ap->ability_match = 1;
-+				ap->ability_match_cfg = rx_cfg_reg;
-+			}
-+		}
-+		if (rx_cfg_reg & ANEG_CFG_ACK)
-+			ap->ack_match = 1;
-+		else
-+			ap->ack_match = 0;
-+
-+		ap->idle_match = 0;
-+	} else {
-+		ap->idle_match = 1;
-+		ap->ability_match_cfg = 0;
-+		ap->ability_match_count = 0;
-+		ap->ability_match = 0;
-+		ap->ack_match = 0;
-+
-+		rx_cfg_reg = 0;
-+	}
-+
-+	ap->rxconfig = rx_cfg_reg;
-+	ret = ANEG_OK;
-+
-+	switch(ap->state) {
-+	case ANEG_STATE_UNKNOWN:
-+		if (ap->flags & (MR_AN_ENABLE | MR_RESTART_AN))
-+			ap->state = ANEG_STATE_AN_ENABLE;
-+
-+		/* fallthru */
-+	case ANEG_STATE_AN_ENABLE:
-+		ap->flags &= ~(MR_AN_COMPLETE | MR_PAGE_RX);
-+		if (ap->flags & MR_AN_ENABLE) {
-+			ap->link_time = 0;
-+			ap->cur_time = 0;
-+			ap->ability_match_cfg = 0;
-+			ap->ability_match_count = 0;
-+			ap->ability_match = 0;
-+			ap->idle_match = 0;
-+			ap->ack_match = 0;
-+
-+			ap->state = ANEG_STATE_RESTART_INIT;
-+		} else {
-+			ap->state = ANEG_STATE_DISABLE_LINK_OK;
-+		}
-+		break;
-+
-+	case ANEG_STATE_RESTART_INIT:
-+		ap->link_time = ap->cur_time;
-+		ap->flags &= ~(MR_NP_LOADED);
-+		ap->txconfig = 0;
-+		tw32(MAC_TX_AUTO_NEG, 0);
-+		tp->mac_mode |= MAC_MODE_SEND_CONFIGS;
-+		tw32_f(MAC_MODE, tp->mac_mode);
-+		udelay(40);
-+
-+		ret = ANEG_TIMER_ENAB;
-+		ap->state = ANEG_STATE_RESTART;
-+
-+		/* fallthru */
-+	case ANEG_STATE_RESTART:
-+		delta = ap->cur_time - ap->link_time;
-+		if (delta > ANEG_STATE_SETTLE_TIME) {
-+			ap->state = ANEG_STATE_ABILITY_DETECT_INIT;
-+		} else {
-+			ret = ANEG_TIMER_ENAB;
-+		}
-+		break;
-+
-+	case ANEG_STATE_DISABLE_LINK_OK:
-+		ret = ANEG_DONE;
-+		break;
-+
-+	case ANEG_STATE_ABILITY_DETECT_INIT:
-+		ap->flags &= ~(MR_TOGGLE_TX);
-+		ap->txconfig = (ANEG_CFG_FD | ANEG_CFG_PS1);
-+		tw32(MAC_TX_AUTO_NEG, ap->txconfig);
-+		tp->mac_mode |= MAC_MODE_SEND_CONFIGS;
-+		tw32_f(MAC_MODE, tp->mac_mode);
-+		udelay(40);
-+
-+		ap->state = ANEG_STATE_ABILITY_DETECT;
-+		break;
-+
-+	case ANEG_STATE_ABILITY_DETECT:
-+		if (ap->ability_match != 0 && ap->rxconfig != 0) {
-+			ap->state = ANEG_STATE_ACK_DETECT_INIT;
-+		}
-+		break;
-+
-+	case ANEG_STATE_ACK_DETECT_INIT:
-+		ap->txconfig |= ANEG_CFG_ACK;
-+		tw32(MAC_TX_AUTO_NEG, ap->txconfig);
-+		tp->mac_mode |= MAC_MODE_SEND_CONFIGS;
-+		tw32_f(MAC_MODE, tp->mac_mode);
-+		udelay(40);
-+
-+		ap->state = ANEG_STATE_ACK_DETECT;
-+
-+		/* fallthru */
-+	case ANEG_STATE_ACK_DETECT:
-+		if (ap->ack_match != 0) {
-+			if ((ap->rxconfig & ~ANEG_CFG_ACK) ==
-+			    (ap->ability_match_cfg & ~ANEG_CFG_ACK)) {
-+				ap->state = ANEG_STATE_COMPLETE_ACK_INIT;
-+			} else {
-+				ap->state = ANEG_STATE_AN_ENABLE;
-+			}
-+		} else if (ap->ability_match != 0 &&
-+			   ap->rxconfig == 0) {
-+			ap->state = ANEG_STATE_AN_ENABLE;
-+		}
-+		break;
-+
-+	case ANEG_STATE_COMPLETE_ACK_INIT:
-+		if (ap->rxconfig & ANEG_CFG_INVAL) {
-+			ret = ANEG_FAILED;
-+			break;
-+		}
-+		ap->flags &= ~(MR_LP_ADV_FULL_DUPLEX |
-+			       MR_LP_ADV_HALF_DUPLEX |
-+			       MR_LP_ADV_SYM_PAUSE |
-+			       MR_LP_ADV_ASYM_PAUSE |
-+			       MR_LP_ADV_REMOTE_FAULT1 |
-+			       MR_LP_ADV_REMOTE_FAULT2 |
-+			       MR_LP_ADV_NEXT_PAGE |
-+			       MR_TOGGLE_RX |
-+			       MR_NP_RX);
-+		if (ap->rxconfig & ANEG_CFG_FD)
-+			ap->flags |= MR_LP_ADV_FULL_DUPLEX;
-+		if (ap->rxconfig & ANEG_CFG_HD)
-+			ap->flags |= MR_LP_ADV_HALF_DUPLEX;
-+		if (ap->rxconfig & ANEG_CFG_PS1)
-+			ap->flags |= MR_LP_ADV_SYM_PAUSE;
-+		if (ap->rxconfig & ANEG_CFG_PS2)
-+			ap->flags |= MR_LP_ADV_ASYM_PAUSE;
-+		if (ap->rxconfig & ANEG_CFG_RF1)
-+			ap->flags |= MR_LP_ADV_REMOTE_FAULT1;
-+		if (ap->rxconfig & ANEG_CFG_RF2)
-+			ap->flags |= MR_LP_ADV_REMOTE_FAULT2;
-+		if (ap->rxconfig & ANEG_CFG_NP)
-+			ap->flags |= MR_LP_ADV_NEXT_PAGE;
-+
-+		ap->link_time = ap->cur_time;
-+
-+		ap->flags ^= (MR_TOGGLE_TX);
-+		if (ap->rxconfig & 0x0008)
-+			ap->flags |= MR_TOGGLE_RX;
-+		if (ap->rxconfig & ANEG_CFG_NP)
-+			ap->flags |= MR_NP_RX;
-+		ap->flags |= MR_PAGE_RX;
-+
-+		ap->state = ANEG_STATE_COMPLETE_ACK;
-+		ret = ANEG_TIMER_ENAB;
-+		break;
-+
-+	case ANEG_STATE_COMPLETE_ACK:
-+		if (ap->ability_match != 0 &&
-+		    ap->rxconfig == 0) {
-+			ap->state = ANEG_STATE_AN_ENABLE;
-+			break;
-+		}
-+		delta = ap->cur_time - ap->link_time;
-+		if (delta > ANEG_STATE_SETTLE_TIME) {
-+			if (!(ap->flags & (MR_LP_ADV_NEXT_PAGE))) {
-+				ap->state = ANEG_STATE_IDLE_DETECT_INIT;
-+			} else {
-+				if ((ap->txconfig & ANEG_CFG_NP) == 0 &&
-+				    !(ap->flags & MR_NP_RX)) {
-+					ap->state = ANEG_STATE_IDLE_DETECT_INIT;
-+				} else {
-+					ret = ANEG_FAILED;
-+				}
-+			}
-+		}
-+		break;
-+
-+	case ANEG_STATE_IDLE_DETECT_INIT:
-+		ap->link_time = ap->cur_time;
-+		tp->mac_mode &= ~MAC_MODE_SEND_CONFIGS;
-+		tw32_f(MAC_MODE, tp->mac_mode);
-+		udelay(40);
-+
-+		ap->state = ANEG_STATE_IDLE_DETECT;
-+		ret = ANEG_TIMER_ENAB;
-+		break;
-+
-+	case ANEG_STATE_IDLE_DETECT:
-+		if (ap->ability_match != 0 &&
-+		    ap->rxconfig == 0) {
-+			ap->state = ANEG_STATE_AN_ENABLE;
-+			break;
-+		}
-+		delta = ap->cur_time - ap->link_time;
-+		if (delta > ANEG_STATE_SETTLE_TIME) {
-+			/* XXX another gem from the Broadcom driver :( */
-+			ap->state = ANEG_STATE_LINK_OK;
-+		}
-+		break;
-+
-+	case ANEG_STATE_LINK_OK:
-+		ap->flags |= (MR_AN_COMPLETE | MR_LINK_OK);
-+		ret = ANEG_DONE;
-+		break;
-+
-+	case ANEG_STATE_NEXT_PAGE_WAIT_INIT:
-+		/* ??? unimplemented */
-+		break;
-+
-+	case ANEG_STATE_NEXT_PAGE_WAIT:
-+		/* ??? unimplemented */
-+		break;
-+
-+	default:
-+		ret = ANEG_FAILED;
-+		break;
-+	};
-+
-+	return ret;
-+}
-+
-+static int fiber_autoneg(struct tg3 *tp, u32 *flags)
-+{
-+	int res = 0;
-+	struct tg3_fiber_aneginfo aninfo;
-+	int status = ANEG_FAILED;
-+	unsigned int tick;
-+	u32 tmp;
-+
-+	tw32_f(MAC_TX_AUTO_NEG, 0);
-+
-+	tmp = tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK;
-+	tw32_f(MAC_MODE, tmp | MAC_MODE_PORT_MODE_GMII);
-+	udelay(40);
-+
-+	tw32_f(MAC_MODE, tp->mac_mode | MAC_MODE_SEND_CONFIGS);
-+	udelay(40);
-+
-+	memset(&aninfo, 0, sizeof(aninfo));
-+	aninfo.flags |= MR_AN_ENABLE;
-+	aninfo.state = ANEG_STATE_UNKNOWN;
-+	aninfo.cur_time = 0;
-+	tick = 0;
-+	while (++tick < 195000) {
-+		status = tg3_fiber_aneg_smachine(tp, &aninfo);
-+		if (status == ANEG_DONE || status == ANEG_FAILED)
-+			break;
-+
-+		udelay(1);
-+	}
-+
-+	tp->mac_mode &= ~MAC_MODE_SEND_CONFIGS;
-+	tw32_f(MAC_MODE, tp->mac_mode);
-+	udelay(40);
-+
-+	*flags = aninfo.flags;
-+
-+	if (status == ANEG_DONE &&
-+	    (aninfo.flags & (MR_AN_COMPLETE | MR_LINK_OK |
-+			     MR_LP_ADV_FULL_DUPLEX)))
-+		res = 1;
-+
-+	return res;
-+}
-+
-+static void tg3_init_bcm8002(struct tg3 *tp)
-+{
-+	u32 mac_status = tr32(MAC_STATUS);
-+	int i;
-+
-+	/* Reset when initting first time or we have a link. */
-+	if ((tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) &&
-+	    !(mac_status & MAC_STATUS_PCS_SYNCED))
-+		return;
-+
-+	/* Set PLL lock range. */
-+	tg3_writephy(tp, 0x16, 0x8007);
-+
-+	/* SW reset */
-+	tg3_writephy(tp, MII_BMCR, BMCR_RESET);
-+
-+	/* Wait for reset to complete. */
-+	/* XXX schedule_timeout() ... */
-+	for (i = 0; i < 500; i++)
-+		udelay(10);
-+
-+	/* Config mode; select PMA/Ch 1 regs. */
-+	tg3_writephy(tp, 0x10, 0x8411);
-+
-+	/* Enable auto-lock and comdet, select txclk for tx. */
-+	tg3_writephy(tp, 0x11, 0x0a10);
-+
-+	tg3_writephy(tp, 0x18, 0x00a0);
-+	tg3_writephy(tp, 0x16, 0x41ff);
-+
-+	/* Assert and deassert POR. */
-+	tg3_writephy(tp, 0x13, 0x0400);
-+	udelay(40);
-+	tg3_writephy(tp, 0x13, 0x0000);
-+
-+	tg3_writephy(tp, 0x11, 0x0a50);
-+	udelay(40);
-+	tg3_writephy(tp, 0x11, 0x0a10);
-+
-+	/* Wait for signal to stabilize */
-+	/* XXX schedule_timeout() ... */
-+	for (i = 0; i < 15000; i++)
-+		udelay(10);
-+
-+	/* Deselect the channel register so we can read the PHYID
-+	 * later.
-+	 */
-+	tg3_writephy(tp, 0x10, 0x8011);
-+}
-+
-+static int tg3_setup_fiber_hw_autoneg(struct tg3 *tp, u32 mac_status)
-+{
-+	u32 sg_dig_ctrl, sg_dig_status;
-+	u32 serdes_cfg, expected_sg_dig_ctrl;
-+	int workaround, port_a;
-+	int current_link_up;
-+
-+	serdes_cfg = 0;
-+	expected_sg_dig_ctrl = 0;
-+	workaround = 0;
-+	port_a = 1;
-+	current_link_up = 0;
-+
-+	if (tp->pci_chip_rev_id != CHIPREV_ID_5704_A0 &&
-+	    tp->pci_chip_rev_id != CHIPREV_ID_5704_A1) {
-+		workaround = 1;
-+		if (tr32(TG3PCI_DUAL_MAC_CTRL) & DUAL_MAC_CTRL_ID)
-+			port_a = 0;
-+
-+		serdes_cfg = tr32(MAC_SERDES_CFG) &
-+			((1 << 23) | (1 << 22) | (1 << 21) | (1 << 20));
-+	}
-+
-+	sg_dig_ctrl = tr32(SG_DIG_CTRL);
-+
-+	if (tp->link_config.autoneg != AUTONEG_ENABLE) {
-+		if (sg_dig_ctrl & (1 << 31)) {
-+			if (workaround) {
-+				u32 val = serdes_cfg;
-+
-+				if (port_a)
-+					val |= 0xc010880;
-+				else
-+					val |= 0x4010880;
-+				tw32_f(MAC_SERDES_CFG, val);
-+			}
-+			tw32_f(SG_DIG_CTRL, 0x01388400);
-+		}
-+		if (mac_status & MAC_STATUS_PCS_SYNCED) {
-+			tg3_setup_flow_control(tp, 0, 0);
-+			current_link_up = 1;
-+		}
-+		goto out;
-+	}
-+
-+	/* Want auto-negotiation.  */
-+	expected_sg_dig_ctrl = 0x81388400;
-+
-+	/* Pause capability */
-+	expected_sg_dig_ctrl |= (1 << 11);
-+
-+	/* Asymettric pause */
-+	expected_sg_dig_ctrl |= (1 << 12);
-+
-+	if (sg_dig_ctrl != expected_sg_dig_ctrl) {
-+		if (workaround)
-+			tw32_f(MAC_SERDES_CFG, serdes_cfg | 0xc011880);
-+		tw32_f(SG_DIG_CTRL, expected_sg_dig_ctrl | (1 << 30));
-+		udelay(5);
-+		tw32_f(SG_DIG_CTRL, expected_sg_dig_ctrl);
-+
-+		tp->tg3_flags2 |= TG3_FLG2_PHY_JUST_INITTED;
-+	} else if (mac_status & (MAC_STATUS_PCS_SYNCED |
-+				 MAC_STATUS_SIGNAL_DET)) {
-+		int i;
-+
-+		/* Giver time to negotiate (~200ms) */
-+		for (i = 0; i < 40000; i++) {
-+			sg_dig_status = tr32(SG_DIG_STATUS);
-+			if (sg_dig_status & (0x3))
-+				break;
-+			udelay(5);
-+		}
-+		mac_status = tr32(MAC_STATUS);
-+
-+		if ((sg_dig_status & (1 << 1)) &&
-+		    (mac_status & MAC_STATUS_PCS_SYNCED)) {
-+			u32 local_adv, remote_adv;
-+
-+			local_adv = ADVERTISE_PAUSE_CAP;
-+			remote_adv = 0;
-+			if (sg_dig_status & (1 << 19))
-+				remote_adv |= LPA_PAUSE_CAP;
-+			if (sg_dig_status & (1 << 20))
-+				remote_adv |= LPA_PAUSE_ASYM;
-+
-+			tg3_setup_flow_control(tp, local_adv, remote_adv);
-+			current_link_up = 1;
-+			tp->tg3_flags2 &= ~TG3_FLG2_PHY_JUST_INITTED;
-+		} else if (!(sg_dig_status & (1 << 1))) {
-+			if (tp->tg3_flags2 & TG3_FLG2_PHY_JUST_INITTED)
-+				tp->tg3_flags2 &= ~TG3_FLG2_PHY_JUST_INITTED;
-+			else {
-+				if (workaround) {
-+					u32 val = serdes_cfg;
-+
-+					if (port_a)
-+						val |= 0xc010880;
-+					else
-+						val |= 0x4010880;
-+
-+					tw32_f(MAC_SERDES_CFG, val);
-+				}
-+
-+				tw32_f(SG_DIG_CTRL, 0x01388400);
-+				udelay(40);
-+
-+				mac_status = tr32(MAC_STATUS);
-+				if (mac_status & MAC_STATUS_PCS_SYNCED) {
-+					tg3_setup_flow_control(tp, 0, 0);
-+					current_link_up = 1;
-+				}
-+			}
-+		}
-+	}
-+
-+out:
-+	return current_link_up;
-+}
-+
-+static int tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status)
-+{
-+	int current_link_up = 0;
-+
-+ 	if (!(mac_status & MAC_STATUS_PCS_SYNCED)) {
-+		tp->tg3_flags &= ~TG3_FLAG_GOT_SERDES_FLOWCTL;
-+		goto out;
-+	}
-+
-+	if (tp->link_config.autoneg == AUTONEG_ENABLE) {
-+		u32 flags;
-+		int i;
-+  
-+		if (fiber_autoneg(tp, &flags)) {
-+			u32 local_adv, remote_adv;
-+
-+			local_adv = ADVERTISE_PAUSE_CAP;
-+			remote_adv = 0;
-+			if (flags & MR_LP_ADV_SYM_PAUSE)
-+				remote_adv |= LPA_PAUSE_CAP;
-+			if (flags & MR_LP_ADV_ASYM_PAUSE)
-+				remote_adv |= LPA_PAUSE_ASYM;
-+
-+			tg3_setup_flow_control(tp, local_adv, remote_adv);
-+
-+			tp->tg3_flags |= TG3_FLAG_GOT_SERDES_FLOWCTL;
-+			current_link_up = 1;
-+		}
-+		for (i = 0; i < 30; i++) {
-+			udelay(20);
-+			tw32_f(MAC_STATUS,
-+			       (MAC_STATUS_SYNC_CHANGED |
-+				MAC_STATUS_CFG_CHANGED));
-+			udelay(40);
-+			if ((tr32(MAC_STATUS) &
-+			     (MAC_STATUS_SYNC_CHANGED |
-+			      MAC_STATUS_CFG_CHANGED)) == 0)
-+				break;
-+		}
-+
-+		mac_status = tr32(MAC_STATUS);
-+		if (current_link_up == 0 &&
-+		    (mac_status & MAC_STATUS_PCS_SYNCED) &&
-+		    !(mac_status & MAC_STATUS_RCVD_CFG))
-+			current_link_up = 1;
-+	} else {
-+		/* Forcing 1000FD link up. */
-+		current_link_up = 1;
-+		tp->tg3_flags |= TG3_FLAG_GOT_SERDES_FLOWCTL;
-+
-+		tw32_f(MAC_MODE, (tp->mac_mode | MAC_MODE_SEND_CONFIGS));
-+		udelay(40);
-+	}
-+
-+out:
-+	return current_link_up;
-+}
-+
-+static int tg3_setup_fiber_phy(struct tg3 *tp, int force_reset)
-+{
-+	u32 orig_pause_cfg;
-+	u16 orig_active_speed;
-+	u8 orig_active_duplex;
-+	u32 mac_status;
-+	int current_link_up;
-+	int i;
-+
-+	orig_pause_cfg =
-+		(tp->tg3_flags & (TG3_FLAG_RX_PAUSE |
-+				  TG3_FLAG_TX_PAUSE));
-+	orig_active_speed = tp->link_config.active_speed;
-+	orig_active_duplex = tp->link_config.active_duplex;
-+
-+	if (!(tp->tg3_flags2 & TG3_FLG2_HW_AUTONEG) &&
-+	    netif_carrier_ok(tp->dev) &&
-+	    (tp->tg3_flags & TG3_FLAG_INIT_COMPLETE)) {
-+		mac_status = tr32(MAC_STATUS);
-+		mac_status &= (MAC_STATUS_PCS_SYNCED |
-+			       MAC_STATUS_SIGNAL_DET |
-+			       MAC_STATUS_CFG_CHANGED |
-+			       MAC_STATUS_RCVD_CFG);
-+		if (mac_status == (MAC_STATUS_PCS_SYNCED |
-+				   MAC_STATUS_SIGNAL_DET)) {
-+			tw32_f(MAC_STATUS, (MAC_STATUS_SYNC_CHANGED |
-+					    MAC_STATUS_CFG_CHANGED));
-+			return 0;
-+		}
-+	}
-+
-+	tw32_f(MAC_TX_AUTO_NEG, 0);
-+
-+	tp->mac_mode &= ~(MAC_MODE_PORT_MODE_MASK | MAC_MODE_HALF_DUPLEX);
-+	tp->mac_mode |= MAC_MODE_PORT_MODE_TBI;
-+	tw32_f(MAC_MODE, tp->mac_mode);
-+	udelay(40);
-+
-+	if (tp->phy_id == PHY_ID_BCM8002)
-+		tg3_init_bcm8002(tp);
-+
-+	/* Enable link change event even when serdes polling.  */
-+	tw32_f(MAC_EVENT, MAC_EVENT_LNKSTATE_CHANGED);
-+	udelay(40);
-+
-+	current_link_up = 0;
-+	mac_status = tr32(MAC_STATUS);
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_HW_AUTONEG)
-+		current_link_up = tg3_setup_fiber_hw_autoneg(tp, mac_status);
-+	else
-+		current_link_up = tg3_setup_fiber_by_hand(tp, mac_status);
-+
-+	tp->mac_mode &= ~MAC_MODE_LINK_POLARITY;
-+	tw32_f(MAC_MODE, tp->mac_mode);
-+	udelay(40);
-+
-+	tp->hw_status->status =
-+		(SD_STATUS_UPDATED |
-+		 (tp->hw_status->status & ~SD_STATUS_LINK_CHG));
-+
-+	for (i = 0; i < 100; i++) {
-+		tw32_f(MAC_STATUS, (MAC_STATUS_SYNC_CHANGED |
-+				    MAC_STATUS_CFG_CHANGED));
-+		udelay(5);
-+		if ((tr32(MAC_STATUS) & (MAC_STATUS_SYNC_CHANGED |
-+					 MAC_STATUS_CFG_CHANGED)) == 0)
-+			break;
-+	}
-+
-+	mac_status = tr32(MAC_STATUS);
-+	if ((mac_status & MAC_STATUS_PCS_SYNCED) == 0) {
-+		current_link_up = 0;
-+		if (tp->link_config.autoneg == AUTONEG_ENABLE) {
-+			tw32_f(MAC_MODE, (tp->mac_mode |
-+					  MAC_MODE_SEND_CONFIGS));
-+			udelay(1);
-+			tw32_f(MAC_MODE, tp->mac_mode);
-+		}
-+	}
-+
-+	if (current_link_up == 1) {
-+		tp->link_config.active_speed = SPEED_1000;
-+		tp->link_config.active_duplex = DUPLEX_FULL;
-+		tw32(MAC_LED_CTRL, (tp->led_ctrl |
-+				    LED_CTRL_LNKLED_OVERRIDE |
-+				    LED_CTRL_1000MBPS_ON));
-+	} else {
-+		tp->link_config.active_speed = SPEED_INVALID;
-+		tp->link_config.active_duplex = DUPLEX_INVALID;
-+		tw32(MAC_LED_CTRL, (tp->led_ctrl |
-+				    LED_CTRL_LNKLED_OVERRIDE |
-+				    LED_CTRL_TRAFFIC_OVERRIDE));
-+	}
-+
-+	if (current_link_up != netif_carrier_ok(tp->dev)) {
-+		if (current_link_up)
-+			netif_carrier_on(tp->dev);
-+		else
-+			netif_carrier_off(tp->dev);
-+		tg3_link_report(tp);
-+	} else {
-+		u32 now_pause_cfg =
-+			tp->tg3_flags & (TG3_FLAG_RX_PAUSE |
-+					 TG3_FLAG_TX_PAUSE);
-+		if (orig_pause_cfg != now_pause_cfg ||
-+		    orig_active_speed != tp->link_config.active_speed ||
-+		    orig_active_duplex != tp->link_config.active_duplex)
-+			tg3_link_report(tp);
-+	}
-+
-+	return 0;
-+}
-+
-+static int tg3_setup_phy(struct tg3 *tp, int force_reset)
-+{
-+	int err;
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
-+		err = tg3_setup_fiber_phy(tp, force_reset);
-+	} else {
-+		err = tg3_setup_copper_phy(tp, force_reset);
-+	}
-+
-+	if (tp->link_config.active_speed == SPEED_1000 &&
-+	    tp->link_config.active_duplex == DUPLEX_HALF)
-+		tw32(MAC_TX_LENGTHS,
-+		     ((2 << TX_LENGTHS_IPG_CRS_SHIFT) |
-+		      (6 << TX_LENGTHS_IPG_SHIFT) |
-+		      (0xff << TX_LENGTHS_SLOT_TIME_SHIFT)));
-+	else
-+		tw32(MAC_TX_LENGTHS,
-+		     ((2 << TX_LENGTHS_IPG_CRS_SHIFT) |
-+		      (6 << TX_LENGTHS_IPG_SHIFT) |
-+		      (32 << TX_LENGTHS_SLOT_TIME_SHIFT)));
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750) {
-+		if (netif_carrier_ok(tp->dev)) {
-+			tw32(HOSTCC_STAT_COAL_TICKS,
-+			     DEFAULT_STAT_COAL_TICKS);
-+		} else {
-+			tw32(HOSTCC_STAT_COAL_TICKS, 0);
-+		}
-+	}
-+
-+	return err;
-+}
-+
-+/* Tigon3 never reports partial packet sends.  So we do not
-+ * need special logic to handle SKBs that have not had all
-+ * of their frags sent yet, like SunGEM does.
-+ */
-+static void tg3_tx(struct tg3 *tp)
-+{
-+	u32 hw_idx = tp->hw_status->idx[0].tx_consumer;
-+	u32 sw_idx = tp->tx_cons;
-+
-+	while (sw_idx != hw_idx) {
-+		struct tx_ring_info *ri = &tp->tx_buffers[sw_idx];
-+		struct sk_buff *skb = ri->skb;
-+		int i;
-+
-+		if (unlikely(skb == NULL))
-+			BUG();
-+
-+		pci_unmap_single(tp->pdev,
-+				 pci_unmap_addr(ri, mapping),
-+				 skb_headlen(skb),
-+				 PCI_DMA_TODEVICE);
-+
-+		ri->skb = NULL;
-+
-+		sw_idx = NEXT_TX(sw_idx);
-+
-+		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-+			if (unlikely(sw_idx == hw_idx))
-+				BUG();
-+
-+			ri = &tp->tx_buffers[sw_idx];
-+			if (unlikely(ri->skb != NULL))
-+				BUG();
-+
-+			pci_unmap_page(tp->pdev,
-+				       pci_unmap_addr(ri, mapping),
-+				       skb_shinfo(skb)->frags[i].size,
-+				       PCI_DMA_TODEVICE);
-+
-+			sw_idx = NEXT_TX(sw_idx);
-+		}
-+
-+		dev_kfree_skb_irq(skb);
-+	}
-+
-+	tp->tx_cons = sw_idx;
-+
-+	if (netif_queue_stopped(tp->dev) &&
-+	    (TX_BUFFS_AVAIL(tp) > TG3_TX_WAKEUP_THRESH))
-+		netif_wake_queue(tp->dev);
-+}
-+
-+/* Returns size of skb allocated or < 0 on error.
-+ *
-+ * We only need to fill in the address because the other members
-+ * of the RX descriptor are invariant, see tg3_init_rings.
-+ *
-+ * Note the purposeful assymetry of cpu vs. chip accesses.  For
-+ * posting buffers we only dirty the first cache line of the RX
-+ * descriptor (containing the address).  Whereas for the RX status
-+ * buffers the cpu only reads the last cacheline of the RX descriptor
-+ * (to fetch the error flags, vlan tag, checksum, and opaque cookie).
-+ */
-+static int tg3_alloc_rx_skb(struct tg3 *tp, u32 opaque_key,
-+			    int src_idx, u32 dest_idx_unmasked)
-+{
-+	struct tg3_rx_buffer_desc *desc;
-+	struct ring_info *map, *src_map;
-+	struct sk_buff *skb;
-+	dma_addr_t mapping;
-+	int skb_size, dest_idx;
-+
-+	src_map = NULL;
-+	switch (opaque_key) {
-+	case RXD_OPAQUE_RING_STD:
-+		dest_idx = dest_idx_unmasked % TG3_RX_RING_SIZE;
-+		desc = &tp->rx_std[dest_idx];
-+		map = &tp->rx_std_buffers[dest_idx];
-+		if (src_idx >= 0)
-+			src_map = &tp->rx_std_buffers[src_idx];
-+		skb_size = RX_PKT_BUF_SZ;
-+		break;
-+
-+	case RXD_OPAQUE_RING_JUMBO:
-+		dest_idx = dest_idx_unmasked % TG3_RX_JUMBO_RING_SIZE;
-+		desc = &tp->rx_jumbo[dest_idx];
-+		map = &tp->rx_jumbo_buffers[dest_idx];
-+		if (src_idx >= 0)
-+			src_map = &tp->rx_jumbo_buffers[src_idx];
-+		skb_size = RX_JUMBO_PKT_BUF_SZ;
-+		break;
-+
-+	default:
-+		return -EINVAL;
-+	};
-+
-+	/* Do not overwrite any of the map or rp information
-+	 * until we are sure we can commit to a new buffer.
-+	 *
-+	 * Callers depend upon this behavior and assume that
-+	 * we leave everything unchanged if we fail.
-+	 */
-+	skb = dev_alloc_skb(skb_size);
-+	if (skb == NULL)
-+		return -ENOMEM;
-+
-+	skb->dev = tp->dev;
-+	skb_reserve(skb, tp->rx_offset);
-+
-+	mapping = pci_map_single(tp->pdev, skb->data,
-+				 skb_size - tp->rx_offset,
-+				 PCI_DMA_FROMDEVICE);
-+
-+	map->skb = skb;
-+	pci_unmap_addr_set(map, mapping, mapping);
-+
-+	if (src_map != NULL)
-+		src_map->skb = NULL;
-+
-+	desc->addr_hi = ((u64)mapping >> 32);
-+	desc->addr_lo = ((u64)mapping & 0xffffffff);
-+
-+	return skb_size;
-+}
-+
-+/* We only need to move over in the address because the other
-+ * members of the RX descriptor are invariant.  See notes above
-+ * tg3_alloc_rx_skb for full details.
-+ */
-+static void tg3_recycle_rx(struct tg3 *tp, u32 opaque_key,
-+			   int src_idx, u32 dest_idx_unmasked)
-+{
-+	struct tg3_rx_buffer_desc *src_desc, *dest_desc;
-+	struct ring_info *src_map, *dest_map;
-+	int dest_idx;
-+
-+	switch (opaque_key) {
-+	case RXD_OPAQUE_RING_STD:
-+		dest_idx = dest_idx_unmasked % TG3_RX_RING_SIZE;
-+		dest_desc = &tp->rx_std[dest_idx];
-+		dest_map = &tp->rx_std_buffers[dest_idx];
-+		src_desc = &tp->rx_std[src_idx];
-+		src_map = &tp->rx_std_buffers[src_idx];
-+		break;
-+
-+	case RXD_OPAQUE_RING_JUMBO:
-+		dest_idx = dest_idx_unmasked % TG3_RX_JUMBO_RING_SIZE;
-+		dest_desc = &tp->rx_jumbo[dest_idx];
-+		dest_map = &tp->rx_jumbo_buffers[dest_idx];
-+		src_desc = &tp->rx_jumbo[src_idx];
-+		src_map = &tp->rx_jumbo_buffers[src_idx];
-+		break;
-+
-+	default:
-+		return;
-+	};
-+
-+	dest_map->skb = src_map->skb;
-+	pci_unmap_addr_set(dest_map, mapping,
-+			   pci_unmap_addr(src_map, mapping));
-+	dest_desc->addr_hi = src_desc->addr_hi;
-+	dest_desc->addr_lo = src_desc->addr_lo;
-+
-+	src_map->skb = NULL;
-+}
-+
-+#if TG3_VLAN_TAG_USED
-+static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag)
-+{
-+	return vlan_hwaccel_receive_skb(skb, tp->vlgrp, vlan_tag);
-+}
-+#endif
-+
-+/* The RX ring scheme is composed of multiple rings which post fresh
-+ * buffers to the chip, and one special ring the chip uses to report
-+ * status back to the host.
-+ *
-+ * The special ring reports the status of received packets to the
-+ * host.  The chip does not write into the original descriptor the
-+ * RX buffer was obtained from.  The chip simply takes the original
-+ * descriptor as provided by the host, updates the status and length
-+ * field, then writes this into the next status ring entry.
-+ *
-+ * Each ring the host uses to post buffers to the chip is described
-+ * by a TG3_BDINFO entry in the chips SRAM area.  When a packet arrives,
-+ * it is first placed into the on-chip ram.  When the packet's length
-+ * is known, it walks down the TG3_BDINFO entries to select the ring.
-+ * Each TG3_BDINFO specifies a MAXLEN field and the first TG3_BDINFO
-+ * which is within the range of the new packet's length is chosen.
-+ *
-+ * The "separate ring for rx status" scheme may sound queer, but it makes
-+ * sense from a cache coherency perspective.  If only the host writes
-+ * to the buffer post rings, and only the chip writes to the rx status
-+ * rings, then cache lines never move beyond shared-modified state.
-+ * If both the host and chip were to write into the same ring, cache line
-+ * eviction could occur since both entities want it in an exclusive state.
-+ */
-+static int tg3_rx(struct tg3 *tp, int budget)
-+{
-+	u32 work_mask;
-+	u32 rx_rcb_ptr = tp->rx_rcb_ptr;
-+	u16 hw_idx, sw_idx;
-+	int received;
-+
-+	hw_idx = tp->hw_status->idx[0].rx_producer;
-+	/*
-+	 * We need to order the read of hw_idx and the read of
-+	 * the opaque cookie.
-+	 */
-+	rmb();
-+	sw_idx = rx_rcb_ptr % TG3_RX_RCB_RING_SIZE(tp);
-+	work_mask = 0;
-+	received = 0;
-+	while (sw_idx != hw_idx && budget > 0) {
-+		struct tg3_rx_buffer_desc *desc = &tp->rx_rcb[sw_idx];
-+		unsigned int len;
-+		struct sk_buff *skb;
-+		dma_addr_t dma_addr;
-+		u32 opaque_key, desc_idx, *post_ptr;
-+
-+		desc_idx = desc->opaque & RXD_OPAQUE_INDEX_MASK;
-+		opaque_key = desc->opaque & RXD_OPAQUE_RING_MASK;
-+		if (opaque_key == RXD_OPAQUE_RING_STD) {
-+			dma_addr = pci_unmap_addr(&tp->rx_std_buffers[desc_idx],
-+						  mapping);
-+			skb = tp->rx_std_buffers[desc_idx].skb;
-+			post_ptr = &tp->rx_std_ptr;
-+		} else if (opaque_key == RXD_OPAQUE_RING_JUMBO) {
-+			dma_addr = pci_unmap_addr(&tp->rx_jumbo_buffers[desc_idx],
-+						  mapping);
-+			skb = tp->rx_jumbo_buffers[desc_idx].skb;
-+			post_ptr = &tp->rx_jumbo_ptr;
-+		}
-+		else {
-+			goto next_pkt_nopost;
-+		}
-+
-+		work_mask |= opaque_key;
-+
-+		if ((desc->err_vlan & RXD_ERR_MASK) != 0 &&
-+		    (desc->err_vlan != RXD_ERR_ODD_NIBBLE_RCVD_MII)) {
-+		drop_it:
-+			tg3_recycle_rx(tp, opaque_key,
-+				       desc_idx, *post_ptr);
-+		drop_it_no_recycle:
-+			/* Other statistics kept track of by card. */
-+			tp->net_stats.rx_dropped++;
-+			goto next_pkt;
-+		}
-+
-+		len = ((desc->idx_len & RXD_LEN_MASK) >> RXD_LEN_SHIFT) - 4; /* omit crc */
-+
-+		if (len > RX_COPY_THRESHOLD) {
-+			int skb_size;
-+
-+			skb_size = tg3_alloc_rx_skb(tp, opaque_key,
-+						    desc_idx, *post_ptr);
-+			if (skb_size < 0)
-+				goto drop_it;
-+
-+			pci_unmap_single(tp->pdev, dma_addr,
-+					 skb_size - tp->rx_offset,
-+					 PCI_DMA_FROMDEVICE);
-+
-+			skb_put(skb, len);
-+		} else {
-+			struct sk_buff *copy_skb;
-+
-+			tg3_recycle_rx(tp, opaque_key,
-+				       desc_idx, *post_ptr);
-+
-+			copy_skb = dev_alloc_skb(len + 2);
-+			if (copy_skb == NULL)
-+				goto drop_it_no_recycle;
-+
-+			copy_skb->dev = tp->dev;
-+			skb_reserve(copy_skb, 2);
-+			skb_put(copy_skb, len);
-+			pci_dma_sync_single_for_cpu(tp->pdev, dma_addr, len, PCI_DMA_FROMDEVICE);
-+			memcpy(copy_skb->data, skb->data, len);
-+			pci_dma_sync_single_for_device(tp->pdev, dma_addr, len, PCI_DMA_FROMDEVICE);
-+
-+			/* We'll reuse the original ring buffer. */
-+			skb = copy_skb;
-+		}
-+
-+		if ((tp->tg3_flags & TG3_FLAG_RX_CHECKSUMS) &&
-+		    (desc->type_flags & RXD_FLAG_TCPUDP_CSUM) &&
-+		    (((desc->ip_tcp_csum & RXD_TCPCSUM_MASK)
-+		      >> RXD_TCPCSUM_SHIFT) == 0xffff))
-+			skb->ip_summed = CHECKSUM_UNNECESSARY;
-+		else
-+			skb->ip_summed = CHECKSUM_NONE;
-+
-+		skb->protocol = eth_type_trans(skb, tp->dev);
-+#if TG3_VLAN_TAG_USED
-+		if (tp->vlgrp != NULL &&
-+		    desc->type_flags & RXD_FLAG_VLAN) {
-+			tg3_vlan_rx(tp, skb,
-+				    desc->err_vlan & RXD_VLAN_MASK);
-+		} else
-+#endif
-+			netif_receive_skb(skb);
-+
-+		tp->dev->last_rx = jiffies;
-+		received++;
-+		budget--;
-+
-+next_pkt:
-+		(*post_ptr)++;
-+next_pkt_nopost:
-+		rx_rcb_ptr++;
-+		sw_idx = rx_rcb_ptr % TG3_RX_RCB_RING_SIZE(tp);
-+	}
-+
-+	/* ACK the status ring. */
-+	tp->rx_rcb_ptr = rx_rcb_ptr;
-+	tw32_rx_mbox(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW,
-+		     (rx_rcb_ptr % TG3_RX_RCB_RING_SIZE(tp)));
-+
-+	/* Refill RX ring(s). */
-+	if (work_mask & RXD_OPAQUE_RING_STD) {
-+		sw_idx = tp->rx_std_ptr % TG3_RX_RING_SIZE;
-+		tw32_rx_mbox(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW,
-+			     sw_idx);
-+	}
-+	if (work_mask & RXD_OPAQUE_RING_JUMBO) {
-+		sw_idx = tp->rx_jumbo_ptr % TG3_RX_JUMBO_RING_SIZE;
-+		tw32_rx_mbox(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW,
-+			     sw_idx);
-+	}
-+	mmiowb();
-+
-+	return received;
-+}
-+
-+static int tg3_poll(struct net_device *netdev, int *budget)
-+{
-+	struct tg3 *tp = netdev_priv(netdev);
-+	struct tg3_hw_status *sblk = tp->hw_status;
-+	unsigned long flags;
-+	int done;
-+
-+	spin_lock_irqsave(&tp->lock, flags);
-+
-+	/* handle link change and other phy events */
-+	if (!(tp->tg3_flags &
-+	      (TG3_FLAG_USE_LINKCHG_REG |
-+	       TG3_FLAG_POLL_SERDES))) {
-+		if (sblk->status & SD_STATUS_LINK_CHG) {
-+			sblk->status = SD_STATUS_UPDATED |
-+				(sblk->status & ~SD_STATUS_LINK_CHG);
-+			tg3_setup_phy(tp, 0);
-+		}
-+	}
-+
-+	/* run TX completion thread */
-+	if (sblk->idx[0].tx_consumer != tp->tx_cons) {
-+		spin_lock(&tp->tx_lock);
-+		tg3_tx(tp);
-+		spin_unlock(&tp->tx_lock);
-+	}
-+
-+	spin_unlock_irqrestore(&tp->lock, flags);
-+
-+	/* run RX thread, within the bounds set by NAPI.
-+	 * All RX "locking" is done by ensuring outside
-+	 * code synchronizes with dev->poll()
-+	 */
-+	done = 1;
-+	if (sblk->idx[0].rx_producer != tp->rx_rcb_ptr) {
-+		int orig_budget = *budget;
-+		int work_done;
-+
-+		if (orig_budget > netdev->quota)
-+			orig_budget = netdev->quota;
-+
-+		work_done = tg3_rx(tp, orig_budget);
-+
-+		*budget -= work_done;
-+		netdev->quota -= work_done;
-+
-+		if (work_done >= orig_budget)
-+			done = 0;
-+	}
-+
-+	/* if no more work, tell net stack and NIC we're done */
-+	if (done) {
-+		spin_lock_irqsave(&tp->lock, flags);
-+		__netif_rx_complete(netdev);
-+		tg3_restart_ints(tp);
-+		spin_unlock_irqrestore(&tp->lock, flags);
-+	}
-+
-+	return (done ? 0 : 1);
-+}
-+
-+static inline unsigned int tg3_has_work(struct net_device *dev, struct tg3 *tp)
-+{
-+	struct tg3_hw_status *sblk = tp->hw_status;
-+	unsigned int work_exists = 0;
-+
-+	/* check for phy events */
-+	if (!(tp->tg3_flags &
-+	      (TG3_FLAG_USE_LINKCHG_REG |
-+	       TG3_FLAG_POLL_SERDES))) {
-+		if (sblk->status & SD_STATUS_LINK_CHG)
-+			work_exists = 1;
-+	}
-+	/* check for RX/TX work to do */
-+	if (sblk->idx[0].tx_consumer != tp->tx_cons ||
-+	    sblk->idx[0].rx_producer != tp->rx_rcb_ptr)
-+		work_exists = 1;
-+
-+	return work_exists;
-+}
-+
-+static irqreturn_t tg3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-+{
-+	struct net_device *dev = dev_id;
-+	struct tg3 *tp = netdev_priv(dev);
-+	struct tg3_hw_status *sblk = tp->hw_status;
-+	unsigned long flags;
-+	unsigned int handled = 1;
-+
-+	spin_lock_irqsave(&tp->lock, flags);
-+
-+	if (sblk->status & SD_STATUS_UPDATED) {
-+		/*
-+		 * writing any value to intr-mbox-0 clears PCI INTA# and
-+		 * chip-internal interrupt pending events.
-+		 * writing non-zero to intr-mbox-0 additional tells the
-+		 * NIC to stop sending us irqs, engaging "in-intr-handler"
-+		 * event coalescing.
-+		 */
-+		tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
-+			     0x00000001);
-+		/*
-+		 * Flush PCI write.  This also guarantees that our
-+		 * status block has been flushed to host memory.
-+		 */
-+		tr32(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW);
-+		sblk->status &= ~SD_STATUS_UPDATED;
-+
-+		if (likely(tg3_has_work(dev, tp)))
-+			netif_rx_schedule(dev);		/* schedule NAPI poll */
-+		else {
-+			/* no work, shared interrupt perhaps?  re-enable
-+			 * interrupts, and flush that PCI write
-+			 */
-+			tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
-+			     	0x00000000);
-+			tr32(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW);
-+		}
-+	} else {	/* shared interrupt */
-+		handled = 0;
-+	}
-+
-+	spin_unlock_irqrestore(&tp->lock, flags);
-+
-+	return IRQ_RETVAL(handled);
-+}
-+
-+static int tg3_init_hw(struct tg3 *);
-+static int tg3_halt(struct tg3 *);
-+
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+static void tg3_poll_controller(struct net_device *dev)
-+{
-+	tg3_interrupt(dev->irq, dev, NULL);
-+}
-+#endif
-+
-+static void tg3_reset_task(void *_data)
-+{
-+	struct tg3 *tp = _data;
-+	unsigned int restart_timer;
-+
-+	tg3_netif_stop(tp);
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+
-+	restart_timer = tp->tg3_flags2 & TG3_FLG2_RESTART_TIMER;
-+	tp->tg3_flags2 &= ~TG3_FLG2_RESTART_TIMER;
-+
-+	tg3_halt(tp);
-+	tg3_init_hw(tp);
-+
-+	tg3_netif_start(tp);
-+
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+
-+	if (restart_timer)
-+		mod_timer(&tp->timer, jiffies + 1);
-+}
-+
-+static void tg3_tx_timeout(struct net_device *dev)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+
-+	printk(KERN_ERR PFX "%s: transmit timed out, resetting\n",
-+	       dev->name);
-+
-+	schedule_work(&tp->reset_task);
-+}
-+
-+static void tg3_set_txd(struct tg3 *, int, dma_addr_t, int, u32, u32);
-+
-+static int tigon3_4gb_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb,
-+				       u32 guilty_entry, int guilty_len,
-+				       u32 last_plus_one, u32 *start, u32 mss)
-+{
-+	struct sk_buff *new_skb = skb_copy(skb, GFP_ATOMIC);
-+	dma_addr_t new_addr;
-+	u32 entry = *start;
-+	int i;
-+
-+	if (!new_skb) {
-+		dev_kfree_skb(skb);
-+		return -1;
-+	}
-+
-+	/* New SKB is guaranteed to be linear. */
-+	entry = *start;
-+	new_addr = pci_map_single(tp->pdev, new_skb->data, new_skb->len,
-+				  PCI_DMA_TODEVICE);
-+	tg3_set_txd(tp, entry, new_addr, new_skb->len,
-+		    (skb->ip_summed == CHECKSUM_HW) ?
-+		    TXD_FLAG_TCPUDP_CSUM : 0, 1 | (mss << 1));
-+	*start = NEXT_TX(entry);
-+
-+	/* Now clean up the sw ring entries. */
-+	i = 0;
-+	while (entry != last_plus_one) {
-+		int len;
-+
-+		if (i == 0)
-+			len = skb_headlen(skb);
-+		else
-+			len = skb_shinfo(skb)->frags[i-1].size;
-+		pci_unmap_single(tp->pdev,
-+				 pci_unmap_addr(&tp->tx_buffers[entry], mapping),
-+				 len, PCI_DMA_TODEVICE);
-+		if (i == 0) {
-+			tp->tx_buffers[entry].skb = new_skb;
-+			pci_unmap_addr_set(&tp->tx_buffers[entry], mapping, new_addr);
-+		} else {
-+			tp->tx_buffers[entry].skb = NULL;
-+		}
-+		entry = NEXT_TX(entry);
-+	}
-+
-+	dev_kfree_skb(skb);
-+
-+	return 0;
-+}
-+
-+static void tg3_set_txd(struct tg3 *tp, int entry,
-+			dma_addr_t mapping, int len, u32 flags,
-+			u32 mss_and_is_end)
-+{
-+	struct tg3_tx_buffer_desc *txd = &tp->tx_ring[entry];
-+	int is_end = (mss_and_is_end & 0x1);
-+	u32 mss = (mss_and_is_end >> 1);
-+	u32 vlan_tag = 0;
-+
-+	if (is_end)
-+		flags |= TXD_FLAG_END;
-+	if (flags & TXD_FLAG_VLAN) {
-+		vlan_tag = flags >> 16;
-+		flags &= 0xffff;
-+	}
-+	vlan_tag |= (mss << TXD_MSS_SHIFT);
-+
-+	txd->addr_hi = ((u64) mapping >> 32);
-+	txd->addr_lo = ((u64) mapping & 0xffffffff);
-+	txd->len_flags = (len << TXD_LEN_SHIFT) | flags;
-+	txd->vlan_tag = vlan_tag << TXD_VLAN_TAG_SHIFT;
-+}
-+
-+static inline int tg3_4g_overflow_test(dma_addr_t mapping, int len)
-+{
-+	u32 base = (u32) mapping & 0xffffffff;
-+
-+	return ((base > 0xffffdcc0) &&
-+		(base + len + 8 < base));
-+}
-+
-+static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+	dma_addr_t mapping;
-+	unsigned int i;
-+	u32 len, entry, base_flags, mss;
-+	int would_hit_hwbug;
-+	unsigned long flags;
-+
-+	len = skb_headlen(skb);
-+
-+	/* No BH disabling for tx_lock here.  We are running in BH disabled
-+	 * context and TX reclaim runs via tp->poll inside of a software
-+	 * interrupt.  Rejoice!
-+	 *
-+	 * Actually, things are not so simple.  If we are to take a hw
-+	 * IRQ here, we can deadlock, consider:
-+	 *
-+	 *       CPU1		CPU2
-+	 *   tg3_start_xmit
-+	 *   take tp->tx_lock
-+	 *			tg3_timer
-+	 *			take tp->lock
-+	 *   tg3_interrupt
-+	 *   spin on tp->lock
-+	 *			spin on tp->tx_lock
-+	 *
-+	 * So we really do need to disable interrupts when taking
-+	 * tx_lock here.
-+	 */
-+	local_irq_save(flags);
-+	if (!spin_trylock(&tp->tx_lock)) { 
-+		local_irq_restore(flags);
-+		return NETDEV_TX_LOCKED; 
-+	} 
-+
-+	/* This is a hard error, log it. */
-+	if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {
-+		netif_stop_queue(dev);
-+		spin_unlock_irqrestore(&tp->tx_lock, flags);
-+		printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
-+		       dev->name);
-+		return NETDEV_TX_BUSY;
-+	}
-+
-+	entry = tp->tx_prod;
-+	base_flags = 0;
-+	if (skb->ip_summed == CHECKSUM_HW)
-+		base_flags |= TXD_FLAG_TCPUDP_CSUM;
-+#if TG3_TSO_SUPPORT != 0
-+	mss = 0;
-+	if (skb->len > (tp->dev->mtu + ETH_HLEN) &&
-+	    (mss = skb_shinfo(skb)->tso_size) != 0) {
-+		int tcp_opt_len, ip_tcp_len;
-+
-+		tcp_opt_len = ((skb->h.th->doff - 5) * 4);
-+		ip_tcp_len = (skb->nh.iph->ihl * 4) + sizeof(struct tcphdr);
-+
-+		base_flags |= (TXD_FLAG_CPU_PRE_DMA |
-+			       TXD_FLAG_CPU_POST_DMA);
-+
-+		skb->nh.iph->check = 0;
-+		skb->nh.iph->tot_len = ntohs(mss + ip_tcp_len + tcp_opt_len);
-+		skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr,
-+						      skb->nh.iph->daddr,
-+						      0, IPPROTO_TCP, 0);
-+
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
-+			if (tcp_opt_len || skb->nh.iph->ihl > 5) {
-+				int tsflags;
-+
-+				tsflags = ((skb->nh.iph->ihl - 5) +
-+					   (tcp_opt_len >> 2));
-+				mss |= (tsflags << 11);
-+			}
-+		} else {
-+			if (tcp_opt_len || skb->nh.iph->ihl > 5) {
-+				int tsflags;
-+
-+				tsflags = ((skb->nh.iph->ihl - 5) +
-+					   (tcp_opt_len >> 2));
-+				base_flags |= tsflags << 12;
-+			}
-+		}
-+	}
-+#else
-+	mss = 0;
-+#endif
-+#if TG3_VLAN_TAG_USED
-+	if (tp->vlgrp != NULL && vlan_tx_tag_present(skb))
-+		base_flags |= (TXD_FLAG_VLAN |
-+			       (vlan_tx_tag_get(skb) << 16));
-+#endif
-+
-+	/* Queue skb data, a.k.a. the main skb fragment. */
-+	mapping = pci_map_single(tp->pdev, skb->data, len, PCI_DMA_TODEVICE);
-+
-+	tp->tx_buffers[entry].skb = skb;
-+	pci_unmap_addr_set(&tp->tx_buffers[entry], mapping, mapping);
-+
-+	would_hit_hwbug = 0;
-+
-+	if (tg3_4g_overflow_test(mapping, len))
-+		would_hit_hwbug = entry + 1;
-+
-+	tg3_set_txd(tp, entry, mapping, len, base_flags,
-+		    (skb_shinfo(skb)->nr_frags == 0) | (mss << 1));
-+
-+	entry = NEXT_TX(entry);
-+
-+	/* Now loop through additional data fragments, and queue them. */
-+	if (skb_shinfo(skb)->nr_frags > 0) {
-+		unsigned int i, last;
-+
-+		last = skb_shinfo(skb)->nr_frags - 1;
-+		for (i = 0; i <= last; i++) {
-+			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-+
-+			len = frag->size;
-+			mapping = pci_map_page(tp->pdev,
-+					       frag->page,
-+					       frag->page_offset,
-+					       len, PCI_DMA_TODEVICE);
-+
-+			tp->tx_buffers[entry].skb = NULL;
-+			pci_unmap_addr_set(&tp->tx_buffers[entry], mapping, mapping);
-+
-+			if (tg3_4g_overflow_test(mapping, len)) {
-+				/* Only one should match. */
-+				if (would_hit_hwbug)
-+					BUG();
-+				would_hit_hwbug = entry + 1;
-+			}
-+
-+			if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-+				tg3_set_txd(tp, entry, mapping, len,
-+					    base_flags, (i == last)|(mss << 1));
-+			else
-+				tg3_set_txd(tp, entry, mapping, len,
-+					    base_flags, (i == last));
-+
-+			entry = NEXT_TX(entry);
-+		}
-+	}
-+
-+	if (would_hit_hwbug) {
-+		u32 last_plus_one = entry;
-+		u32 start;
-+		unsigned int len = 0;
-+
-+		would_hit_hwbug -= 1;
-+		entry = entry - 1 - skb_shinfo(skb)->nr_frags;
-+		entry &= (TG3_TX_RING_SIZE - 1);
-+		start = entry;
-+		i = 0;
-+		while (entry != last_plus_one) {
-+			if (i == 0)
-+				len = skb_headlen(skb);
-+			else
-+				len = skb_shinfo(skb)->frags[i-1].size;
-+
-+			if (entry == would_hit_hwbug)
-+				break;
-+
-+			i++;
-+			entry = NEXT_TX(entry);
-+
-+		}
-+
-+		/* If the workaround fails due to memory/mapping
-+		 * failure, silently drop this packet.
-+		 */
-+		if (tigon3_4gb_hwbug_workaround(tp, skb,
-+						entry, len,
-+						last_plus_one,
-+						&start, mss))
-+			goto out_unlock;
-+
-+		entry = start;
-+	}
-+
-+	/* Packets are ready, update Tx producer idx local and on card. */
-+	tw32_tx_mbox((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry);
-+
-+	tp->tx_prod = entry;
-+	if (TX_BUFFS_AVAIL(tp) <= (MAX_SKB_FRAGS + 1))
-+		netif_stop_queue(dev);
-+
-+out_unlock:
-+    	mmiowb();
-+	spin_unlock_irqrestore(&tp->tx_lock, flags);
-+
-+	dev->trans_start = jiffies;
-+
-+	return NETDEV_TX_OK;
-+}
-+
-+static inline void tg3_set_mtu(struct net_device *dev, struct tg3 *tp,
-+			       int new_mtu)
-+{
-+	dev->mtu = new_mtu;
-+
-+	if (new_mtu > ETH_DATA_LEN)
-+		tp->tg3_flags |= TG3_FLAG_JUMBO_ENABLE;
-+	else
-+		tp->tg3_flags &= ~TG3_FLAG_JUMBO_ENABLE;
-+}
-+
-+static int tg3_change_mtu(struct net_device *dev, int new_mtu)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+
-+	if (new_mtu < TG3_MIN_MTU || new_mtu > TG3_MAX_MTU(tp))
-+		return -EINVAL;
-+
-+	if (!netif_running(dev)) {
-+		/* We'll just catch it later when the
-+		 * device is up'd.
-+		 */
-+		tg3_set_mtu(dev, tp, new_mtu);
-+		return 0;
-+	}
-+
-+	tg3_netif_stop(tp);
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+
-+	tg3_halt(tp);
-+
-+	tg3_set_mtu(dev, tp, new_mtu);
-+
-+	tg3_init_hw(tp);
-+
-+	tg3_netif_start(tp);
-+
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+
-+	return 0;
-+}
-+
-+/* Free up pending packets in all rx/tx rings.
-+ *
-+ * The chip has been shut down and the driver detached from
-+ * the networking, so no interrupts or new tx packets will
-+ * end up in the driver.  tp->{tx,}lock is not held and we are not
-+ * in an interrupt context and thus may sleep.
-+ */
-+static void tg3_free_rings(struct tg3 *tp)
-+{
-+	struct ring_info *rxp;
-+	int i;
-+
-+	for (i = 0; i < TG3_RX_RING_SIZE; i++) {
-+		rxp = &tp->rx_std_buffers[i];
-+
-+		if (rxp->skb == NULL)
-+			continue;
-+		pci_unmap_single(tp->pdev,
-+				 pci_unmap_addr(rxp, mapping),
-+				 RX_PKT_BUF_SZ - tp->rx_offset,
-+				 PCI_DMA_FROMDEVICE);
-+		dev_kfree_skb_any(rxp->skb);
-+		rxp->skb = NULL;
-+	}
-+
-+	for (i = 0; i < TG3_RX_JUMBO_RING_SIZE; i++) {
-+		rxp = &tp->rx_jumbo_buffers[i];
-+
-+		if (rxp->skb == NULL)
-+			continue;
-+		pci_unmap_single(tp->pdev,
-+				 pci_unmap_addr(rxp, mapping),
-+				 RX_JUMBO_PKT_BUF_SZ - tp->rx_offset,
-+				 PCI_DMA_FROMDEVICE);
-+		dev_kfree_skb_any(rxp->skb);
-+		rxp->skb = NULL;
-+	}
-+
-+	for (i = 0; i < TG3_TX_RING_SIZE; ) {
-+		struct tx_ring_info *txp;
-+		struct sk_buff *skb;
-+		int j;
-+
-+		txp = &tp->tx_buffers[i];
-+		skb = txp->skb;
-+
-+		if (skb == NULL) {
-+			i++;
-+			continue;
-+		}
-+
-+		pci_unmap_single(tp->pdev,
-+				 pci_unmap_addr(txp, mapping),
-+				 skb_headlen(skb),
-+				 PCI_DMA_TODEVICE);
-+		txp->skb = NULL;
-+
-+		i++;
-+
-+		for (j = 0; j < skb_shinfo(skb)->nr_frags; j++) {
-+			txp = &tp->tx_buffers[i & (TG3_TX_RING_SIZE - 1)];
-+			pci_unmap_page(tp->pdev,
-+				       pci_unmap_addr(txp, mapping),
-+				       skb_shinfo(skb)->frags[j].size,
-+				       PCI_DMA_TODEVICE);
-+			i++;
-+		}
-+
-+		dev_kfree_skb_any(skb);
-+	}
-+}
-+
-+/* Initialize tx/rx rings for packet processing.
-+ *
-+ * The chip has been shut down and the driver detached from
-+ * the networking, so no interrupts or new tx packets will
-+ * end up in the driver.  tp->{tx,}lock are held and thus
-+ * we may not sleep.
-+ */
-+static void tg3_init_rings(struct tg3 *tp)
-+{
-+	u32 i;
-+
-+	/* Free up all the SKBs. */
-+	tg3_free_rings(tp);
-+
-+	/* Zero out all descriptors. */
-+	memset(tp->rx_std, 0, TG3_RX_RING_BYTES);
-+	memset(tp->rx_jumbo, 0, TG3_RX_JUMBO_RING_BYTES);
-+	memset(tp->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp));
-+	memset(tp->tx_ring, 0, TG3_TX_RING_BYTES);
-+
-+	/* Initialize invariants of the rings, we only set this
-+	 * stuff once.  This works because the card does not
-+	 * write into the rx buffer posting rings.
-+	 */
-+	for (i = 0; i < TG3_RX_RING_SIZE; i++) {
-+		struct tg3_rx_buffer_desc *rxd;
-+
-+		rxd = &tp->rx_std[i];
-+		rxd->idx_len = (RX_PKT_BUF_SZ - tp->rx_offset - 64)
-+			<< RXD_LEN_SHIFT;
-+		rxd->type_flags = (RXD_FLAG_END << RXD_FLAGS_SHIFT);
-+		rxd->opaque = (RXD_OPAQUE_RING_STD |
-+			       (i << RXD_OPAQUE_INDEX_SHIFT));
-+	}
-+
-+	if (tp->tg3_flags & TG3_FLAG_JUMBO_ENABLE) {
-+		for (i = 0; i < TG3_RX_JUMBO_RING_SIZE; i++) {
-+			struct tg3_rx_buffer_desc *rxd;
-+
-+			rxd = &tp->rx_jumbo[i];
-+			rxd->idx_len = (RX_JUMBO_PKT_BUF_SZ - tp->rx_offset - 64)
-+				<< RXD_LEN_SHIFT;
-+			rxd->type_flags = (RXD_FLAG_END << RXD_FLAGS_SHIFT) |
-+				RXD_FLAG_JUMBO;
-+			rxd->opaque = (RXD_OPAQUE_RING_JUMBO |
-+			       (i << RXD_OPAQUE_INDEX_SHIFT));
-+		}
-+	}
-+
-+	/* Now allocate fresh SKBs for each rx ring. */
-+	for (i = 0; i < tp->rx_pending; i++) {
-+		if (tg3_alloc_rx_skb(tp, RXD_OPAQUE_RING_STD,
-+				     -1, i) < 0)
-+			break;
-+	}
-+
-+	if (tp->tg3_flags & TG3_FLAG_JUMBO_ENABLE) {
-+		for (i = 0; i < tp->rx_jumbo_pending; i++) {
-+			if (tg3_alloc_rx_skb(tp, RXD_OPAQUE_RING_JUMBO,
-+					     -1, i) < 0)
-+				break;
-+		}
-+	}
-+}
-+
-+/*
-+ * Must not be invoked with interrupt sources disabled and
-+ * the hardware shutdown down.
-+ */
-+static void tg3_free_consistent(struct tg3 *tp)
-+{
-+	if (tp->rx_std_buffers) {
-+		kfree(tp->rx_std_buffers);
-+		tp->rx_std_buffers = NULL;
-+	}
-+	if (tp->rx_std) {
-+		pci_free_consistent(tp->pdev, TG3_RX_RING_BYTES,
-+				    tp->rx_std, tp->rx_std_mapping);
-+		tp->rx_std = NULL;
-+	}
-+	if (tp->rx_jumbo) {
-+		pci_free_consistent(tp->pdev, TG3_RX_JUMBO_RING_BYTES,
-+				    tp->rx_jumbo, tp->rx_jumbo_mapping);
-+		tp->rx_jumbo = NULL;
-+	}
-+	if (tp->rx_rcb) {
-+		pci_free_consistent(tp->pdev, TG3_RX_RCB_RING_BYTES(tp),
-+				    tp->rx_rcb, tp->rx_rcb_mapping);
-+		tp->rx_rcb = NULL;
-+	}
-+	if (tp->tx_ring) {
-+		pci_free_consistent(tp->pdev, TG3_TX_RING_BYTES,
-+			tp->tx_ring, tp->tx_desc_mapping);
-+		tp->tx_ring = NULL;
-+	}
-+	if (tp->hw_status) {
-+		pci_free_consistent(tp->pdev, TG3_HW_STATUS_SIZE,
-+				    tp->hw_status, tp->status_mapping);
-+		tp->hw_status = NULL;
-+	}
-+	if (tp->hw_stats) {
-+		pci_free_consistent(tp->pdev, sizeof(struct tg3_hw_stats),
-+				    tp->hw_stats, tp->stats_mapping);
-+		tp->hw_stats = NULL;
-+	}
-+}
-+
-+/*
-+ * Must not be invoked with interrupt sources disabled and
-+ * the hardware shutdown down.  Can sleep.
-+ */
-+static int tg3_alloc_consistent(struct tg3 *tp)
-+{
-+	tp->rx_std_buffers = kmalloc((sizeof(struct ring_info) *
-+				      (TG3_RX_RING_SIZE +
-+				       TG3_RX_JUMBO_RING_SIZE)) +
-+				     (sizeof(struct tx_ring_info) *
-+				      TG3_TX_RING_SIZE),
-+				     GFP_KERNEL);
-+	if (!tp->rx_std_buffers)
-+		return -ENOMEM;
-+
-+	memset(tp->rx_std_buffers, 0,
-+	       (sizeof(struct ring_info) *
-+		(TG3_RX_RING_SIZE +
-+		 TG3_RX_JUMBO_RING_SIZE)) +
-+	       (sizeof(struct tx_ring_info) *
-+		TG3_TX_RING_SIZE));
-+
-+	tp->rx_jumbo_buffers = &tp->rx_std_buffers[TG3_RX_RING_SIZE];
-+	tp->tx_buffers = (struct tx_ring_info *)
-+		&tp->rx_jumbo_buffers[TG3_RX_JUMBO_RING_SIZE];
-+
-+	tp->rx_std = pci_alloc_consistent(tp->pdev, TG3_RX_RING_BYTES,
-+					  &tp->rx_std_mapping);
-+	if (!tp->rx_std)
-+		goto err_out;
-+
-+	tp->rx_jumbo = pci_alloc_consistent(tp->pdev, TG3_RX_JUMBO_RING_BYTES,
-+					    &tp->rx_jumbo_mapping);
-+
-+	if (!tp->rx_jumbo)
-+		goto err_out;
-+
-+	tp->rx_rcb = pci_alloc_consistent(tp->pdev, TG3_RX_RCB_RING_BYTES(tp),
-+					  &tp->rx_rcb_mapping);
-+	if (!tp->rx_rcb)
-+		goto err_out;
-+
-+	tp->tx_ring = pci_alloc_consistent(tp->pdev, TG3_TX_RING_BYTES,
-+					   &tp->tx_desc_mapping);
-+	if (!tp->tx_ring)
-+		goto err_out;
-+
-+	tp->hw_status = pci_alloc_consistent(tp->pdev,
-+					     TG3_HW_STATUS_SIZE,
-+					     &tp->status_mapping);
-+	if (!tp->hw_status)
-+		goto err_out;
-+
-+	tp->hw_stats = pci_alloc_consistent(tp->pdev,
-+					    sizeof(struct tg3_hw_stats),
-+					    &tp->stats_mapping);
-+	if (!tp->hw_stats)
-+		goto err_out;
-+
-+	memset(tp->hw_status, 0, TG3_HW_STATUS_SIZE);
-+	memset(tp->hw_stats, 0, sizeof(struct tg3_hw_stats));
-+
-+	return 0;
-+
-+err_out:
-+	tg3_free_consistent(tp);
-+	return -ENOMEM;
-+}
-+
-+#define MAX_WAIT_CNT 1000
-+
-+/* To stop a block, clear the enable bit and poll till it
-+ * clears.  tp->lock is held.
-+ */
-+static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, u32 enable_bit)
-+{
-+	unsigned int i;
-+	u32 val;
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+		switch (ofs) {
-+		case RCVLSC_MODE:
-+		case DMAC_MODE:
-+		case MBFREE_MODE:
-+		case BUFMGR_MODE:
-+		case MEMARB_MODE:
-+			/* We can't enable/disable these bits of the
-+			 * 5705/5750, just say success.
-+			 */
-+			return 0;
-+
-+		default:
-+			break;
-+		};
-+	}
-+
-+	val = tr32(ofs);
-+	val &= ~enable_bit;
-+	tw32_f(ofs, val);
-+
-+	for (i = 0; i < MAX_WAIT_CNT; i++) {
-+		udelay(100);
-+		val = tr32(ofs);
-+		if ((val & enable_bit) == 0)
-+			break;
-+	}
-+
-+	if (i == MAX_WAIT_CNT) {
-+		printk(KERN_ERR PFX "tg3_stop_block timed out, "
-+		       "ofs=%lx enable_bit=%x\n",
-+		       ofs, enable_bit);
-+		return -ENODEV;
-+	}
-+
-+	return 0;
-+}
-+
-+/* tp->lock is held. */
-+static int tg3_abort_hw(struct tg3 *tp)
-+{
-+	int i, err;
-+
-+	tg3_disable_ints(tp);
-+
-+	tp->rx_mode &= ~RX_MODE_ENABLE;
-+	tw32_f(MAC_RX_MODE, tp->rx_mode);
-+	udelay(10);
-+
-+	err  = tg3_stop_block(tp, RCVBDI_MODE, RCVBDI_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RCVLPC_MODE, RCVLPC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RCVLSC_MODE, RCVLSC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RCVDBDI_MODE, RCVDBDI_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RCVDCC_MODE, RCVDCC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RCVCC_MODE, RCVCC_MODE_ENABLE);
-+
-+	err |= tg3_stop_block(tp, SNDBDS_MODE, SNDBDS_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, SNDBDI_MODE, SNDBDI_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, SNDDATAI_MODE, SNDDATAI_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RDMAC_MODE, RDMAC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, SNDDATAC_MODE, SNDDATAC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, DMAC_MODE, DMAC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, SNDBDC_MODE, SNDBDC_MODE_ENABLE);
-+	if (err)
-+		goto out;
-+
-+	tp->mac_mode &= ~MAC_MODE_TDE_ENABLE;
-+	tw32_f(MAC_MODE, tp->mac_mode);
-+	udelay(40);
-+
-+	tp->tx_mode &= ~TX_MODE_ENABLE;
-+	tw32_f(MAC_TX_MODE, tp->tx_mode);
-+
-+	for (i = 0; i < MAX_WAIT_CNT; i++) {
-+		udelay(100);
-+		if (!(tr32(MAC_TX_MODE) & TX_MODE_ENABLE))
-+			break;
-+	}
-+	if (i >= MAX_WAIT_CNT) {
-+		printk(KERN_ERR PFX "tg3_abort_hw timed out for %s, "
-+		       "TX_MODE_ENABLE will not clear MAC_TX_MODE=%08x\n",
-+		       tp->dev->name, tr32(MAC_TX_MODE));
-+		return -ENODEV;
-+	}
-+
-+	err  = tg3_stop_block(tp, HOSTCC_MODE, HOSTCC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, WDMAC_MODE, WDMAC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, MBFREE_MODE, MBFREE_MODE_ENABLE);
-+
-+	tw32(FTQ_RESET, 0xffffffff);
-+	tw32(FTQ_RESET, 0x00000000);
-+
-+	err |= tg3_stop_block(tp, BUFMGR_MODE, BUFMGR_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, MEMARB_MODE, MEMARB_MODE_ENABLE);
-+	if (err)
-+		goto out;
-+
-+	if (tp->hw_status)
-+		memset(tp->hw_status, 0, TG3_HW_STATUS_SIZE);
-+	if (tp->hw_stats)
-+		memset(tp->hw_stats, 0, sizeof(struct tg3_hw_stats));
-+
-+out:
-+	return err;
-+}
-+
-+/* tp->lock is held. */
-+static int tg3_nvram_lock(struct tg3 *tp)
-+{
-+	if (tp->tg3_flags & TG3_FLAG_NVRAM) {
-+		int i;
-+
-+		tw32(NVRAM_SWARB, SWARB_REQ_SET1);
-+		for (i = 0; i < 8000; i++) {
-+			if (tr32(NVRAM_SWARB) & SWARB_GNT1)
-+				break;
-+			udelay(20);
-+		}
-+		if (i == 8000)
-+			return -ENODEV;
-+	}
-+	return 0;
-+}
-+
-+/* tp->lock is held. */
-+static void tg3_nvram_unlock(struct tg3 *tp)
-+{
-+	if (tp->tg3_flags & TG3_FLAG_NVRAM)
-+		tw32_f(NVRAM_SWARB, SWARB_REQ_CLR1);
-+}
-+
-+/* tp->lock is held. */
-+static void tg3_write_sig_pre_reset(struct tg3 *tp, int kind)
-+{
-+	tg3_write_mem(tp, NIC_SRAM_FIRMWARE_MBOX,
-+		      NIC_SRAM_FIRMWARE_MBOX_MAGIC1);
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_ASF_NEW_HANDSHAKE) {
-+		switch (kind) {
-+		case RESET_KIND_INIT:
-+			tg3_write_mem(tp, NIC_SRAM_FW_DRV_STATE_MBOX,
-+				      DRV_STATE_START);
-+			break;
-+
-+		case RESET_KIND_SHUTDOWN:
-+			tg3_write_mem(tp, NIC_SRAM_FW_DRV_STATE_MBOX,
-+				      DRV_STATE_UNLOAD);
-+			break;
-+
-+		case RESET_KIND_SUSPEND:
-+			tg3_write_mem(tp, NIC_SRAM_FW_DRV_STATE_MBOX,
-+				      DRV_STATE_SUSPEND);
-+			break;
-+
-+		default:
-+			break;
-+		};
-+	}
-+}
-+
-+/* tp->lock is held. */
-+static void tg3_write_sig_post_reset(struct tg3 *tp, int kind)
-+{
-+	if (tp->tg3_flags2 & TG3_FLG2_ASF_NEW_HANDSHAKE) {
-+		switch (kind) {
-+		case RESET_KIND_INIT:
-+			tg3_write_mem(tp, NIC_SRAM_FW_DRV_STATE_MBOX,
-+				      DRV_STATE_START_DONE);
-+			break;
-+
-+		case RESET_KIND_SHUTDOWN:
-+			tg3_write_mem(tp, NIC_SRAM_FW_DRV_STATE_MBOX,
-+				      DRV_STATE_UNLOAD_DONE);
-+			break;
-+
-+		default:
-+			break;
-+		};
-+	}
-+}
-+
-+/* tp->lock is held. */
-+static void tg3_write_sig_legacy(struct tg3 *tp, int kind)
-+{
-+	if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
-+		switch (kind) {
-+		case RESET_KIND_INIT:
-+			tg3_write_mem(tp, NIC_SRAM_FW_DRV_STATE_MBOX,
-+				      DRV_STATE_START);
-+			break;
-+
-+		case RESET_KIND_SHUTDOWN:
-+			tg3_write_mem(tp, NIC_SRAM_FW_DRV_STATE_MBOX,
-+				      DRV_STATE_UNLOAD);
-+			break;
-+
-+		case RESET_KIND_SUSPEND:
-+			tg3_write_mem(tp, NIC_SRAM_FW_DRV_STATE_MBOX,
-+				      DRV_STATE_SUSPEND);
-+			break;
-+
-+		default:
-+			break;
-+		};
-+	}
-+}
-+
-+static void tg3_stop_fw(struct tg3 *);
-+
-+/* tp->lock is held. */
-+static int tg3_chip_reset(struct tg3 *tp)
-+{
-+	u32 val;
-+	u32 flags_save;
-+	int i;
-+
-+	if (!(tp->tg3_flags2 & TG3_FLG2_SUN_570X))
-+		tg3_nvram_lock(tp);
-+
-+	/*
-+	 * We must avoid the readl() that normally takes place.
-+	 * It locks machines, causes machine checks, and other
-+	 * fun things.  So, temporarily disable the 5701
-+	 * hardware workaround, while we do the reset.
-+	 */
-+	flags_save = tp->tg3_flags;
-+	tp->tg3_flags &= ~TG3_FLAG_5701_REG_WRITE_BUG;
-+
-+	/* do the reset */
-+	val = GRC_MISC_CFG_CORECLK_RESET;
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
-+		if (tr32(0x7e2c) == 0x60) {
-+			tw32(0x7e2c, 0x20);
-+		}
-+		if (tp->pci_chip_rev_id != CHIPREV_ID_5750_A0) {
-+			tw32(GRC_MISC_CFG, (1 << 29));
-+			val |= (1 << 29);
-+		}
-+	}
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-+		val |= GRC_MISC_CFG_KEEP_GPHY_POWER;
-+	tw32(GRC_MISC_CFG, val);
-+
-+	/* restore 5701 hardware bug workaround flag */
-+	tp->tg3_flags = flags_save;
-+
-+	/* Unfortunately, we have to delay before the PCI read back.
-+	 * Some 575X chips even will not respond to a PCI cfg access
-+	 * when the reset command is given to the chip.
-+	 *
-+	 * How do these hardware designers expect things to work
-+	 * properly if the PCI write is posted for a long period
-+	 * of time?  It is always necessary to have some method by
-+	 * which a register read back can occur to push the write
-+	 * out which does the reset.
-+	 *
-+	 * For most tg3 variants the trick below was working.
-+	 * Ho hum...
-+	 */
-+	udelay(120);
-+
-+	/* Flush PCI posted writes.  The normal MMIO registers
-+	 * are inaccessible at this time so this is the only
-+	 * way to make this reliably (actually, this is no longer
-+	 * the case, see above).  I tried to use indirect
-+	 * register read/write but this upset some 5701 variants.
-+	 */
-+	pci_read_config_dword(tp->pdev, PCI_COMMAND, &val);
-+
-+	udelay(120);
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
-+		if (tp->pci_chip_rev_id == CHIPREV_ID_5750_A0) {
-+			int i;
-+			u32 cfg_val;
-+
-+			/* Wait for link training to complete.  */
-+			for (i = 0; i < 5000; i++)
-+				udelay(100);
-+
-+			pci_read_config_dword(tp->pdev, 0xc4, &cfg_val);
-+			pci_write_config_dword(tp->pdev, 0xc4,
-+					       cfg_val | (1 << 15));
-+		}
-+		/* Set PCIE max payload size and clear error status.  */
-+		pci_write_config_dword(tp->pdev, 0xd8, 0xf5000);
-+	}
-+
-+	/* Re-enable indirect register accesses. */
-+	pci_write_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
-+			       tp->misc_host_ctrl);
-+
-+	/* Set MAX PCI retry to zero. */
-+	val = (PCISTATE_ROM_ENABLE | PCISTATE_ROM_RETRY_ENABLE);
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0 &&
-+	    (tp->tg3_flags & TG3_FLAG_PCIX_MODE))
-+		val |= PCISTATE_RETRY_SAME_DMA;
-+	pci_write_config_dword(tp->pdev, TG3PCI_PCISTATE, val);
-+
-+	pci_restore_state(tp->pdev);
-+
-+	/* Make sure PCI-X relaxed ordering bit is clear. */
-+	pci_read_config_dword(tp->pdev, TG3PCI_X_CAPS, &val);
-+	val &= ~PCIX_CAPS_RELAXED_ORDERING;
-+	pci_write_config_dword(tp->pdev, TG3PCI_X_CAPS, val);
-+
-+	tw32(MEMARB_MODE, MEMARB_MODE_ENABLE);
-+
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5750_A3) {
-+		tg3_stop_fw(tp);
-+		tw32(0x5000, 0x400);
-+	}
-+
-+	tw32(GRC_MODE, tp->grc_mode);
-+
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
-+		u32 val = tr32(0xc4);
-+
-+		tw32(0xc4, val | (1 << 15));
-+	}
-+
-+	if ((tp->nic_sram_data_cfg & NIC_SRAM_DATA_CFG_MINI_PCI) != 0 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
-+		tp->pci_clock_ctrl |= CLOCK_CTRL_CLKRUN_OENABLE;
-+		if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0)
-+			tp->pci_clock_ctrl |= CLOCK_CTRL_FORCE_CLKRUN;
-+		tw32(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl);
-+	}
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
-+		tp->mac_mode = MAC_MODE_PORT_MODE_TBI;
-+		tw32_f(MAC_MODE, tp->mac_mode);
-+	} else
-+		tw32_f(MAC_MODE, 0);
-+	udelay(40);
-+
-+	/* Wait for firmware initialization to complete. */
-+	for (i = 0; i < 100000; i++) {
-+		tg3_read_mem(tp, NIC_SRAM_FIRMWARE_MBOX, &val);
-+		if (val == ~NIC_SRAM_FIRMWARE_MBOX_MAGIC1)
-+			break;
-+		udelay(10);
-+	}
-+	if (i >= 100000 &&
-+	    !(tp->tg3_flags2 & TG3_FLG2_SUN_570X)) {
-+		printk(KERN_ERR PFX "tg3_reset_hw timed out for %s, "
-+		       "firmware will not restart magic=%08x\n",
-+		       tp->dev->name, val);
-+		return -ENODEV;
-+	}
-+
-+	if ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) &&
-+	    tp->pci_chip_rev_id != CHIPREV_ID_5750_A0) {
-+		u32 val = tr32(0x7c00);
-+
-+		tw32(0x7c00, val | (1 << 25));
-+	}
-+
-+	/* Reprobe ASF enable state.  */
-+	tp->tg3_flags &= ~TG3_FLAG_ENABLE_ASF;
-+	tp->tg3_flags2 &= ~TG3_FLG2_ASF_NEW_HANDSHAKE;
-+	tg3_read_mem(tp, NIC_SRAM_DATA_SIG, &val);
-+	if (val == NIC_SRAM_DATA_SIG_MAGIC) {
-+		u32 nic_cfg;
-+
-+		tg3_read_mem(tp, NIC_SRAM_DATA_CFG, &nic_cfg);
-+		if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE) {
-+			tp->tg3_flags |= TG3_FLAG_ENABLE_ASF;
-+			if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-+				tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+/* tp->lock is held. */
-+static void tg3_stop_fw(struct tg3 *tp)
-+{
-+	if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
-+		u32 val;
-+		int i;
-+
-+		tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW);
-+		val = tr32(GRC_RX_CPU_EVENT);
-+		val |= (1 << 14);
-+		tw32(GRC_RX_CPU_EVENT, val);
-+
-+		/* Wait for RX cpu to ACK the event.  */
-+		for (i = 0; i < 100; i++) {
-+			if (!(tr32(GRC_RX_CPU_EVENT) & (1 << 14)))
-+				break;
-+			udelay(1);
-+		}
-+	}
-+}
-+
-+/* tp->lock is held. */
-+static int tg3_halt(struct tg3 *tp)
-+{
-+	int err;
-+
-+	tg3_stop_fw(tp);
-+
-+	tg3_write_sig_pre_reset(tp, RESET_KIND_SHUTDOWN);
-+
-+	tg3_abort_hw(tp);
-+	err = tg3_chip_reset(tp);
-+
-+	tg3_write_sig_legacy(tp, RESET_KIND_SHUTDOWN);
-+	tg3_write_sig_post_reset(tp, RESET_KIND_SHUTDOWN);
-+
-+	if (err)
-+		return err;
-+
-+	return 0;
-+}
-+
-+#define RX_CPU_SCRATCH_BASE	0x30000
-+#define RX_CPU_SCRATCH_SIZE	0x04000
-+#define TX_CPU_SCRATCH_BASE	0x34000
-+#define TX_CPU_SCRATCH_SIZE	0x04000
-+
-+/* tp->lock is held. */
-+static int tg3_halt_cpu(struct tg3 *tp, u32 offset)
-+{
-+	int i;
-+
-+	if (offset == TX_CPU_BASE &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)
-+		BUG();
-+
-+	if (offset == RX_CPU_BASE) {
-+		for (i = 0; i < 10000; i++) {
-+			tw32(offset + CPU_STATE, 0xffffffff);
-+			tw32(offset + CPU_MODE,  CPU_MODE_HALT);
-+			if (tr32(offset + CPU_MODE) & CPU_MODE_HALT)
-+				break;
-+		}
-+
-+		tw32(offset + CPU_STATE, 0xffffffff);
-+		tw32_f(offset + CPU_MODE,  CPU_MODE_HALT);
-+		udelay(10);
-+	} else {
-+		for (i = 0; i < 10000; i++) {
-+			tw32(offset + CPU_STATE, 0xffffffff);
-+			tw32(offset + CPU_MODE,  CPU_MODE_HALT);
-+			if (tr32(offset + CPU_MODE) & CPU_MODE_HALT)
-+				break;
-+		}
-+	}
-+
-+	if (i >= 10000) {
-+		printk(KERN_ERR PFX "tg3_reset_cpu timed out for %s, "
-+		       "and %s CPU\n",
-+		       tp->dev->name,
-+		       (offset == RX_CPU_BASE ? "RX" : "TX"));
-+		return -ENODEV;
-+	}
-+	return 0;
-+}
-+
-+struct fw_info {
-+	unsigned int text_base;
-+	unsigned int text_len;
-+	u32 *text_data;
-+	unsigned int rodata_base;
-+	unsigned int rodata_len;
-+	u32 *rodata_data;
-+	unsigned int data_base;
-+	unsigned int data_len;
-+	u32 *data_data;
-+	unsigned int sbss_len;
-+	unsigned int bss_len;
-+};
-+
-+/* We are forced to store these firmware bits in memory for the duration
-+ * of the module load, because they are loaded to hardware in a context
-+ * where it is unsafe to sleep, and fixing this would require a lot of
-+ * code refactoring.  :-P  However, they're only filled if the hardware
-+ * needs them; otherwise they are NULL and do not need to be dealt with.
-+ */
-+
-+static struct fw_info *tg3_fw_5701_a0;
-+
-+#if TG3_TSO_SUPPORT != 0
-+static struct fw_info *tg3_fw_tso;
-+static struct fw_info *tg3_fw_tso5;
-+#endif /* TG3_TSO_SUPPORT */
-+
-+/* Wipe out one fw_info structure; it must be fully allocated */
-+static void tg3_release_firmware(struct fw_info **info_ptr) {
-+	struct fw_info *info = *info_ptr;
-+	if (!info)
-+		return;
-+	kfree(info->data_data);
-+	kfree(info->rodata_data);
-+	kfree(info->text_data);
-+	kfree(info);
-+	*info_ptr = NULL;
-+}
-+
-+/* Allocate and fill 'info' from a file in userspace.
-+ * This *must* be called in user context where sleeping is allowed.
-+ * We require the firmware file to be in a certain binary format:
-+ * little-endian (so that it's platform-independent -- heh)
-+ * struct fw_info fields in this order:
-+ * text_base, text_len, rodata_base, rodata_len, data_base, data_len
-+ * ('unsigned int' fields as 32-bit integers)
-+ * text_data, rodata_data, data_data
-+ * ('u32*' fields as a whole bunch of 32-bit integers)
-+ */
-+static int __devinit tg3_request_firmware(struct fw_info **info_ptr,
-+					  const char *filename,
-+					  const struct tg3 *tp)
-+{
-+	int err, i;
-+	int text_zero, rodata_zero, data_zero;
-+	const struct firmware *fw_entry;
-+	struct fw_info *info;
-+	u32 *data;
-+	unsigned int len;
-+
-+	if (*info_ptr)
-+		return 0;
-+
-+	err = request_firmware(&fw_entry, filename, &tp->pdev->dev);
-+	if (err) {
-+		printk(KERN_WARNING PFX "tg3_request_firmware (%s): "
-+		       "Couldn't get firmware \"%s\".\n",
-+		       tp->dev->name, filename);
-+		goto cleanup_out;
-+	}
-+
-+	len = fw_entry->size;
-+	if (len < 44) {
-+		printk(KERN_WARNING PFX "tg3_request_firmware (%s): "
-+		       "Firmware \"%s\" is too short.\n",
-+		       tp->dev->name, filename);
-+		err = -EINVAL;
-+		goto cleanup_firmware;
-+	}
-+	len -= 44;
-+
-+	info = kmalloc(sizeof(*info), GFP_KERNEL);
-+	if (!info) {
-+		err = -ENOMEM;
-+		goto cleanup_firmware;
-+	}
-+
-+	data = (u32 *)fw_entry->data;
-+
-+	info->text_base = le32_to_cpu(data[0]);
-+	info->text_len = le32_to_cpu(data[1]);
-+	text_zero = data[2];
-+
-+	info->rodata_base = le32_to_cpu(data[3]);
-+	info->rodata_len = le32_to_cpu(data[4]);
-+	rodata_zero = data[5];
-+
-+	info->data_base = le32_to_cpu(data[6]);
-+	info->data_len = le32_to_cpu(data[7]);
-+	data_zero = data[8];
-+
-+	info->sbss_len = le32_to_cpu(data[9]);
-+	info->bss_len = le32_to_cpu(data[10]);
-+
-+	data += 11;
-+
-+	if (len != (!text_zero ? info->text_len : 0) +
-+		   (!rodata_zero ? info->rodata_len : 0) +
-+		   (!data_zero ? info->data_len : 0)) {
-+		printk(KERN_WARNING PFX "tg3_request_firmware (%s): "
-+		       "Firmware \"%s\" length doesn't add up.\n",
-+		       tp->dev->name, filename);
-+		err = -EINVAL;
-+		goto cleanup_info;
-+	}
-+
-+	info->text_data = NULL;
-+	if (!text_zero) {
-+		info->text_data = kmalloc(info->text_len, GFP_KERNEL);
-+		if (info->text_data == NULL) {
-+			err = -ENOMEM;
-+			goto cleanup_info;
-+		}
-+		for (i = 0; i < info->text_len / 4; i++)
-+			info->text_data[i] = le32_to_cpu(*data++);
-+	}
-+
-+	info->rodata_data = NULL;
-+	if (!rodata_zero) {
-+		info->rodata_data = kmalloc(info->rodata_len, GFP_KERNEL);
-+		if (info->rodata_data == NULL) {
-+			err = -ENOMEM;
-+			goto cleanup_text;
-+		}
-+		for (i = 0; i < info->rodata_len / 4; i++)
-+			info->rodata_data[i] = le32_to_cpu(*data++);
-+	}
-+
-+	info->data_data = NULL;
-+	if (!data_zero) {
-+		info->data_data = kmalloc(info->data_len, GFP_KERNEL);
-+		if (info->data_data == NULL) {
-+			err = -ENOMEM;
-+			goto cleanup_rodata;
-+		}
-+		for (i = 0; i < info->data_len / 4; i++)
-+			info->data_data[i] = le32_to_cpu(*data++);
-+	}
-+
-+	*info_ptr = info;
-+	err = 0;
-+
-+cleanup_firmware:
-+	release_firmware(fw_entry);
-+cleanup_out:
-+	return err;
-+
-+cleanup_rodata:
-+	kfree(info->rodata_data);
-+cleanup_text:
-+	kfree(info->text_data);
-+cleanup_info:
-+	kfree(info);
-+	goto cleanup_firmware;
-+}
-+
-+/* tp->lock is held. */
-+static int tg3_load_firmware_cpu(struct tg3 *tp, u32 cpu_base, u32 cpu_scratch_base,
-+				 int cpu_scratch_size, struct fw_info *info)
-+{
-+	int err, i;
-+	u32 orig_tg3_flags = tp->tg3_flags;
-+	void (*write_op)(struct tg3 *, u32, u32);
-+
-+	if (cpu_base == TX_CPU_BASE &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
-+		printk(KERN_ERR PFX "tg3_load_firmware_cpu: Trying to load "
-+		       "TX cpu firmware on %s which is 5705.\n",
-+		       tp->dev->name);
-+		return -EINVAL;
-+	}
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)
-+		write_op = tg3_write_mem;
-+	else
-+		write_op = tg3_write_indirect_reg32;
-+
-+	/* Force use of PCI config space for indirect register
-+	 * write calls.
-+	 */
-+	tp->tg3_flags |= TG3_FLAG_PCIX_TARGET_HWBUG;
-+
-+	err = tg3_halt_cpu(tp, cpu_base);
-+	if (err)
-+		goto out;
-+
-+	for (i = 0; i < cpu_scratch_size; i += sizeof(u32))
-+		write_op(tp, cpu_scratch_base + i, 0);
-+	tw32(cpu_base + CPU_STATE, 0xffffffff);
-+	tw32(cpu_base + CPU_MODE, tr32(cpu_base+CPU_MODE)|CPU_MODE_HALT);
-+	for (i = 0; i < (info->text_len / sizeof(u32)); i++)
-+		write_op(tp, (cpu_scratch_base +
-+			      (info->text_base & 0xffff) +
-+			      (i * sizeof(u32))),
-+			 (info->text_data ?
-+			  info->text_data[i] : 0));
-+	for (i = 0; i < (info->rodata_len / sizeof(u32)); i++)
-+		write_op(tp, (cpu_scratch_base +
-+			      (info->rodata_base & 0xffff) +
-+			      (i * sizeof(u32))),
-+			 (info->rodata_data ?
-+			  info->rodata_data[i] : 0));
-+	for (i = 0; i < (info->data_len / sizeof(u32)); i++)
-+		write_op(tp, (cpu_scratch_base +
-+			      (info->data_base & 0xffff) +
-+			      (i * sizeof(u32))),
-+			 (info->data_data ?
-+			  info->data_data[i] : 0));
-+
-+	err = 0;
-+
-+out:
-+	tp->tg3_flags = orig_tg3_flags;
-+	return err;
-+}
-+
-+/* tp->lock is held. */
-+static int tg3_load_5701_a0_firmware_fix(struct tg3 *tp)
-+{
-+	int err, i;
-+
-+	err = tg3_load_firmware_cpu(tp, RX_CPU_BASE,
-+				    RX_CPU_SCRATCH_BASE, RX_CPU_SCRATCH_SIZE,
-+				    tg3_fw_5701_a0);
-+	if (err)
-+		return err;
-+
-+	err = tg3_load_firmware_cpu(tp, TX_CPU_BASE,
-+				    TX_CPU_SCRATCH_BASE, TX_CPU_SCRATCH_SIZE,
-+				    tg3_fw_5701_a0);
-+	if (err)
-+		return err;
-+
-+	/* Now startup only the RX cpu. */
-+	tw32(RX_CPU_BASE + CPU_STATE, 0xffffffff);
-+	tw32_f(RX_CPU_BASE + CPU_PC, tg3_fw_5701_a0->text_base);
-+
-+	for (i = 0; i < 5; i++) {
-+		if (tr32(RX_CPU_BASE + CPU_PC) == tg3_fw_5701_a0->text_base)
-+			break;
-+		tw32(RX_CPU_BASE + CPU_STATE, 0xffffffff);
-+		tw32(RX_CPU_BASE + CPU_MODE,  CPU_MODE_HALT);
-+		tw32_f(RX_CPU_BASE + CPU_PC,  tg3_fw_5701_a0->text_base);
-+		udelay(1000);
-+	}
-+	if (i >= 5) {
-+		printk(KERN_ERR PFX "tg3_load_firmware fails for %s "
-+		       "to set RX CPU PC, is %08x should be %08x\n",
-+		       tp->dev->name, tr32(RX_CPU_BASE + CPU_PC),
-+		       tg3_fw_5701_a0->text_base);
-+		return -ENODEV;
-+	}
-+	tw32(RX_CPU_BASE + CPU_STATE, 0xffffffff);
-+	tw32_f(RX_CPU_BASE + CPU_MODE,  0x00000000);
-+
-+	return 0;
-+}
-+
-+#if TG3_TSO_SUPPORT != 0
-+
-+/* tp->lock is held. */
-+static int tg3_load_tso_firmware(struct tg3 *tp)
-+{
-+	struct fw_info *info;
-+	unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
-+	int err, i;
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-+		return 0;
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
-+		info = tg3_fw_tso5;
-+		cpu_base = RX_CPU_BASE;
-+		cpu_scratch_base = NIC_SRAM_MBUF_POOL_BASE5705;
-+		cpu_scratch_size = (info->text_len +
-+				    info->rodata_len +
-+				    info->data_len +
-+				    info->sbss_len +
-+				    info->bss_len);
-+	} else {
-+		info = tg3_fw_tso;
-+		cpu_base = TX_CPU_BASE;
-+		cpu_scratch_base = TX_CPU_SCRATCH_BASE;
-+		cpu_scratch_size = TX_CPU_SCRATCH_SIZE;
-+	}
-+
-+	err = tg3_load_firmware_cpu(tp, cpu_base,
-+				    cpu_scratch_base, cpu_scratch_size,
-+				    info);
-+	if (err)
-+		return err;
-+
-+	/* Now startup the cpu. */
-+	tw32(cpu_base + CPU_STATE, 0xffffffff);
-+	tw32_f(cpu_base + CPU_PC,  info->text_base);
-+
-+	for (i = 0; i < 5; i++) {
-+		if (tr32(cpu_base + CPU_PC) == info->text_base)
-+			break;
-+		tw32(cpu_base + CPU_STATE, 0xffffffff);
-+		tw32(cpu_base + CPU_MODE,  CPU_MODE_HALT);
-+		tw32_f(cpu_base + CPU_PC,  info->text_base);
-+		udelay(1000);
-+	}
-+	if (i >= 5) {
-+		printk(KERN_ERR PFX "tg3_load_tso_firmware fails for %s "
-+		       "to set CPU PC, is %08x should be %08x\n",
-+		       tp->dev->name, tr32(cpu_base + CPU_PC),
-+		       info->text_base);
-+		return -ENODEV;
-+	}
-+	tw32(cpu_base + CPU_STATE, 0xffffffff);
-+	tw32_f(cpu_base + CPU_MODE,  0x00000000);
-+	return 0;
-+}
-+
-+#endif /* TG3_TSO_SUPPORT != 0 */
-+
-+/* tp->lock is held. */
-+static void __tg3_set_mac_addr(struct tg3 *tp)
-+{
-+	u32 addr_high, addr_low;
-+	int i;
-+
-+	addr_high = ((tp->dev->dev_addr[0] << 8) |
-+		     tp->dev->dev_addr[1]);
-+	addr_low = ((tp->dev->dev_addr[2] << 24) |
-+		    (tp->dev->dev_addr[3] << 16) |
-+		    (tp->dev->dev_addr[4] <<  8) |
-+		    (tp->dev->dev_addr[5] <<  0));
-+	for (i = 0; i < 4; i++) {
-+		tw32(MAC_ADDR_0_HIGH + (i * 8), addr_high);
-+		tw32(MAC_ADDR_0_LOW + (i * 8), addr_low);
-+	}
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
-+		for (i = 0; i < 12; i++) {
-+			tw32(MAC_EXTADDR_0_HIGH + (i * 8), addr_high);
-+			tw32(MAC_EXTADDR_0_LOW + (i * 8), addr_low);
-+		}
-+	}
-+
-+	addr_high = (tp->dev->dev_addr[0] +
-+		     tp->dev->dev_addr[1] +
-+		     tp->dev->dev_addr[2] +
-+		     tp->dev->dev_addr[3] +
-+		     tp->dev->dev_addr[4] +
-+		     tp->dev->dev_addr[5]) &
-+		TX_BACKOFF_SEED_MASK;
-+	tw32(MAC_TX_BACKOFF_SEED, addr_high);
-+}
-+
-+static int tg3_set_mac_addr(struct net_device *dev, void *p)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+	struct sockaddr *addr = p;
-+
-+	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-+
-+	spin_lock_irq(&tp->lock);
-+	__tg3_set_mac_addr(tp);
-+	spin_unlock_irq(&tp->lock);
-+
-+	return 0;
-+}
-+
-+/* tp->lock is held. */
-+static void tg3_set_bdinfo(struct tg3 *tp, u32 bdinfo_addr,
-+			   dma_addr_t mapping, u32 maxlen_flags,
-+			   u32 nic_addr)
-+{
-+	tg3_write_mem(tp,
-+		      (bdinfo_addr + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_HIGH),
-+		      ((u64) mapping >> 32));
-+	tg3_write_mem(tp,
-+		      (bdinfo_addr + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW),
-+		      ((u64) mapping & 0xffffffff));
-+	tg3_write_mem(tp,
-+		      (bdinfo_addr + TG3_BDINFO_MAXLEN_FLAGS),
-+		       maxlen_flags);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705)
-+		tg3_write_mem(tp,
-+			      (bdinfo_addr + TG3_BDINFO_NIC_ADDR),
-+			      nic_addr);
-+}
-+
-+static void __tg3_set_rx_mode(struct net_device *);
-+
-+/* tp->lock is held. */
-+static int tg3_reset_hw(struct tg3 *tp)
-+{
-+	u32 val, rdmac_mode;
-+	int i, err, limit;
-+
-+	tg3_disable_ints(tp);
-+
-+	tg3_stop_fw(tp);
-+
-+	tg3_write_sig_pre_reset(tp, RESET_KIND_INIT);
-+
-+	if (tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) {
-+		err = tg3_abort_hw(tp);
-+		if (err)
-+			return err;
-+	}
-+
-+	err = tg3_chip_reset(tp);
-+	if (err)
-+		return err;
-+
-+	tg3_write_sig_legacy(tp, RESET_KIND_INIT);
-+
-+	/* This works around an issue with Athlon chipsets on
-+	 * B3 tigon3 silicon.  This bit has no effect on any
-+	 * other revision.  But do not set this on PCI Express
-+	 * chips.
-+	 */
-+	if (!(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS))
-+		tp->pci_clock_ctrl |= CLOCK_CTRL_DELAY_PCI_GRANT;
-+	tw32_f(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl);
-+
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0 &&
-+	    (tp->tg3_flags & TG3_FLAG_PCIX_MODE)) {
-+		val = tr32(TG3PCI_PCISTATE);
-+		val |= PCISTATE_RETRY_SAME_DMA;
-+		tw32(TG3PCI_PCISTATE, val);
-+	}
-+
-+	if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5704_BX) {
-+		/* Enable some hw fixes.  */
-+		val = tr32(TG3PCI_MSI_DATA);
-+		val |= (1 << 26) | (1 << 28) | (1 << 29);
-+		tw32(TG3PCI_MSI_DATA, val);
-+	}
-+
-+	/* Descriptor ring init may make accesses to the
-+	 * NIC SRAM area to setup the TX descriptors, so we
-+	 * can only do this after the hardware has been
-+	 * successfully reset.
-+	 */
-+	tg3_init_rings(tp);
-+
-+	/* This value is determined during the probe time DMA
-+	 * engine test, tg3_test_dma.
-+	 */
-+	tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);
-+
-+	tp->grc_mode &= ~(GRC_MODE_HOST_SENDBDS |
-+			  GRC_MODE_4X_NIC_SEND_RINGS |
-+			  GRC_MODE_NO_TX_PHDR_CSUM |
-+			  GRC_MODE_NO_RX_PHDR_CSUM);
-+	tp->grc_mode |= GRC_MODE_HOST_SENDBDS;
-+	if (tp->tg3_flags & TG3_FLAG_NO_TX_PSEUDO_CSUM)
-+		tp->grc_mode |= GRC_MODE_NO_TX_PHDR_CSUM;
-+	if (tp->tg3_flags & TG3_FLAG_NO_RX_PSEUDO_CSUM)
-+		tp->grc_mode |= GRC_MODE_NO_RX_PHDR_CSUM;
-+
-+	tw32(GRC_MODE,
-+	     tp->grc_mode |
-+	     (GRC_MODE_IRQ_ON_MAC_ATTN | GRC_MODE_HOST_STACKUP));
-+
-+	/* Setup the timer prescalar register.  Clock is always 66Mhz. */
-+	val = tr32(GRC_MISC_CFG);
-+	val &= ~0xff;
-+	val |= (65 << GRC_MISC_CFG_PRESCALAR_SHIFT);
-+	tw32(GRC_MISC_CFG, val);
-+
-+	/* Initialize MBUF/DESC pool. */
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+		/* Do nothing.  */
-+	} else if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
-+		tw32(BUFMGR_MB_POOL_ADDR, NIC_SRAM_MBUF_POOL_BASE);
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)
-+			tw32(BUFMGR_MB_POOL_SIZE, NIC_SRAM_MBUF_POOL_SIZE64);
-+		else
-+			tw32(BUFMGR_MB_POOL_SIZE, NIC_SRAM_MBUF_POOL_SIZE96);
-+		tw32(BUFMGR_DMA_DESC_POOL_ADDR, NIC_SRAM_DMA_DESC_POOL_BASE);
-+		tw32(BUFMGR_DMA_DESC_POOL_SIZE, NIC_SRAM_DMA_DESC_POOL_SIZE);
-+	}
-+#if TG3_TSO_SUPPORT != 0
-+	else if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) {
-+		int fw_len;
-+
-+		fw_len = (tg3_fw_tso5->text_len +
-+			  tg3_fw_tso5->rodata_len +
-+			  tg3_fw_tso5->data_len +
-+			  tg3_fw_tso5->sbss_len +
-+			  tg3_fw_tso5->bss_len);
-+		fw_len = (fw_len + (0x80 - 1)) & ~(0x80 - 1);
-+		tw32(BUFMGR_MB_POOL_ADDR,
-+		     NIC_SRAM_MBUF_POOL_BASE5705 + fw_len);
-+		tw32(BUFMGR_MB_POOL_SIZE,
-+		     NIC_SRAM_MBUF_POOL_SIZE5705 - fw_len - 0xa00);
-+	}
-+#endif
-+
-+	if (!(tp->tg3_flags & TG3_FLAG_JUMBO_ENABLE)) {
-+		tw32(BUFMGR_MB_RDMA_LOW_WATER,
-+		     tp->bufmgr_config.mbuf_read_dma_low_water);
-+		tw32(BUFMGR_MB_MACRX_LOW_WATER,
-+		     tp->bufmgr_config.mbuf_mac_rx_low_water);
-+		tw32(BUFMGR_MB_HIGH_WATER,
-+		     tp->bufmgr_config.mbuf_high_water);
-+	} else {
-+		tw32(BUFMGR_MB_RDMA_LOW_WATER,
-+		     tp->bufmgr_config.mbuf_read_dma_low_water_jumbo);
-+		tw32(BUFMGR_MB_MACRX_LOW_WATER,
-+		     tp->bufmgr_config.mbuf_mac_rx_low_water_jumbo);
-+		tw32(BUFMGR_MB_HIGH_WATER,
-+		     tp->bufmgr_config.mbuf_high_water_jumbo);
-+	}
-+	tw32(BUFMGR_DMA_LOW_WATER,
-+	     tp->bufmgr_config.dma_low_water);
-+	tw32(BUFMGR_DMA_HIGH_WATER,
-+	     tp->bufmgr_config.dma_high_water);
-+
-+	tw32(BUFMGR_MODE, BUFMGR_MODE_ENABLE | BUFMGR_MODE_ATTN_ENABLE);
-+	for (i = 0; i < 2000; i++) {
-+		if (tr32(BUFMGR_MODE) & BUFMGR_MODE_ENABLE)
-+			break;
-+		udelay(10);
-+	}
-+	if (i >= 2000) {
-+		printk(KERN_ERR PFX "tg3_reset_hw cannot enable BUFMGR for %s.\n",
-+		       tp->dev->name);
-+		return -ENODEV;
-+	}
-+
-+	/* Setup replenish threshold. */
-+	tw32(RCVBDI_STD_THRESH, tp->rx_pending / 8);
-+
-+	/* Initialize TG3_BDINFO's at:
-+	 *  RCVDBDI_STD_BD:	standard eth size rx ring
-+	 *  RCVDBDI_JUMBO_BD:	jumbo frame rx ring
-+	 *  RCVDBDI_MINI_BD:	small frame rx ring (??? does not work)
-+	 *
-+	 * like so:
-+	 *  TG3_BDINFO_HOST_ADDR:	high/low parts of DMA address of ring
-+	 *  TG3_BDINFO_MAXLEN_FLAGS:	(rx max buffer size << 16) |
-+	 *                              ring attribute flags
-+	 *  TG3_BDINFO_NIC_ADDR:	location of descriptors in nic SRAM
-+	 *
-+	 * Standard receive ring @ NIC_SRAM_RX_BUFFER_DESC, 512 entries.
-+	 * Jumbo receive ring @ NIC_SRAM_RX_JUMBO_BUFFER_DESC, 256 entries.
-+	 *
-+	 * The size of each ring is fixed in the firmware, but the location is
-+	 * configurable.
-+	 */
-+	tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_HIGH,
-+	     ((u64) tp->rx_std_mapping >> 32));
-+	tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW,
-+	     ((u64) tp->rx_std_mapping & 0xffffffff));
-+	tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,
-+	     NIC_SRAM_RX_BUFFER_DESC);
-+
-+	/* Don't even try to program the JUMBO/MINI buffer descriptor
-+	 * configs on 5705.
-+	 */
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+		tw32(RCVDBDI_STD_BD + TG3_BDINFO_MAXLEN_FLAGS,
-+		     RX_STD_MAX_SIZE_5705 << BDINFO_FLAGS_MAXLEN_SHIFT);
-+	} else {
-+		tw32(RCVDBDI_STD_BD + TG3_BDINFO_MAXLEN_FLAGS,
-+		     RX_STD_MAX_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT);
-+
-+		tw32(RCVDBDI_MINI_BD + TG3_BDINFO_MAXLEN_FLAGS,
-+		     BDINFO_FLAGS_DISABLED);
-+
-+		/* Setup replenish threshold. */
-+		tw32(RCVBDI_JUMBO_THRESH, tp->rx_jumbo_pending / 8);
-+
-+		if (tp->tg3_flags & TG3_FLAG_JUMBO_ENABLE) {
-+			tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_HIGH,
-+			     ((u64) tp->rx_jumbo_mapping >> 32));
-+			tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW,
-+			     ((u64) tp->rx_jumbo_mapping & 0xffffffff));
-+			tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_MAXLEN_FLAGS,
-+			     RX_JUMBO_MAX_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT);
-+			tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_NIC_ADDR,
-+			     NIC_SRAM_RX_JUMBO_BUFFER_DESC);
-+		} else {
-+			tw32(RCVDBDI_JUMBO_BD + TG3_BDINFO_MAXLEN_FLAGS,
-+			     BDINFO_FLAGS_DISABLED);
-+		}
-+
-+	}
-+
-+	/* There is only one send ring on 5705/5750, no need to explicitly
-+	 * disable the others.
-+	 */
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750) {
-+		/* Clear out send RCB ring in SRAM. */
-+		for (i = NIC_SRAM_SEND_RCB; i < NIC_SRAM_RCV_RET_RCB; i += TG3_BDINFO_SIZE)
-+			tg3_write_mem(tp, i + TG3_BDINFO_MAXLEN_FLAGS,
-+				      BDINFO_FLAGS_DISABLED);
-+	}
-+
-+	tp->tx_prod = 0;
-+	tp->tx_cons = 0;
-+	tw32_mailbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW, 0);
-+	tw32_tx_mbox(MAILBOX_SNDNIC_PROD_IDX_0 + TG3_64BIT_REG_LOW, 0);
-+
-+	tg3_set_bdinfo(tp, NIC_SRAM_SEND_RCB,
-+		       tp->tx_desc_mapping,
-+		       (TG3_TX_RING_SIZE <<
-+			BDINFO_FLAGS_MAXLEN_SHIFT),
-+		       NIC_SRAM_TX_BUFFER_DESC);
-+
-+	/* There is only one receive return ring on 5705/5750, no need
-+	 * to explicitly disable the others.
-+	 */
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750) {
-+		for (i = NIC_SRAM_RCV_RET_RCB; i < NIC_SRAM_STATS_BLK;
-+		     i += TG3_BDINFO_SIZE) {
-+			tg3_write_mem(tp, i + TG3_BDINFO_MAXLEN_FLAGS,
-+				      BDINFO_FLAGS_DISABLED);
-+		}
-+	}
-+
-+	tp->rx_rcb_ptr = 0;
-+	tw32_rx_mbox(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW, 0);
-+
-+	tg3_set_bdinfo(tp, NIC_SRAM_RCV_RET_RCB,
-+		       tp->rx_rcb_mapping,
-+		       (TG3_RX_RCB_RING_SIZE(tp) <<
-+			BDINFO_FLAGS_MAXLEN_SHIFT),
-+		       0);
-+
-+	tp->rx_std_ptr = tp->rx_pending;
-+	tw32_rx_mbox(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW,
-+		     tp->rx_std_ptr);
-+
-+	tp->rx_jumbo_ptr = (tp->tg3_flags & TG3_FLAG_JUMBO_ENABLE) ?
-+						tp->rx_jumbo_pending : 0;
-+	tw32_rx_mbox(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW,
-+		     tp->rx_jumbo_ptr);
-+
-+	/* Initialize MAC address and backoff seed. */
-+	__tg3_set_mac_addr(tp);
-+
-+	/* MTU + ethernet header + FCS + optional VLAN tag */
-+	tw32(MAC_RX_MTU_SIZE, tp->dev->mtu + ETH_HLEN + 8);
-+
-+	/* The slot time is changed by tg3_setup_phy if we
-+	 * run at gigabit with half duplex.
-+	 */
-+	tw32(MAC_TX_LENGTHS,
-+	     (2 << TX_LENGTHS_IPG_CRS_SHIFT) |
-+	     (6 << TX_LENGTHS_IPG_SHIFT) |
-+	     (32 << TX_LENGTHS_SLOT_TIME_SHIFT));
-+
-+	/* Receive rules. */
-+	tw32(MAC_RCV_RULE_CFG, RCV_RULE_CFG_DEFAULT_CLASS);
-+	tw32(RCVLPC_CONFIG, 0x0181);
-+
-+	/* Calculate RDMAC_MODE setting early, we need it to determine
-+	 * the RCVLPC_STATE_ENABLE mask.
-+	 */
-+	rdmac_mode = (RDMAC_MODE_ENABLE | RDMAC_MODE_TGTABORT_ENAB |
-+		      RDMAC_MODE_MSTABORT_ENAB | RDMAC_MODE_PARITYERR_ENAB |
-+		      RDMAC_MODE_ADDROFLOW_ENAB | RDMAC_MODE_FIFOOFLOW_ENAB |
-+		      RDMAC_MODE_FIFOURUN_ENAB | RDMAC_MODE_FIFOOREAD_ENAB |
-+		      RDMAC_MODE_LNGREAD_ENAB);
-+	if (tp->tg3_flags & TG3_FLAG_SPLIT_MODE)
-+		rdmac_mode |= RDMAC_MODE_SPLIT_ENABLE;
-+	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
-+	     tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
-+	    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)) {
-+		if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE &&
-+		    (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
-+		     tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {
-+			rdmac_mode |= RDMAC_MODE_FIFO_SIZE_128;
-+		} else if (!(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) &&
-+			   !(tp->tg3_flags2 & TG3_FLG2_IS_5788)) {
-+			rdmac_mode |= RDMAC_MODE_FIFO_LONG_BURST;
-+		}
-+	}
-+
-+#if TG3_TSO_SUPPORT != 0
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-+		rdmac_mode |= (1 << 27);
-+#endif
-+
-+	/* Receive/send statistics. */
-+	if ((rdmac_mode & RDMAC_MODE_FIFO_SIZE_128) &&
-+	    (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE)) {
-+		val = tr32(RCVLPC_STATS_ENABLE);
-+		val &= ~RCVLPC_STATSENAB_LNGBRST_RFIX;
-+		tw32(RCVLPC_STATS_ENABLE, val);
-+	} else {
-+		tw32(RCVLPC_STATS_ENABLE, 0xffffff);
-+	}
-+	tw32(RCVLPC_STATSCTRL, RCVLPC_STATSCTRL_ENABLE);
-+	tw32(SNDDATAI_STATSENAB, 0xffffff);
-+	tw32(SNDDATAI_STATSCTRL,
-+	     (SNDDATAI_SCTRL_ENABLE |
-+	      SNDDATAI_SCTRL_FASTUPD));
-+
-+	/* Setup host coalescing engine. */
-+	tw32(HOSTCC_MODE, 0);
-+	for (i = 0; i < 2000; i++) {
-+		if (!(tr32(HOSTCC_MODE) & HOSTCC_MODE_ENABLE))
-+			break;
-+		udelay(10);
-+	}
-+
-+	tw32(HOSTCC_RXCOL_TICKS, 0);
-+	tw32(HOSTCC_TXCOL_TICKS, LOW_TXCOL_TICKS);
-+	tw32(HOSTCC_RXMAX_FRAMES, 1);
-+	tw32(HOSTCC_TXMAX_FRAMES, LOW_RXMAX_FRAMES);
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750) {
-+		tw32(HOSTCC_RXCOAL_TICK_INT, 0);
-+		tw32(HOSTCC_TXCOAL_TICK_INT, 0);
-+	}
-+	tw32(HOSTCC_RXCOAL_MAXF_INT, 1);
-+	tw32(HOSTCC_TXCOAL_MAXF_INT, 0);
-+
-+	/* set status block DMA address */
-+	tw32(HOSTCC_STATUS_BLK_HOST_ADDR + TG3_64BIT_REG_HIGH,
-+	     ((u64) tp->status_mapping >> 32));
-+	tw32(HOSTCC_STATUS_BLK_HOST_ADDR + TG3_64BIT_REG_LOW,
-+	     ((u64) tp->status_mapping & 0xffffffff));
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750) {
-+		/* Status/statistics block address.  See tg3_timer,
-+		 * the tg3_periodic_fetch_stats call there, and
-+		 * tg3_get_stats to see how this works for 5705/5750 chips.
-+		 */
-+		tw32(HOSTCC_STAT_COAL_TICKS,
-+		     DEFAULT_STAT_COAL_TICKS);
-+		tw32(HOSTCC_STATS_BLK_HOST_ADDR + TG3_64BIT_REG_HIGH,
-+		     ((u64) tp->stats_mapping >> 32));
-+		tw32(HOSTCC_STATS_BLK_HOST_ADDR + TG3_64BIT_REG_LOW,
-+		     ((u64) tp->stats_mapping & 0xffffffff));
-+		tw32(HOSTCC_STATS_BLK_NIC_ADDR, NIC_SRAM_STATS_BLK);
-+		tw32(HOSTCC_STATUS_BLK_NIC_ADDR, NIC_SRAM_STATUS_BLK);
-+	}
-+
-+	tw32(HOSTCC_MODE, HOSTCC_MODE_ENABLE | tp->coalesce_mode);
-+
-+	tw32(RCVCC_MODE, RCVCC_MODE_ENABLE | RCVCC_MODE_ATTN_ENABLE);
-+	tw32(RCVLPC_MODE, RCVLPC_MODE_ENABLE);
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750)
-+		tw32(RCVLSC_MODE, RCVLSC_MODE_ENABLE | RCVLSC_MODE_ATTN_ENABLE);
-+
-+	/* Clear statistics/status block in chip, and status block in ram. */
-+	for (i = NIC_SRAM_STATS_BLK;
-+	     i < NIC_SRAM_STATUS_BLK + TG3_HW_STATUS_SIZE;
-+	     i += sizeof(u32)) {
-+		tg3_write_mem(tp, i, 0);
-+		udelay(40);
-+	}
-+	memset(tp->hw_status, 0, TG3_HW_STATUS_SIZE);
-+
-+	tp->mac_mode = MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE |
-+		MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE | MAC_MODE_FHDE_ENABLE;
-+	tw32_f(MAC_MODE, tp->mac_mode | MAC_MODE_RXSTAT_CLEAR | MAC_MODE_TXSTAT_CLEAR);
-+	udelay(40);
-+
-+	tp->grc_local_ctrl = GRC_LCLCTRL_INT_ON_ATTN | GRC_LCLCTRL_AUTO_SEEPROM;
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700)
-+		tp->grc_local_ctrl |= (GRC_LCLCTRL_GPIO_OE1 |
-+				       GRC_LCLCTRL_GPIO_OUTPUT1);
-+	tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
-+	udelay(100);
-+
-+	tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0);
-+	tr32(MAILBOX_INTERRUPT_0);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750) {
-+		tw32_f(DMAC_MODE, DMAC_MODE_ENABLE);
-+		udelay(40);
-+	}
-+
-+	val = (WDMAC_MODE_ENABLE | WDMAC_MODE_TGTABORT_ENAB |
-+	       WDMAC_MODE_MSTABORT_ENAB | WDMAC_MODE_PARITYERR_ENAB |
-+	       WDMAC_MODE_ADDROFLOW_ENAB | WDMAC_MODE_FIFOOFLOW_ENAB |
-+	       WDMAC_MODE_FIFOURUN_ENAB | WDMAC_MODE_FIFOOREAD_ENAB |
-+	       WDMAC_MODE_LNGREAD_ENAB);
-+
-+	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
-+	     tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+		if ((tp->tg3_flags & TG3_FLG2_TSO_CAPABLE) &&
-+		    (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
-+		     tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {
-+			/* nothing */
-+		} else if (!(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) &&
-+			   !(tp->tg3_flags2 & TG3_FLG2_IS_5788) &&
-+			   !(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS)) {
-+			val |= WDMAC_MODE_RX_ACCEL;
-+		}
-+	}
-+
-+	tw32_f(WDMAC_MODE, val);
-+	udelay(40);
-+
-+	if ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) != 0) {
-+		val = tr32(TG3PCI_X_CAPS);
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) {
-+			val &= ~PCIX_CAPS_BURST_MASK;
-+			val |= (PCIX_CAPS_MAX_BURST_CPIOB << PCIX_CAPS_BURST_SHIFT);
-+		} else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
-+			val &= ~(PCIX_CAPS_SPLIT_MASK | PCIX_CAPS_BURST_MASK);
-+			val |= (PCIX_CAPS_MAX_BURST_CPIOB << PCIX_CAPS_BURST_SHIFT);
-+			if (tp->tg3_flags & TG3_FLAG_SPLIT_MODE)
-+				val |= (tp->split_mode_max_reqs <<
-+					PCIX_CAPS_SPLIT_SHIFT);
-+		}
-+		tw32(TG3PCI_X_CAPS, val);
-+	}
-+
-+	tw32_f(RDMAC_MODE, rdmac_mode);
-+	udelay(40);
-+
-+	tw32(RCVDCC_MODE, RCVDCC_MODE_ENABLE | RCVDCC_MODE_ATTN_ENABLE);
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750)
-+		tw32(MBFREE_MODE, MBFREE_MODE_ENABLE);
-+	tw32(SNDDATAC_MODE, SNDDATAC_MODE_ENABLE);
-+	tw32(SNDBDC_MODE, SNDBDC_MODE_ENABLE | SNDBDC_MODE_ATTN_ENABLE);
-+	tw32(RCVBDI_MODE, RCVBDI_MODE_ENABLE | RCVBDI_MODE_RCB_ATTN_ENAB);
-+	tw32(RCVDBDI_MODE, RCVDBDI_MODE_ENABLE | RCVDBDI_MODE_INV_RING_SZ);
-+	tw32(SNDDATAI_MODE, SNDDATAI_MODE_ENABLE);
-+#if TG3_TSO_SUPPORT != 0
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-+		tw32(SNDDATAI_MODE, SNDDATAI_MODE_ENABLE | 0x8);
-+#endif
-+	tw32(SNDBDI_MODE, SNDBDI_MODE_ENABLE | SNDBDI_MODE_ATTN_ENABLE);
-+	tw32(SNDBDS_MODE, SNDBDS_MODE_ENABLE | SNDBDS_MODE_ATTN_ENABLE);
-+
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0) {
-+		err = tg3_load_5701_a0_firmware_fix(tp);
-+		if (err)
-+			return err;
-+	}
-+
-+#if TG3_TSO_SUPPORT != 0
-+	if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) {
-+		err = tg3_load_tso_firmware(tp);
-+		if (err)
-+			return err;
-+	}
-+#endif
-+
-+	tp->tx_mode = TX_MODE_ENABLE;
-+	tw32_f(MAC_TX_MODE, tp->tx_mode);
-+	udelay(100);
-+
-+	tp->rx_mode = RX_MODE_ENABLE;
-+	tw32_f(MAC_RX_MODE, tp->rx_mode);
-+	udelay(10);
-+
-+	if (tp->link_config.phy_is_low_power) {
-+		tp->link_config.phy_is_low_power = 0;
-+		tp->link_config.speed = tp->link_config.orig_speed;
-+		tp->link_config.duplex = tp->link_config.orig_duplex;
-+		tp->link_config.autoneg = tp->link_config.orig_autoneg;
-+	}
-+
-+	tp->mi_mode = MAC_MI_MODE_BASE;
-+	tw32_f(MAC_MI_MODE, tp->mi_mode);
-+	udelay(80);
-+
-+	tw32(MAC_LED_CTRL, tp->led_ctrl);
-+
-+	tw32(MAC_MI_STAT, MAC_MI_STAT_LNKSTAT_ATTN_ENAB);
-+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
-+		tw32_f(MAC_RX_MODE, RX_MODE_RESET);
-+		udelay(10);
-+	}
-+	tw32_f(MAC_RX_MODE, tp->rx_mode);
-+	udelay(10);
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
-+			/* Set drive transmission level to 1.2V  */
-+			val = tr32(MAC_SERDES_CFG);
-+			val &= 0xfffff000;
-+			val |= 0x880;
-+			tw32(MAC_SERDES_CFG, val);
-+		}
-+		if (tp->pci_chip_rev_id == CHIPREV_ID_5703_A1)
-+			tw32(MAC_SERDES_CFG, 0x616000);
-+	}
-+
-+	/* Prevent chip from dropping frames when flow control
-+	 * is enabled.
-+	 */
-+	tw32_f(MAC_LOW_WMARK_MAX_RX_FRAME, 2);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 &&
-+	    (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
-+		/* Use hardware link auto-negotiation */
-+		tp->tg3_flags2 |= TG3_FLG2_HW_AUTONEG;
-+	}
-+
-+	err = tg3_setup_phy(tp, 1);
-+	if (err)
-+		return err;
-+
-+	if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
-+		u32 tmp;
-+
-+		/* Clear CRC stats. */
-+		tg3_readphy(tp, 0x1e, &tmp);
-+		tg3_writephy(tp, 0x1e, tmp | 0x8000);
-+		tg3_readphy(tp, 0x14, &tmp);
-+	}
-+
-+	__tg3_set_rx_mode(tp->dev);
-+
-+	/* Initialize receive rules. */
-+	tw32(MAC_RCV_RULE_0,  0xc2000000 & RCV_RULE_DISABLE_MASK);
-+	tw32(MAC_RCV_VALUE_0, 0xffffffff & RCV_RULE_DISABLE_MASK);
-+	tw32(MAC_RCV_RULE_1,  0x86000004 & RCV_RULE_DISABLE_MASK);
-+	tw32(MAC_RCV_VALUE_1, 0xffffffff & RCV_RULE_DISABLE_MASK);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-+		limit = 8;
-+	else
-+		limit = 16;
-+	if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF)
-+		limit -= 4;
-+	switch (limit) {
-+	case 16:
-+		tw32(MAC_RCV_RULE_15,  0); tw32(MAC_RCV_VALUE_15,  0);
-+	case 15:
-+		tw32(MAC_RCV_RULE_14,  0); tw32(MAC_RCV_VALUE_14,  0);
-+	case 14:
-+		tw32(MAC_RCV_RULE_13,  0); tw32(MAC_RCV_VALUE_13,  0);
-+	case 13:
-+		tw32(MAC_RCV_RULE_12,  0); tw32(MAC_RCV_VALUE_12,  0);
-+	case 12:
-+		tw32(MAC_RCV_RULE_11,  0); tw32(MAC_RCV_VALUE_11,  0);
-+	case 11:
-+		tw32(MAC_RCV_RULE_10,  0); tw32(MAC_RCV_VALUE_10,  0);
-+	case 10:
-+		tw32(MAC_RCV_RULE_9,  0); tw32(MAC_RCV_VALUE_9,  0);
-+	case 9:
-+		tw32(MAC_RCV_RULE_8,  0); tw32(MAC_RCV_VALUE_8,  0);
-+	case 8:
-+		tw32(MAC_RCV_RULE_7,  0); tw32(MAC_RCV_VALUE_7,  0);
-+	case 7:
-+		tw32(MAC_RCV_RULE_6,  0); tw32(MAC_RCV_VALUE_6,  0);
-+	case 6:
-+		tw32(MAC_RCV_RULE_5,  0); tw32(MAC_RCV_VALUE_5,  0);
-+	case 5:
-+		tw32(MAC_RCV_RULE_4,  0); tw32(MAC_RCV_VALUE_4,  0);
-+	case 4:
-+		/* tw32(MAC_RCV_RULE_3,  0); tw32(MAC_RCV_VALUE_3,  0); */
-+	case 3:
-+		/* tw32(MAC_RCV_RULE_2,  0); tw32(MAC_RCV_VALUE_2,  0); */
-+	case 2:
-+	case 1:
-+
-+	default:
-+		break;
-+	};
-+
-+	tg3_write_sig_post_reset(tp, RESET_KIND_INIT);
-+
-+	if (tp->tg3_flags & TG3_FLAG_INIT_COMPLETE)
-+		tg3_enable_ints(tp);
-+
-+	return 0;
-+}
-+
-+/* Called at device open time to get the chip ready for
-+ * packet processing.  Invoked with tp->lock held.
-+ */
-+static int tg3_init_hw(struct tg3 *tp)
-+{
-+	int err;
-+
-+	/* Force the chip into D0. */
-+	err = tg3_set_power_state(tp, 0);
-+	if (err)
-+		goto out;
-+
-+	tg3_switch_clocks(tp);
-+
-+	tw32(TG3PCI_MEM_WIN_BASE_ADDR, 0);
-+
-+	err = tg3_reset_hw(tp);
-+
-+out:
-+	return err;
-+}
-+
-+#define TG3_STAT_ADD32(PSTAT, REG) \
-+do {	u32 __val = tr32(REG); \
-+	(PSTAT)->low += __val; \
-+	if ((PSTAT)->low < __val) \
-+		(PSTAT)->high += 1; \
-+} while (0)
-+
-+static void tg3_periodic_fetch_stats(struct tg3 *tp)
-+{
-+	struct tg3_hw_stats *sp = tp->hw_stats;
-+
-+	if (!netif_carrier_ok(tp->dev))
-+		return;
-+
-+	TG3_STAT_ADD32(&sp->tx_octets, MAC_TX_STATS_OCTETS);
-+	TG3_STAT_ADD32(&sp->tx_collisions, MAC_TX_STATS_COLLISIONS);
-+	TG3_STAT_ADD32(&sp->tx_xon_sent, MAC_TX_STATS_XON_SENT);
-+	TG3_STAT_ADD32(&sp->tx_xoff_sent, MAC_TX_STATS_XOFF_SENT);
-+	TG3_STAT_ADD32(&sp->tx_mac_errors, MAC_TX_STATS_MAC_ERRORS);
-+	TG3_STAT_ADD32(&sp->tx_single_collisions, MAC_TX_STATS_SINGLE_COLLISIONS);
-+	TG3_STAT_ADD32(&sp->tx_mult_collisions, MAC_TX_STATS_MULT_COLLISIONS);
-+	TG3_STAT_ADD32(&sp->tx_deferred, MAC_TX_STATS_DEFERRED);
-+	TG3_STAT_ADD32(&sp->tx_excessive_collisions, MAC_TX_STATS_EXCESSIVE_COL);
-+	TG3_STAT_ADD32(&sp->tx_late_collisions, MAC_TX_STATS_LATE_COL);
-+	TG3_STAT_ADD32(&sp->tx_ucast_packets, MAC_TX_STATS_UCAST);
-+	TG3_STAT_ADD32(&sp->tx_mcast_packets, MAC_TX_STATS_MCAST);
-+	TG3_STAT_ADD32(&sp->tx_bcast_packets, MAC_TX_STATS_BCAST);
-+
-+	TG3_STAT_ADD32(&sp->rx_octets, MAC_RX_STATS_OCTETS);
-+	TG3_STAT_ADD32(&sp->rx_fragments, MAC_RX_STATS_FRAGMENTS);
-+	TG3_STAT_ADD32(&sp->rx_ucast_packets, MAC_RX_STATS_UCAST);
-+	TG3_STAT_ADD32(&sp->rx_mcast_packets, MAC_RX_STATS_MCAST);
-+	TG3_STAT_ADD32(&sp->rx_bcast_packets, MAC_RX_STATS_BCAST);
-+	TG3_STAT_ADD32(&sp->rx_fcs_errors, MAC_RX_STATS_FCS_ERRORS);
-+	TG3_STAT_ADD32(&sp->rx_align_errors, MAC_RX_STATS_ALIGN_ERRORS);
-+	TG3_STAT_ADD32(&sp->rx_xon_pause_rcvd, MAC_RX_STATS_XON_PAUSE_RECVD);
-+	TG3_STAT_ADD32(&sp->rx_xoff_pause_rcvd, MAC_RX_STATS_XOFF_PAUSE_RECVD);
-+	TG3_STAT_ADD32(&sp->rx_mac_ctrl_rcvd, MAC_RX_STATS_MAC_CTRL_RECVD);
-+	TG3_STAT_ADD32(&sp->rx_xoff_entered, MAC_RX_STATS_XOFF_ENTERED);
-+	TG3_STAT_ADD32(&sp->rx_frame_too_long_errors, MAC_RX_STATS_FRAME_TOO_LONG);
-+	TG3_STAT_ADD32(&sp->rx_jabbers, MAC_RX_STATS_JABBERS);
-+	TG3_STAT_ADD32(&sp->rx_undersize_packets, MAC_RX_STATS_UNDERSIZE);
-+}
-+
-+static void tg3_timer(unsigned long __opaque)
-+{
-+	struct tg3 *tp = (struct tg3 *) __opaque;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&tp->lock, flags);
-+	spin_lock(&tp->tx_lock);
-+
-+	/* All of this garbage is because when using non-tagged
-+	 * IRQ status the mailbox/status_block protocol the chip
-+	 * uses with the cpu is race prone.
-+	 */
-+	if (tp->hw_status->status & SD_STATUS_UPDATED) {
-+		tw32(GRC_LOCAL_CTRL,
-+		     tp->grc_local_ctrl | GRC_LCLCTRL_SETINT);
-+	} else {
-+		tw32(HOSTCC_MODE, tp->coalesce_mode |
-+		     (HOSTCC_MODE_ENABLE | HOSTCC_MODE_NOW));
-+	}
-+
-+	if (!(tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) {
-+		tp->tg3_flags2 |= TG3_FLG2_RESTART_TIMER;
-+		spin_unlock(&tp->tx_lock);
-+		spin_unlock_irqrestore(&tp->lock, flags);
-+		schedule_work(&tp->reset_task);
-+		return;
-+	}
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-+		tg3_periodic_fetch_stats(tp);
-+
-+	/* This part only runs once per second. */
-+	if (!--tp->timer_counter) {
-+		if (tp->tg3_flags & TG3_FLAG_USE_LINKCHG_REG) {
-+			u32 mac_stat;
-+			int phy_event;
-+
-+			mac_stat = tr32(MAC_STATUS);
-+
-+			phy_event = 0;
-+			if (tp->tg3_flags & TG3_FLAG_USE_MI_INTERRUPT) {
-+				if (mac_stat & MAC_STATUS_MI_INTERRUPT)
-+					phy_event = 1;
-+			} else if (mac_stat & MAC_STATUS_LNKSTATE_CHANGED)
-+				phy_event = 1;
-+
-+			if (phy_event)
-+				tg3_setup_phy(tp, 0);
-+		} else if (tp->tg3_flags & TG3_FLAG_POLL_SERDES) {
-+			u32 mac_stat = tr32(MAC_STATUS);
-+			int need_setup = 0;
-+
-+			if (netif_carrier_ok(tp->dev) &&
-+			    (mac_stat & MAC_STATUS_LNKSTATE_CHANGED)) {
-+				need_setup = 1;
-+			}
-+			if (! netif_carrier_ok(tp->dev) &&
-+			    (mac_stat & (MAC_STATUS_PCS_SYNCED |
-+					 MAC_STATUS_SIGNAL_DET))) {
-+				need_setup = 1;
-+			}
-+			if (need_setup) {
-+				tw32_f(MAC_MODE,
-+				     (tp->mac_mode &
-+				      ~MAC_MODE_PORT_MODE_MASK));
-+				udelay(40);
-+				tw32_f(MAC_MODE, tp->mac_mode);
-+				udelay(40);
-+				tg3_setup_phy(tp, 0);
-+			}
-+		}
-+
-+		tp->timer_counter = tp->timer_multiplier;
-+	}
-+
-+	/* Heartbeat is only sent once every 120 seconds.  */
-+	if (!--tp->asf_counter) {
-+		if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
-+			u32 val;
-+
-+			tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_ALIVE);
-+			tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);
-+			tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 3);
-+			val = tr32(GRC_RX_CPU_EVENT);
-+			val |= (1 << 14);
-+			tw32(GRC_RX_CPU_EVENT, val);
-+		}
-+		tp->asf_counter = tp->asf_multiplier;
-+	}
-+
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irqrestore(&tp->lock, flags);
-+
-+	tp->timer.expires = jiffies + tp->timer_offset;
-+	add_timer(&tp->timer);
-+}
-+
-+static int tg3_open(struct net_device *dev)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+	int err;
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+
-+	tg3_disable_ints(tp);
-+	tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
-+
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+
-+	/* The placement of this call is tied
-+	 * to the setup and use of Host TX descriptors.
-+	 */
-+	err = tg3_alloc_consistent(tp);
-+	if (err)
-+		return err;
-+
-+	err = request_irq(dev->irq, tg3_interrupt,
-+			  SA_SHIRQ, dev->name, dev);
-+
-+	if (err) {
-+		tg3_free_consistent(tp);
-+		return err;
-+	}
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+
-+	err = tg3_init_hw(tp);
-+	if (err) {
-+		tg3_halt(tp);
-+		tg3_free_rings(tp);
-+	} else {
-+		tp->timer_offset = HZ / 10;
-+		tp->timer_counter = tp->timer_multiplier = 10;
-+		tp->asf_counter = tp->asf_multiplier = (10 * 120);
-+
-+		init_timer(&tp->timer);
-+		tp->timer.expires = jiffies + tp->timer_offset;
-+		tp->timer.data = (unsigned long) tp;
-+		tp->timer.function = tg3_timer;
-+		add_timer(&tp->timer);
-+
-+		tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE;
-+	}
-+
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+
-+	if (err) {
-+		free_irq(dev->irq, dev);
-+		tg3_free_consistent(tp);
-+		return err;
-+	}
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+
-+	tg3_enable_ints(tp);
-+
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+
-+	netif_start_queue(dev);
-+
-+	return 0;
-+}
-+
-+#if 0
-+/*static*/ void tg3_dump_state(struct tg3 *tp)
-+{
-+	u32 val32, val32_2, val32_3, val32_4, val32_5;
-+	u16 val16;
-+	int i;
-+
-+	pci_read_config_word(tp->pdev, PCI_STATUS, &val16);
-+	pci_read_config_dword(tp->pdev, TG3PCI_PCISTATE, &val32);
-+	printk("DEBUG: PCI status [%04x] TG3PCI state[%08x]\n",
-+	       val16, val32);
-+
-+	/* MAC block */
-+	printk("DEBUG: MAC_MODE[%08x] MAC_STATUS[%08x]\n",
-+	       tr32(MAC_MODE), tr32(MAC_STATUS));
-+	printk("       MAC_EVENT[%08x] MAC_LED_CTRL[%08x]\n",
-+	       tr32(MAC_EVENT), tr32(MAC_LED_CTRL));
-+	printk("DEBUG: MAC_TX_MODE[%08x] MAC_TX_STATUS[%08x]\n",
-+	       tr32(MAC_TX_MODE), tr32(MAC_TX_STATUS));
-+	printk("       MAC_RX_MODE[%08x] MAC_RX_STATUS[%08x]\n",
-+	       tr32(MAC_RX_MODE), tr32(MAC_RX_STATUS));
-+
-+	/* Send data initiator control block */
-+	printk("DEBUG: SNDDATAI_MODE[%08x] SNDDATAI_STATUS[%08x]\n",
-+	       tr32(SNDDATAI_MODE), tr32(SNDDATAI_STATUS));
-+	printk("       SNDDATAI_STATSCTRL[%08x]\n",
-+	       tr32(SNDDATAI_STATSCTRL));
-+
-+	/* Send data completion control block */
-+	printk("DEBUG: SNDDATAC_MODE[%08x]\n", tr32(SNDDATAC_MODE));
-+
-+	/* Send BD ring selector block */
-+	printk("DEBUG: SNDBDS_MODE[%08x] SNDBDS_STATUS[%08x]\n",
-+	       tr32(SNDBDS_MODE), tr32(SNDBDS_STATUS));
-+
-+	/* Send BD initiator control block */
-+	printk("DEBUG: SNDBDI_MODE[%08x] SNDBDI_STATUS[%08x]\n",
-+	       tr32(SNDBDI_MODE), tr32(SNDBDI_STATUS));
-+
-+	/* Send BD completion control block */
-+	printk("DEBUG: SNDBDC_MODE[%08x]\n", tr32(SNDBDC_MODE));
-+
-+	/* Receive list placement control block */
-+	printk("DEBUG: RCVLPC_MODE[%08x] RCVLPC_STATUS[%08x]\n",
-+	       tr32(RCVLPC_MODE), tr32(RCVLPC_STATUS));
-+	printk("       RCVLPC_STATSCTRL[%08x]\n",
-+	       tr32(RCVLPC_STATSCTRL));
-+
-+	/* Receive data and receive BD initiator control block */
-+	printk("DEBUG: RCVDBDI_MODE[%08x] RCVDBDI_STATUS[%08x]\n",
-+	       tr32(RCVDBDI_MODE), tr32(RCVDBDI_STATUS));
-+
-+	/* Receive data completion control block */
-+	printk("DEBUG: RCVDCC_MODE[%08x]\n",
-+	       tr32(RCVDCC_MODE));
-+
-+	/* Receive BD initiator control block */
-+	printk("DEBUG: RCVBDI_MODE[%08x] RCVBDI_STATUS[%08x]\n",
-+	       tr32(RCVBDI_MODE), tr32(RCVBDI_STATUS));
-+
-+	/* Receive BD completion control block */
-+	printk("DEBUG: RCVCC_MODE[%08x] RCVCC_STATUS[%08x]\n",
-+	       tr32(RCVCC_MODE), tr32(RCVCC_STATUS));
-+
-+	/* Receive list selector control block */
-+	printk("DEBUG: RCVLSC_MODE[%08x] RCVLSC_STATUS[%08x]\n",
-+	       tr32(RCVLSC_MODE), tr32(RCVLSC_STATUS));
-+
-+	/* Mbuf cluster free block */
-+	printk("DEBUG: MBFREE_MODE[%08x] MBFREE_STATUS[%08x]\n",
-+	       tr32(MBFREE_MODE), tr32(MBFREE_STATUS));
-+
-+	/* Host coalescing control block */
-+	printk("DEBUG: HOSTCC_MODE[%08x] HOSTCC_STATUS[%08x]\n",
-+	       tr32(HOSTCC_MODE), tr32(HOSTCC_STATUS));
-+	printk("DEBUG: HOSTCC_STATS_BLK_HOST_ADDR[%08x%08x]\n",
-+	       tr32(HOSTCC_STATS_BLK_HOST_ADDR + TG3_64BIT_REG_HIGH),
-+	       tr32(HOSTCC_STATS_BLK_HOST_ADDR + TG3_64BIT_REG_LOW));
-+	printk("DEBUG: HOSTCC_STATUS_BLK_HOST_ADDR[%08x%08x]\n",
-+	       tr32(HOSTCC_STATUS_BLK_HOST_ADDR + TG3_64BIT_REG_HIGH),
-+	       tr32(HOSTCC_STATUS_BLK_HOST_ADDR + TG3_64BIT_REG_LOW));
-+	printk("DEBUG: HOSTCC_STATS_BLK_NIC_ADDR[%08x]\n",
-+	       tr32(HOSTCC_STATS_BLK_NIC_ADDR));
-+	printk("DEBUG: HOSTCC_STATUS_BLK_NIC_ADDR[%08x]\n",
-+	       tr32(HOSTCC_STATUS_BLK_NIC_ADDR));
-+
-+	/* Memory arbiter control block */
-+	printk("DEBUG: MEMARB_MODE[%08x] MEMARB_STATUS[%08x]\n",
-+	       tr32(MEMARB_MODE), tr32(MEMARB_STATUS));
-+
-+	/* Buffer manager control block */
-+	printk("DEBUG: BUFMGR_MODE[%08x] BUFMGR_STATUS[%08x]\n",
-+	       tr32(BUFMGR_MODE), tr32(BUFMGR_STATUS));
-+	printk("DEBUG: BUFMGR_MB_POOL_ADDR[%08x] BUFMGR_MB_POOL_SIZE[%08x]\n",
-+	       tr32(BUFMGR_MB_POOL_ADDR), tr32(BUFMGR_MB_POOL_SIZE));
-+	printk("DEBUG: BUFMGR_DMA_DESC_POOL_ADDR[%08x] "
-+	       "BUFMGR_DMA_DESC_POOL_SIZE[%08x]\n",
-+	       tr32(BUFMGR_DMA_DESC_POOL_ADDR),
-+	       tr32(BUFMGR_DMA_DESC_POOL_SIZE));
-+
-+	/* Read DMA control block */
-+	printk("DEBUG: RDMAC_MODE[%08x] RDMAC_STATUS[%08x]\n",
-+	       tr32(RDMAC_MODE), tr32(RDMAC_STATUS));
-+
-+	/* Write DMA control block */
-+	printk("DEBUG: WDMAC_MODE[%08x] WDMAC_STATUS[%08x]\n",
-+	       tr32(WDMAC_MODE), tr32(WDMAC_STATUS));
-+
-+	/* DMA completion block */
-+	printk("DEBUG: DMAC_MODE[%08x]\n",
-+	       tr32(DMAC_MODE));
-+
-+	/* GRC block */
-+	printk("DEBUG: GRC_MODE[%08x] GRC_MISC_CFG[%08x]\n",
-+	       tr32(GRC_MODE), tr32(GRC_MISC_CFG));
-+	printk("DEBUG: GRC_LOCAL_CTRL[%08x]\n",
-+	       tr32(GRC_LOCAL_CTRL));
-+
-+	/* TG3_BDINFOs */
-+	printk("DEBUG: RCVDBDI_JUMBO_BD[%08x%08x:%08x:%08x]\n",
-+	       tr32(RCVDBDI_JUMBO_BD + 0x0),
-+	       tr32(RCVDBDI_JUMBO_BD + 0x4),
-+	       tr32(RCVDBDI_JUMBO_BD + 0x8),
-+	       tr32(RCVDBDI_JUMBO_BD + 0xc));
-+	printk("DEBUG: RCVDBDI_STD_BD[%08x%08x:%08x:%08x]\n",
-+	       tr32(RCVDBDI_STD_BD + 0x0),
-+	       tr32(RCVDBDI_STD_BD + 0x4),
-+	       tr32(RCVDBDI_STD_BD + 0x8),
-+	       tr32(RCVDBDI_STD_BD + 0xc));
-+	printk("DEBUG: RCVDBDI_MINI_BD[%08x%08x:%08x:%08x]\n",
-+	       tr32(RCVDBDI_MINI_BD + 0x0),
-+	       tr32(RCVDBDI_MINI_BD + 0x4),
-+	       tr32(RCVDBDI_MINI_BD + 0x8),
-+	       tr32(RCVDBDI_MINI_BD + 0xc));
-+
-+	tg3_read_mem(tp, NIC_SRAM_SEND_RCB + 0x0, &val32);
-+	tg3_read_mem(tp, NIC_SRAM_SEND_RCB + 0x4, &val32_2);
-+	tg3_read_mem(tp, NIC_SRAM_SEND_RCB + 0x8, &val32_3);
-+	tg3_read_mem(tp, NIC_SRAM_SEND_RCB + 0xc, &val32_4);
-+	printk("DEBUG: SRAM_SEND_RCB_0[%08x%08x:%08x:%08x]\n",
-+	       val32, val32_2, val32_3, val32_4);
-+
-+	tg3_read_mem(tp, NIC_SRAM_RCV_RET_RCB + 0x0, &val32);
-+	tg3_read_mem(tp, NIC_SRAM_RCV_RET_RCB + 0x4, &val32_2);
-+	tg3_read_mem(tp, NIC_SRAM_RCV_RET_RCB + 0x8, &val32_3);
-+	tg3_read_mem(tp, NIC_SRAM_RCV_RET_RCB + 0xc, &val32_4);
-+	printk("DEBUG: SRAM_RCV_RET_RCB_0[%08x%08x:%08x:%08x]\n",
-+	       val32, val32_2, val32_3, val32_4);
-+
-+	tg3_read_mem(tp, NIC_SRAM_STATUS_BLK + 0x0, &val32);
-+	tg3_read_mem(tp, NIC_SRAM_STATUS_BLK + 0x4, &val32_2);
-+	tg3_read_mem(tp, NIC_SRAM_STATUS_BLK + 0x8, &val32_3);
-+	tg3_read_mem(tp, NIC_SRAM_STATUS_BLK + 0xc, &val32_4);
-+	tg3_read_mem(tp, NIC_SRAM_STATUS_BLK + 0x10, &val32_5);
-+	printk("DEBUG: SRAM_STATUS_BLK[%08x:%08x:%08x:%08x:%08x]\n",
-+	       val32, val32_2, val32_3, val32_4, val32_5);
-+
-+	/* SW status block */
-+	printk("DEBUG: Host status block [%08x:%08x:(%04x:%04x:%04x):(%04x:%04x)]\n",
-+	       tp->hw_status->status,
-+	       tp->hw_status->status_tag,
-+	       tp->hw_status->rx_jumbo_consumer,
-+	       tp->hw_status->rx_consumer,
-+	       tp->hw_status->rx_mini_consumer,
-+	       tp->hw_status->idx[0].rx_producer,
-+	       tp->hw_status->idx[0].tx_consumer);
-+
-+	/* SW statistics block */
-+	printk("DEBUG: Host statistics block [%08x:%08x:%08x:%08x]\n",
-+	       ((u32 *)tp->hw_stats)[0],
-+	       ((u32 *)tp->hw_stats)[1],
-+	       ((u32 *)tp->hw_stats)[2],
-+	       ((u32 *)tp->hw_stats)[3]);
-+
-+	/* Mailboxes */
-+	printk("DEBUG: SNDHOST_PROD[%08x%08x] SNDNIC_PROD[%08x%08x]\n",
-+	       tr32(MAILBOX_SNDHOST_PROD_IDX_0 + 0x0),
-+	       tr32(MAILBOX_SNDHOST_PROD_IDX_0 + 0x4),
-+	       tr32(MAILBOX_SNDNIC_PROD_IDX_0 + 0x0),
-+	       tr32(MAILBOX_SNDNIC_PROD_IDX_0 + 0x4));
-+
-+	/* NIC side send descriptors. */
-+	for (i = 0; i < 6; i++) {
-+		unsigned long txd;
-+
-+		txd = tp->regs + NIC_SRAM_WIN_BASE + NIC_SRAM_TX_BUFFER_DESC
-+			+ (i * sizeof(struct tg3_tx_buffer_desc));
-+		printk("DEBUG: NIC TXD(%d)[%08x:%08x:%08x:%08x]\n",
-+		       i,
-+		       readl(txd + 0x0), readl(txd + 0x4),
-+		       readl(txd + 0x8), readl(txd + 0xc));
-+	}
-+
-+	/* NIC side RX descriptors. */
-+	for (i = 0; i < 6; i++) {
-+		unsigned long rxd;
-+
-+		rxd = tp->regs + NIC_SRAM_WIN_BASE + NIC_SRAM_RX_BUFFER_DESC
-+			+ (i * sizeof(struct tg3_rx_buffer_desc));
-+		printk("DEBUG: NIC RXD_STD(%d)[0][%08x:%08x:%08x:%08x]\n",
-+		       i,
-+		       readl(rxd + 0x0), readl(rxd + 0x4),
-+		       readl(rxd + 0x8), readl(rxd + 0xc));
-+		rxd += (4 * sizeof(u32));
-+		printk("DEBUG: NIC RXD_STD(%d)[1][%08x:%08x:%08x:%08x]\n",
-+		       i,
-+		       readl(rxd + 0x0), readl(rxd + 0x4),
-+		       readl(rxd + 0x8), readl(rxd + 0xc));
-+	}
-+
-+	for (i = 0; i < 6; i++) {
-+		unsigned long rxd;
-+
-+		rxd = tp->regs + NIC_SRAM_WIN_BASE + NIC_SRAM_RX_JUMBO_BUFFER_DESC
-+			+ (i * sizeof(struct tg3_rx_buffer_desc));
-+		printk("DEBUG: NIC RXD_JUMBO(%d)[0][%08x:%08x:%08x:%08x]\n",
-+		       i,
-+		       readl(rxd + 0x0), readl(rxd + 0x4),
-+		       readl(rxd + 0x8), readl(rxd + 0xc));
-+		rxd += (4 * sizeof(u32));
-+		printk("DEBUG: NIC RXD_JUMBO(%d)[1][%08x:%08x:%08x:%08x]\n",
-+		       i,
-+		       readl(rxd + 0x0), readl(rxd + 0x4),
-+		       readl(rxd + 0x8), readl(rxd + 0xc));
-+	}
-+}
-+#endif
-+
-+static struct net_device_stats *tg3_get_stats(struct net_device *);
-+static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *);
-+
-+static int tg3_close(struct net_device *dev)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+
-+	netif_stop_queue(dev);
-+
-+	del_timer_sync(&tp->timer);
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+#if 0
-+	tg3_dump_state(tp);
-+#endif
-+
-+	tg3_disable_ints(tp);
-+
-+	tg3_halt(tp);
-+	tg3_free_rings(tp);
-+	tp->tg3_flags &=
-+		~(TG3_FLAG_INIT_COMPLETE |
-+		  TG3_FLAG_GOT_SERDES_FLOWCTL);
-+	netif_carrier_off(tp->dev);
-+
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+
-+	free_irq(dev->irq, dev);
-+
-+	memcpy(&tp->net_stats_prev, tg3_get_stats(tp->dev),
-+	       sizeof(tp->net_stats_prev));
-+	memcpy(&tp->estats_prev, tg3_get_estats(tp),
-+	       sizeof(tp->estats_prev));
-+
-+	tg3_free_consistent(tp);
-+
-+	return 0;
-+}
-+
-+static inline unsigned long get_stat64(tg3_stat64_t *val)
-+{
-+	unsigned long ret;
-+
-+#if (BITS_PER_LONG == 32)
-+	ret = val->low;
-+#else
-+	ret = ((u64)val->high << 32) | ((u64)val->low);
-+#endif
-+	return ret;
-+}
-+
-+static unsigned long calc_crc_errors(struct tg3 *tp)
-+{
-+	struct tg3_hw_stats *hw_stats = tp->hw_stats;
-+
-+	if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) &&
-+	    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
-+	     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)) {
-+		unsigned long flags;
-+		u32 val;
-+
-+		spin_lock_irqsave(&tp->lock, flags);
-+		tg3_readphy(tp, 0x1e, &val);
-+		tg3_writephy(tp, 0x1e, val | 0x8000);
-+		tg3_readphy(tp, 0x14, &val);
-+		spin_unlock_irqrestore(&tp->lock, flags);
-+
-+		tp->phy_crc_errors += val;
-+
-+		return tp->phy_crc_errors;
-+	}
-+
-+	return get_stat64(&hw_stats->rx_fcs_errors);
-+}
-+
-+#define ESTAT_ADD(member) \
-+	estats->member =	old_estats->member + \
-+				get_stat64(&hw_stats->member)
-+
-+static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp)
-+{
-+	struct tg3_ethtool_stats *estats = &tp->estats;
-+	struct tg3_ethtool_stats *old_estats = &tp->estats_prev;
-+	struct tg3_hw_stats *hw_stats = tp->hw_stats;
-+
-+	if (!hw_stats)
-+		return old_estats;
-+
-+	ESTAT_ADD(rx_octets);
-+	ESTAT_ADD(rx_fragments);
-+	ESTAT_ADD(rx_ucast_packets);
-+	ESTAT_ADD(rx_mcast_packets);
-+	ESTAT_ADD(rx_bcast_packets);
-+	ESTAT_ADD(rx_fcs_errors);
-+	ESTAT_ADD(rx_align_errors);
-+	ESTAT_ADD(rx_xon_pause_rcvd);
-+	ESTAT_ADD(rx_xoff_pause_rcvd);
-+	ESTAT_ADD(rx_mac_ctrl_rcvd);
-+	ESTAT_ADD(rx_xoff_entered);
-+	ESTAT_ADD(rx_frame_too_long_errors);
-+	ESTAT_ADD(rx_jabbers);
-+	ESTAT_ADD(rx_undersize_packets);
-+	ESTAT_ADD(rx_in_length_errors);
-+	ESTAT_ADD(rx_out_length_errors);
-+	ESTAT_ADD(rx_64_or_less_octet_packets);
-+	ESTAT_ADD(rx_65_to_127_octet_packets);
-+	ESTAT_ADD(rx_128_to_255_octet_packets);
-+	ESTAT_ADD(rx_256_to_511_octet_packets);
-+	ESTAT_ADD(rx_512_to_1023_octet_packets);
-+	ESTAT_ADD(rx_1024_to_1522_octet_packets);
-+	ESTAT_ADD(rx_1523_to_2047_octet_packets);
-+	ESTAT_ADD(rx_2048_to_4095_octet_packets);
-+	ESTAT_ADD(rx_4096_to_8191_octet_packets);
-+	ESTAT_ADD(rx_8192_to_9022_octet_packets);
-+
-+	ESTAT_ADD(tx_octets);
-+	ESTAT_ADD(tx_collisions);
-+	ESTAT_ADD(tx_xon_sent);
-+	ESTAT_ADD(tx_xoff_sent);
-+	ESTAT_ADD(tx_flow_control);
-+	ESTAT_ADD(tx_mac_errors);
-+	ESTAT_ADD(tx_single_collisions);
-+	ESTAT_ADD(tx_mult_collisions);
-+	ESTAT_ADD(tx_deferred);
-+	ESTAT_ADD(tx_excessive_collisions);
-+	ESTAT_ADD(tx_late_collisions);
-+	ESTAT_ADD(tx_collide_2times);
-+	ESTAT_ADD(tx_collide_3times);
-+	ESTAT_ADD(tx_collide_4times);
-+	ESTAT_ADD(tx_collide_5times);
-+	ESTAT_ADD(tx_collide_6times);
-+	ESTAT_ADD(tx_collide_7times);
-+	ESTAT_ADD(tx_collide_8times);
-+	ESTAT_ADD(tx_collide_9times);
-+	ESTAT_ADD(tx_collide_10times);
-+	ESTAT_ADD(tx_collide_11times);
-+	ESTAT_ADD(tx_collide_12times);
-+	ESTAT_ADD(tx_collide_13times);
-+	ESTAT_ADD(tx_collide_14times);
-+	ESTAT_ADD(tx_collide_15times);
-+	ESTAT_ADD(tx_ucast_packets);
-+	ESTAT_ADD(tx_mcast_packets);
-+	ESTAT_ADD(tx_bcast_packets);
-+	ESTAT_ADD(tx_carrier_sense_errors);
-+	ESTAT_ADD(tx_discards);
-+	ESTAT_ADD(tx_errors);
-+
-+	ESTAT_ADD(dma_writeq_full);
-+	ESTAT_ADD(dma_write_prioq_full);
-+	ESTAT_ADD(rxbds_empty);
-+	ESTAT_ADD(rx_discards);
-+	ESTAT_ADD(rx_errors);
-+	ESTAT_ADD(rx_threshold_hit);
-+
-+	ESTAT_ADD(dma_readq_full);
-+	ESTAT_ADD(dma_read_prioq_full);
-+	ESTAT_ADD(tx_comp_queue_full);
-+
-+	ESTAT_ADD(ring_set_send_prod_index);
-+	ESTAT_ADD(ring_status_update);
-+	ESTAT_ADD(nic_irqs);
-+	ESTAT_ADD(nic_avoided_irqs);
-+	ESTAT_ADD(nic_tx_threshold_hit);
-+
-+	return estats;
-+}
-+
-+static struct net_device_stats *tg3_get_stats(struct net_device *dev)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+	struct net_device_stats *stats = &tp->net_stats;
-+	struct net_device_stats *old_stats = &tp->net_stats_prev;
-+	struct tg3_hw_stats *hw_stats = tp->hw_stats;
-+
-+	if (!hw_stats)
-+		return old_stats;
-+
-+	stats->rx_packets = old_stats->rx_packets +
-+		get_stat64(&hw_stats->rx_ucast_packets) +
-+		get_stat64(&hw_stats->rx_mcast_packets) +
-+		get_stat64(&hw_stats->rx_bcast_packets);
-+		
-+	stats->tx_packets = old_stats->tx_packets +
-+		get_stat64(&hw_stats->tx_ucast_packets) +
-+		get_stat64(&hw_stats->tx_mcast_packets) +
-+		get_stat64(&hw_stats->tx_bcast_packets);
-+
-+	stats->rx_bytes = old_stats->rx_bytes +
-+		get_stat64(&hw_stats->rx_octets);
-+	stats->tx_bytes = old_stats->tx_bytes +
-+		get_stat64(&hw_stats->tx_octets);
-+
-+	stats->rx_errors = old_stats->rx_errors +
-+		get_stat64(&hw_stats->rx_errors) +
-+		get_stat64(&hw_stats->rx_discards);
-+	stats->tx_errors = old_stats->tx_errors +
-+		get_stat64(&hw_stats->tx_errors) +
-+		get_stat64(&hw_stats->tx_mac_errors) +
-+		get_stat64(&hw_stats->tx_carrier_sense_errors) +
-+		get_stat64(&hw_stats->tx_discards);
-+
-+	stats->multicast = old_stats->multicast +
-+		get_stat64(&hw_stats->rx_mcast_packets);
-+	stats->collisions = old_stats->collisions +
-+		get_stat64(&hw_stats->tx_collisions);
-+
-+	stats->rx_length_errors = old_stats->rx_length_errors +
-+		get_stat64(&hw_stats->rx_frame_too_long_errors) +
-+		get_stat64(&hw_stats->rx_undersize_packets);
-+
-+	stats->rx_over_errors = old_stats->rx_over_errors +
-+		get_stat64(&hw_stats->rxbds_empty);
-+	stats->rx_frame_errors = old_stats->rx_frame_errors +
-+		get_stat64(&hw_stats->rx_align_errors);
-+	stats->tx_aborted_errors = old_stats->tx_aborted_errors +
-+		get_stat64(&hw_stats->tx_discards);
-+	stats->tx_carrier_errors = old_stats->tx_carrier_errors +
-+		get_stat64(&hw_stats->tx_carrier_sense_errors);
-+
-+	stats->rx_crc_errors = old_stats->rx_crc_errors +
-+		calc_crc_errors(tp);
-+
-+	return stats;
-+}
-+
-+static inline u32 calc_crc(unsigned char *buf, int len)
-+{
-+	u32 reg;
-+	u32 tmp;
-+	int j, k;
-+
-+	reg = 0xffffffff;
-+
-+	for (j = 0; j < len; j++) {
-+		reg ^= buf[j];
-+
-+		for (k = 0; k < 8; k++) {
-+			tmp = reg & 0x01;
-+
-+			reg >>= 1;
-+
-+			if (tmp) {
-+				reg ^= 0xedb88320;
-+			}
-+		}
-+	}
-+
-+	return ~reg;
-+}
-+
-+static void tg3_set_multi(struct tg3 *tp, unsigned int accept_all)
-+{
-+	/* accept or reject all multicast frames */
-+	tw32(MAC_HASH_REG_0, accept_all ? 0xffffffff : 0);
-+	tw32(MAC_HASH_REG_1, accept_all ? 0xffffffff : 0);
-+	tw32(MAC_HASH_REG_2, accept_all ? 0xffffffff : 0);
-+	tw32(MAC_HASH_REG_3, accept_all ? 0xffffffff : 0);
-+}
-+
-+static void __tg3_set_rx_mode(struct net_device *dev)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+	u32 rx_mode;
-+
-+	rx_mode = tp->rx_mode & ~(RX_MODE_PROMISC |
-+				  RX_MODE_KEEP_VLAN_TAG);
-+
-+	/* When ASF is in use, we always keep the RX_MODE_KEEP_VLAN_TAG
-+	 * flag clear.
-+	 */
-+#if TG3_VLAN_TAG_USED
-+	if (!tp->vlgrp &&
-+	    !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
-+		rx_mode |= RX_MODE_KEEP_VLAN_TAG;
-+#else
-+	/* By definition, VLAN is disabled always in this
-+	 * case.
-+	 */
-+	if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
-+		rx_mode |= RX_MODE_KEEP_VLAN_TAG;
-+#endif
-+
-+	if (dev->flags & IFF_PROMISC) {
-+		/* Promiscuous mode. */
-+		rx_mode |= RX_MODE_PROMISC;
-+	} else if (dev->flags & IFF_ALLMULTI) {
-+		/* Accept all multicast. */
-+		tg3_set_multi (tp, 1);
-+	} else if (dev->mc_count < 1) {
-+		/* Reject all multicast. */
-+		tg3_set_multi (tp, 0);
-+	} else {
-+		/* Accept one or more multicast(s). */
-+		struct dev_mc_list *mclist;
-+		unsigned int i;
-+		u32 mc_filter[4] = { 0, };
-+		u32 regidx;
-+		u32 bit;
-+		u32 crc;
-+
-+		for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
-+		     i++, mclist = mclist->next) {
-+
-+			crc = calc_crc (mclist->dmi_addr, ETH_ALEN);
-+			bit = ~crc & 0x7f;
-+			regidx = (bit & 0x60) >> 5;
-+			bit &= 0x1f;
-+			mc_filter[regidx] |= (1 << bit);
-+		}
-+
-+		tw32(MAC_HASH_REG_0, mc_filter[0]);
-+		tw32(MAC_HASH_REG_1, mc_filter[1]);
-+		tw32(MAC_HASH_REG_2, mc_filter[2]);
-+		tw32(MAC_HASH_REG_3, mc_filter[3]);
-+	}
-+
-+	if (rx_mode != tp->rx_mode) {
-+		tp->rx_mode = rx_mode;
-+		tw32_f(MAC_RX_MODE, rx_mode);
-+		udelay(10);
-+	}
-+}
-+
-+static void tg3_set_rx_mode(struct net_device *dev)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+	__tg3_set_rx_mode(dev);
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+}
-+
-+#define TG3_REGDUMP_LEN		(32 * 1024)
-+
-+static int tg3_get_regs_len(struct net_device *dev)
-+{
-+	return TG3_REGDUMP_LEN;
-+}
-+
-+static void tg3_get_regs(struct net_device *dev,
-+		struct ethtool_regs *regs, void *_p)
-+{
-+	u32 *p = _p;
-+	struct tg3 *tp = netdev_priv(dev);
-+	u8 *orig_p = _p;
-+	int i;
-+
-+	regs->version = 0;
-+
-+	memset(p, 0, TG3_REGDUMP_LEN);
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+
-+#define __GET_REG32(reg)	(*(p)++ = tr32(reg))
-+#define GET_REG32_LOOP(base,len)		\
-+do {	p = (u32 *)(orig_p + (base));		\
-+	for (i = 0; i < len; i += 4)		\
-+		__GET_REG32((base) + i);	\
-+} while (0)
-+#define GET_REG32_1(reg)			\
-+do {	p = (u32 *)(orig_p + (reg));		\
-+	__GET_REG32((reg));			\
-+} while (0)
-+
-+	GET_REG32_LOOP(TG3PCI_VENDOR, 0xb0);
-+	GET_REG32_LOOP(MAILBOX_INTERRUPT_0, 0x200);
-+	GET_REG32_LOOP(MAC_MODE, 0x4f0);
-+	GET_REG32_LOOP(SNDDATAI_MODE, 0xe0);
-+	GET_REG32_1(SNDDATAC_MODE);
-+	GET_REG32_LOOP(SNDBDS_MODE, 0x80);
-+	GET_REG32_LOOP(SNDBDI_MODE, 0x48);
-+	GET_REG32_1(SNDBDC_MODE);
-+	GET_REG32_LOOP(RCVLPC_MODE, 0x20);
-+	GET_REG32_LOOP(RCVLPC_SELLST_BASE, 0x15c);
-+	GET_REG32_LOOP(RCVDBDI_MODE, 0x0c);
-+	GET_REG32_LOOP(RCVDBDI_JUMBO_BD, 0x3c);
-+	GET_REG32_LOOP(RCVDBDI_BD_PROD_IDX_0, 0x44);
-+	GET_REG32_1(RCVDCC_MODE);
-+	GET_REG32_LOOP(RCVBDI_MODE, 0x20);
-+	GET_REG32_LOOP(RCVCC_MODE, 0x14);
-+	GET_REG32_LOOP(RCVLSC_MODE, 0x08);
-+	GET_REG32_1(MBFREE_MODE);
-+	GET_REG32_LOOP(HOSTCC_MODE, 0x100);
-+	GET_REG32_LOOP(MEMARB_MODE, 0x10);
-+	GET_REG32_LOOP(BUFMGR_MODE, 0x58);
-+	GET_REG32_LOOP(RDMAC_MODE, 0x08);
-+	GET_REG32_LOOP(WDMAC_MODE, 0x08);
-+	GET_REG32_LOOP(RX_CPU_BASE, 0x280);
-+	GET_REG32_LOOP(TX_CPU_BASE, 0x280);
-+	GET_REG32_LOOP(GRCMBOX_INTERRUPT_0, 0x110);
-+	GET_REG32_LOOP(FTQ_RESET, 0x120);
-+	GET_REG32_LOOP(MSGINT_MODE, 0x0c);
-+	GET_REG32_1(DMAC_MODE);
-+	GET_REG32_LOOP(GRC_MODE, 0x4c);
-+	if (tp->tg3_flags & TG3_FLAG_NVRAM)
-+		GET_REG32_LOOP(NVRAM_CMD, 0x24);
-+
-+#undef __GET_REG32
-+#undef GET_REG32_LOOP
-+#undef GET_REG32_1
-+
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+}
-+
-+static int tg3_get_eeprom_len(struct net_device *dev)
-+{
-+	return EEPROM_CHIP_SIZE;
-+}
-+
-+static int tg3_nvram_read_using_eeprom(struct tg3 *tp,
-+					u32 offset, u32 *val);
-+static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, u8 *data)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+	int ret;
-+	u8  *pd;
-+	u32 i, offset, len, val, b_offset, b_count;
-+
-+	offset = eeprom->offset;
-+	len = eeprom->len;
-+	eeprom->len = 0;
-+
-+	ret = tg3_nvram_read_using_eeprom(tp, 0, &eeprom->magic);
-+	if (ret)
-+		return ret;
-+	eeprom->magic = swab32(eeprom->magic);
-+
-+	if (offset & 3) {
-+		/* adjustments to start on required 4 byte boundary */
-+		b_offset = offset & 3;
-+		b_count = 4 - b_offset;
-+		if (b_count > len) {
-+			/* i.e. offset=1 len=2 */
-+			b_count = len;
-+		}
-+		ret = tg3_nvram_read_using_eeprom(tp, offset-b_offset, &val);
-+		if (ret)
-+			return ret;
-+		memcpy(data, ((char*)&val) + b_offset, b_count);
-+		len -= b_count;
-+		offset += b_count;
-+	        eeprom->len += b_count;
-+	}
-+
-+	/* read bytes upto the last 4 byte boundary */
-+	pd = &data[eeprom->len];
-+	for (i = 0; i < (len - (len & 3)); i += 4) {
-+		ret = tg3_nvram_read_using_eeprom(tp, offset + i, 
-+				(u32*)(pd + i));
-+		if (ret) {
-+			eeprom->len += i;
-+			return ret;
-+		}
-+	}
-+	eeprom->len += i;
-+
-+	if (len & 3) {
-+		/* read last bytes not ending on 4 byte boundary */
-+		pd = &data[eeprom->len];
-+		b_count = len & 3;
-+		b_offset = offset + len - b_count;
-+		ret = tg3_nvram_read_using_eeprom(tp, b_offset, &val);
-+		if (ret)
-+			return ret;
-+		memcpy(pd, ((char*)&val), b_count);
-+		eeprom->len += b_count;
-+	}
-+	return 0;
-+}
-+
-+static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-+{
-+  	struct tg3 *tp = netdev_priv(dev);
-+  
-+	if (!(tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) ||
-+					tp->link_config.phy_is_low_power)
-+		return -EAGAIN;
-+
-+	cmd->supported = (SUPPORTED_Autoneg);
-+
-+	if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY))
-+		cmd->supported |= (SUPPORTED_1000baseT_Half |
-+				   SUPPORTED_1000baseT_Full);
-+
-+	if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES))
-+		cmd->supported |= (SUPPORTED_100baseT_Half |
-+				  SUPPORTED_100baseT_Full |
-+				  SUPPORTED_10baseT_Half |
-+				  SUPPORTED_10baseT_Full |
-+				  SUPPORTED_MII);
-+	else
-+		cmd->supported |= SUPPORTED_FIBRE;
-+  
-+	cmd->advertising = tp->link_config.advertising;
-+	cmd->speed = tp->link_config.active_speed;
-+	cmd->duplex = tp->link_config.active_duplex;
-+	cmd->port = 0;
-+	cmd->phy_address = PHY_ADDR;
-+	cmd->transceiver = 0;
-+	cmd->autoneg = tp->link_config.autoneg;
-+	cmd->maxtxpkt = 0;
-+	cmd->maxrxpkt = 0;
-+	return 0;
-+}
-+  
-+static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+  
-+	if (!(tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) ||
-+	    tp->link_config.phy_is_low_power)
-+		return -EAGAIN;
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
-+		/* These are the only valid advertisement bits allowed.  */
-+		if (cmd->autoneg == AUTONEG_ENABLE &&
-+		    (cmd->advertising & ~(ADVERTISED_1000baseT_Half |
-+					  ADVERTISED_1000baseT_Full |
-+					  ADVERTISED_Autoneg |
-+					  ADVERTISED_FIBRE)))
-+			return -EINVAL;
-+	}
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+
-+	tp->link_config.autoneg = cmd->autoneg;
-+	if (cmd->autoneg == AUTONEG_ENABLE) {
-+		tp->link_config.advertising = cmd->advertising;
-+		tp->link_config.speed = SPEED_INVALID;
-+		tp->link_config.duplex = DUPLEX_INVALID;
-+	} else {
-+		tp->link_config.advertising = 0;
-+		tp->link_config.speed = cmd->speed;
-+		tp->link_config.duplex = cmd->duplex;
-+  	}
-+  
-+	tg3_setup_phy(tp, 1);
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+  
-+	return 0;
-+}
-+  
-+static void tg3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+  
-+	strcpy(info->driver, DRV_MODULE_NAME);
-+	strcpy(info->version, DRV_MODULE_VERSION);
-+	strcpy(info->bus_info, pci_name(tp->pdev));
-+}
-+  
-+static void tg3_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+  
-+	wol->supported = WAKE_MAGIC;
-+	wol->wolopts = 0;
-+	if (tp->tg3_flags & TG3_FLAG_WOL_ENABLE)
-+		wol->wolopts = WAKE_MAGIC;
-+	memset(&wol->sopass, 0, sizeof(wol->sopass));
-+}
-+  
-+static int tg3_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+  
-+	if (wol->wolopts & ~WAKE_MAGIC)
-+		return -EINVAL;
-+	if ((wol->wolopts & WAKE_MAGIC) &&
-+	    tp->tg3_flags2 & TG3_FLG2_PHY_SERDES &&
-+	    !(tp->tg3_flags & TG3_FLAG_SERDES_WOL_CAP))
-+		return -EINVAL;
-+  
-+	spin_lock_irq(&tp->lock);
-+	if (wol->wolopts & WAKE_MAGIC)
-+		tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;
-+	else
-+		tp->tg3_flags &= ~TG3_FLAG_WOL_ENABLE;
-+	spin_unlock_irq(&tp->lock);
-+  
-+	return 0;
-+}
-+  
-+static u32 tg3_get_msglevel(struct net_device *dev)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+	return tp->msg_enable;
-+}
-+  
-+static void tg3_set_msglevel(struct net_device *dev, u32 value)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+	tp->msg_enable = value;
-+}
-+  
-+#if TG3_TSO_SUPPORT != 0
-+static int tg3_set_tso(struct net_device *dev, u32 value)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+
-+	if (!(tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE)) {
-+		if (value)
-+			return -EINVAL;
-+		return 0;
-+	}
-+	return ethtool_op_set_tso(dev, value);
-+}
-+#endif
-+  
-+static int tg3_nway_reset(struct net_device *dev)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+	u32 bmcr;
-+	int r;
-+  
-+	spin_lock_irq(&tp->lock);
-+	tg3_readphy(tp, MII_BMCR, &bmcr);
-+	tg3_readphy(tp, MII_BMCR, &bmcr);
-+	r = -EINVAL;
-+	if (bmcr & BMCR_ANENABLE) {
-+		tg3_writephy(tp, MII_BMCR, bmcr | BMCR_ANRESTART);
-+		r = 0;
-+	}
-+	spin_unlock_irq(&tp->lock);
-+  
-+	return r;
-+}
-+  
-+static void tg3_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+  
-+	ering->rx_max_pending = TG3_RX_RING_SIZE - 1;
-+	ering->rx_mini_max_pending = 0;
-+	ering->rx_jumbo_max_pending = TG3_RX_JUMBO_RING_SIZE - 1;
-+
-+	ering->rx_pending = tp->rx_pending;
-+	ering->rx_mini_pending = 0;
-+	ering->rx_jumbo_pending = tp->rx_jumbo_pending;
-+	ering->tx_pending = tp->tx_pending;
-+}
-+  
-+static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+  
-+	if ((ering->rx_pending > TG3_RX_RING_SIZE - 1) ||
-+	    (ering->rx_jumbo_pending > TG3_RX_JUMBO_RING_SIZE - 1) ||
-+	    (ering->tx_pending > TG3_TX_RING_SIZE - 1))
-+		return -EINVAL;
-+  
-+	tg3_netif_stop(tp);
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+  
-+	tp->rx_pending = ering->rx_pending;
-+
-+	if ((tp->tg3_flags2 & TG3_FLG2_MAX_RXPEND_64) &&
-+	    tp->rx_pending > 63)
-+		tp->rx_pending = 63;
-+	tp->rx_jumbo_pending = ering->rx_jumbo_pending;
-+	tp->tx_pending = ering->tx_pending;
-+
-+	tg3_halt(tp);
-+	tg3_init_hw(tp);
-+	tg3_netif_start(tp);
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+  
-+	return 0;
-+}
-+  
-+static void tg3_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+  
-+	epause->autoneg = (tp->tg3_flags & TG3_FLAG_PAUSE_AUTONEG) != 0;
-+	epause->rx_pause = (tp->tg3_flags & TG3_FLAG_RX_PAUSE) != 0;
-+	epause->tx_pause = (tp->tg3_flags & TG3_FLAG_TX_PAUSE) != 0;
-+}
-+  
-+static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+  
-+	tg3_netif_stop(tp);
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+	if (epause->autoneg)
-+		tp->tg3_flags |= TG3_FLAG_PAUSE_AUTONEG;
-+	else
-+		tp->tg3_flags &= ~TG3_FLAG_PAUSE_AUTONEG;
-+	if (epause->rx_pause)
-+		tp->tg3_flags |= TG3_FLAG_RX_PAUSE;
-+	else
-+		tp->tg3_flags &= ~TG3_FLAG_RX_PAUSE;
-+	if (epause->tx_pause)
-+		tp->tg3_flags |= TG3_FLAG_TX_PAUSE;
-+	else
-+		tp->tg3_flags &= ~TG3_FLAG_TX_PAUSE;
-+	tg3_halt(tp);
-+	tg3_init_hw(tp);
-+	tg3_netif_start(tp);
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+  
-+	return 0;
-+}
-+  
-+static u32 tg3_get_rx_csum(struct net_device *dev)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+	return (tp->tg3_flags & TG3_FLAG_RX_CHECKSUMS) != 0;
-+}
-+  
-+static int tg3_set_rx_csum(struct net_device *dev, u32 data)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+  
-+	if (tp->tg3_flags & TG3_FLAG_BROKEN_CHECKSUMS) {
-+		if (data != 0)
-+			return -EINVAL;
-+  		return 0;
-+  	}
-+  
-+	spin_lock_irq(&tp->lock);
-+	if (data)
-+		tp->tg3_flags |= TG3_FLAG_RX_CHECKSUMS;
-+	else
-+		tp->tg3_flags &= ~TG3_FLAG_RX_CHECKSUMS;
-+	spin_unlock_irq(&tp->lock);
-+  
-+	return 0;
-+}
-+  
-+static int tg3_set_tx_csum(struct net_device *dev, u32 data)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+  
-+	if (tp->tg3_flags & TG3_FLAG_BROKEN_CHECKSUMS) {
-+		if (data != 0)
-+			return -EINVAL;
-+  		return 0;
-+  	}
-+  
-+	if (data)
-+		dev->features |= NETIF_F_IP_CSUM;
-+	else
-+		dev->features &= ~NETIF_F_IP_CSUM;
-+
-+	return 0;
-+}
-+
-+static int tg3_get_stats_count (struct net_device *dev)
-+{
-+	return TG3_NUM_STATS;
-+}
-+
-+static void tg3_get_strings (struct net_device *dev, u32 stringset, u8 *buf)
-+{
-+	switch (stringset) {
-+	case ETH_SS_STATS:
-+		memcpy(buf, &ethtool_stats_keys, sizeof(ethtool_stats_keys));
-+		break;
-+	default:
-+		WARN_ON(1);	/* we need a WARN() */
-+		break;
-+	}
-+}
-+
-+static void tg3_get_ethtool_stats (struct net_device *dev,
-+				   struct ethtool_stats *estats, u64 *tmp_stats)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+	memcpy(tmp_stats, tg3_get_estats(tp), sizeof(tp->estats));
-+}
-+
-+static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-+{
-+	struct mii_ioctl_data *data = if_mii(ifr);
-+	struct tg3 *tp = netdev_priv(dev);
-+	int err;
-+
-+	switch(cmd) {
-+	case SIOCGMIIPHY:
-+		data->phy_id = PHY_ADDR;
-+
-+		/* fallthru */
-+	case SIOCGMIIREG: {
-+		u32 mii_regval;
-+
-+		if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
-+			break;			/* We have no PHY */
-+
-+		spin_lock_irq(&tp->lock);
-+		err = tg3_readphy(tp, data->reg_num & 0x1f, &mii_regval);
-+		spin_unlock_irq(&tp->lock);
-+
-+		data->val_out = mii_regval;
-+
-+		return err;
-+	}
-+
-+	case SIOCSMIIREG:
-+		if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
-+			break;			/* We have no PHY */
-+
-+		if (!capable(CAP_NET_ADMIN))
-+			return -EPERM;
-+
-+		spin_lock_irq(&tp->lock);
-+		err = tg3_writephy(tp, data->reg_num & 0x1f, data->val_in);
-+		spin_unlock_irq(&tp->lock);
-+
-+		return err;
-+
-+	default:
-+		/* do nothing */
-+		break;
-+	}
-+	return -EOPNOTSUPP;
-+}
-+
-+#if TG3_VLAN_TAG_USED
-+static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+
-+	tp->vlgrp = grp;
-+
-+	/* Update RX_MODE_KEEP_VLAN_TAG bit in RX_MODE register. */
-+	__tg3_set_rx_mode(dev);
-+
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+}
-+
-+static void tg3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
-+{
-+	struct tg3 *tp = netdev_priv(dev);
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+	if (tp->vlgrp)
-+		tp->vlgrp->vlan_devices[vid] = NULL;
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+}
-+#endif
-+
-+static struct ethtool_ops tg3_ethtool_ops = {
-+	.get_settings		= tg3_get_settings,
-+	.set_settings		= tg3_set_settings,
-+	.get_drvinfo		= tg3_get_drvinfo,
-+	.get_regs_len		= tg3_get_regs_len,
-+	.get_regs		= tg3_get_regs,
-+	.get_wol		= tg3_get_wol,
-+	.set_wol		= tg3_set_wol,
-+	.get_msglevel		= tg3_get_msglevel,
-+	.set_msglevel		= tg3_set_msglevel,
-+	.nway_reset		= tg3_nway_reset,
-+	.get_link		= ethtool_op_get_link,
-+	.get_eeprom_len		= tg3_get_eeprom_len,
-+	.get_eeprom		= tg3_get_eeprom,
-+	.get_ringparam		= tg3_get_ringparam,
-+	.set_ringparam		= tg3_set_ringparam,
-+	.get_pauseparam		= tg3_get_pauseparam,
-+	.set_pauseparam		= tg3_set_pauseparam,
-+	.get_rx_csum		= tg3_get_rx_csum,
-+	.set_rx_csum		= tg3_set_rx_csum,
-+	.get_tx_csum		= ethtool_op_get_tx_csum,
-+	.set_tx_csum		= tg3_set_tx_csum,
-+	.get_sg			= ethtool_op_get_sg,
-+	.set_sg			= ethtool_op_set_sg,
-+#if TG3_TSO_SUPPORT != 0
-+	.get_tso		= ethtool_op_get_tso,
-+	.set_tso		= tg3_set_tso,
-+#endif
-+	.get_strings		= tg3_get_strings,
-+	.get_stats_count	= tg3_get_stats_count,
-+	.get_ethtool_stats	= tg3_get_ethtool_stats,
-+};
-+
-+/* Chips other than 5700/5701 use the NVRAM for fetching info. */
-+static void __devinit tg3_nvram_init(struct tg3 *tp)
-+{
-+	int j;
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_SUN_570X)
-+		return;
-+
-+	tw32_f(GRC_EEPROM_ADDR,
-+	     (EEPROM_ADDR_FSM_RESET |
-+	      (EEPROM_DEFAULT_CLOCK_PERIOD <<
-+	       EEPROM_ADDR_CLKPERD_SHIFT)));
-+
-+	/* XXX schedule_timeout() ... */
-+	for (j = 0; j < 100; j++)
-+		udelay(10);
-+
-+	/* Enable seeprom accesses. */
-+	tw32_f(GRC_LOCAL_CTRL,
-+	     tr32(GRC_LOCAL_CTRL) | GRC_LCLCTRL_AUTO_SEEPROM);
-+	udelay(100);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) {
-+		u32 nvcfg1;
-+
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+			u32 nvaccess = tr32(NVRAM_ACCESS);
-+
-+			tw32_f(NVRAM_ACCESS, nvaccess | ACCESS_ENABLE);
-+		}
-+
-+		nvcfg1 = tr32(NVRAM_CFG1);
-+
-+		tp->tg3_flags |= TG3_FLAG_NVRAM;
-+		if (nvcfg1 & NVRAM_CFG1_FLASHIF_ENAB) {
-+			if (nvcfg1 & NVRAM_CFG1_BUFFERED_MODE)
-+				tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED;
-+		} else {
-+			nvcfg1 &= ~NVRAM_CFG1_COMPAT_BYPASS;
-+			tw32(NVRAM_CFG1, nvcfg1);
-+		}
-+
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+			u32 nvaccess = tr32(NVRAM_ACCESS);
-+
-+			tw32_f(NVRAM_ACCESS, nvaccess & ~ACCESS_ENABLE);
-+		}
-+	} else {
-+		tp->tg3_flags &= ~(TG3_FLAG_NVRAM | TG3_FLAG_NVRAM_BUFFERED);
-+	}
-+}
-+
-+static int tg3_nvram_read_using_eeprom(struct tg3 *tp,
-+					u32 offset, u32 *val)
-+{
-+	u32 tmp;
-+	int i;
-+
-+	if (offset > EEPROM_ADDR_ADDR_MASK ||
-+	    (offset % 4) != 0)
-+		return -EINVAL;
-+
-+	tmp = tr32(GRC_EEPROM_ADDR) & ~(EEPROM_ADDR_ADDR_MASK |
-+					EEPROM_ADDR_DEVID_MASK |
-+					EEPROM_ADDR_READ);
-+	tw32(GRC_EEPROM_ADDR,
-+	     tmp |
-+	     (0 << EEPROM_ADDR_DEVID_SHIFT) |
-+	     ((offset << EEPROM_ADDR_ADDR_SHIFT) &
-+	      EEPROM_ADDR_ADDR_MASK) |
-+	     EEPROM_ADDR_READ | EEPROM_ADDR_START);
-+
-+	for (i = 0; i < 10000; i++) {
-+		tmp = tr32(GRC_EEPROM_ADDR);
-+
-+		if (tmp & EEPROM_ADDR_COMPLETE)
-+			break;
-+		udelay(100);
-+	}
-+	if (!(tmp & EEPROM_ADDR_COMPLETE))
-+		return -EBUSY;
-+
-+	*val = tr32(GRC_EEPROM_DATA);
-+	return 0;
-+}
-+
-+static int __devinit tg3_nvram_read(struct tg3 *tp,
-+				    u32 offset, u32 *val)
-+{
-+	int i;
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_SUN_570X) {
-+		printk(KERN_ERR PFX "Attempt to do nvram_read on Sun 570X\n");
-+		return -EINVAL;
-+	}
-+
-+	if (!(tp->tg3_flags & TG3_FLAG_NVRAM))
-+		return tg3_nvram_read_using_eeprom(tp, offset, val);
-+
-+	if (tp->tg3_flags & TG3_FLAG_NVRAM_BUFFERED)
-+		offset = ((offset / NVRAM_BUFFERED_PAGE_SIZE) <<
-+			  NVRAM_BUFFERED_PAGE_POS) +
-+			(offset % NVRAM_BUFFERED_PAGE_SIZE);
-+
-+	if (offset > NVRAM_ADDR_MSK)
-+		return -EINVAL;
-+
-+	tg3_nvram_lock(tp);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+		u32 nvaccess = tr32(NVRAM_ACCESS);
-+
-+		tw32_f(NVRAM_ACCESS, nvaccess | ACCESS_ENABLE);
-+	}
-+
-+	tw32(NVRAM_ADDR, offset);
-+	tw32(NVRAM_CMD,
-+	     NVRAM_CMD_RD | NVRAM_CMD_GO |
-+	     NVRAM_CMD_FIRST | NVRAM_CMD_LAST | NVRAM_CMD_DONE);
-+
-+	/* Wait for done bit to clear. */
-+	for (i = 0; i < 1000; i++) {
-+		udelay(10);
-+		if (tr32(NVRAM_CMD) & NVRAM_CMD_DONE) {
-+			udelay(10);
-+			*val = swab32(tr32(NVRAM_RDDATA));
-+			break;
-+		}
-+	}
-+
-+	tg3_nvram_unlock(tp);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+		u32 nvaccess = tr32(NVRAM_ACCESS);
-+
-+		tw32_f(NVRAM_ACCESS, nvaccess & ~ACCESS_ENABLE);
-+	}
-+
-+	if (i >= 1000)
-+		return -EBUSY;
-+
-+	return 0;
-+}
-+
-+struct subsys_tbl_ent {
-+	u16 subsys_vendor, subsys_devid;
-+	u32 phy_id;
-+};
-+
-+static struct subsys_tbl_ent subsys_id_to_phy_id[] = {
-+	/* Broadcom boards. */
-+	{ PCI_VENDOR_ID_BROADCOM, 0x1644, PHY_ID_BCM5401 }, /* BCM95700A6 */
-+	{ PCI_VENDOR_ID_BROADCOM, 0x0001, PHY_ID_BCM5701 }, /* BCM95701A5 */
-+	{ PCI_VENDOR_ID_BROADCOM, 0x0002, PHY_ID_BCM8002 }, /* BCM95700T6 */
-+	{ PCI_VENDOR_ID_BROADCOM, 0x0003, 0 },		    /* BCM95700A9 */
-+	{ PCI_VENDOR_ID_BROADCOM, 0x0005, PHY_ID_BCM5701 }, /* BCM95701T1 */
-+	{ PCI_VENDOR_ID_BROADCOM, 0x0006, PHY_ID_BCM5701 }, /* BCM95701T8 */
-+	{ PCI_VENDOR_ID_BROADCOM, 0x0007, 0 },		    /* BCM95701A7 */
-+	{ PCI_VENDOR_ID_BROADCOM, 0x0008, PHY_ID_BCM5701 }, /* BCM95701A10 */
-+	{ PCI_VENDOR_ID_BROADCOM, 0x8008, PHY_ID_BCM5701 }, /* BCM95701A12 */
-+	{ PCI_VENDOR_ID_BROADCOM, 0x0009, PHY_ID_BCM5703 }, /* BCM95703Ax1 */
-+	{ PCI_VENDOR_ID_BROADCOM, 0x8009, PHY_ID_BCM5703 }, /* BCM95703Ax2 */
-+
-+	/* 3com boards. */
-+	{ PCI_VENDOR_ID_3COM, 0x1000, PHY_ID_BCM5401 }, /* 3C996T */
-+	{ PCI_VENDOR_ID_3COM, 0x1006, PHY_ID_BCM5701 }, /* 3C996BT */
-+	{ PCI_VENDOR_ID_3COM, 0x1004, 0 },		/* 3C996SX */
-+	{ PCI_VENDOR_ID_3COM, 0x1007, PHY_ID_BCM5701 }, /* 3C1000T */
-+	{ PCI_VENDOR_ID_3COM, 0x1008, PHY_ID_BCM5701 }, /* 3C940BR01 */
-+
-+	/* DELL boards. */
-+	{ PCI_VENDOR_ID_DELL, 0x00d1, PHY_ID_BCM5401 }, /* VIPER */
-+	{ PCI_VENDOR_ID_DELL, 0x0106, PHY_ID_BCM5401 }, /* JAGUAR */
-+	{ PCI_VENDOR_ID_DELL, 0x0109, PHY_ID_BCM5411 }, /* MERLOT */
-+	{ PCI_VENDOR_ID_DELL, 0x010a, PHY_ID_BCM5411 }, /* SLIM_MERLOT */
-+
-+	/* Compaq boards. */
-+	{ PCI_VENDOR_ID_COMPAQ, 0x007c, PHY_ID_BCM5701 }, /* BANSHEE */
-+	{ PCI_VENDOR_ID_COMPAQ, 0x009a, PHY_ID_BCM5701 }, /* BANSHEE_2 */
-+	{ PCI_VENDOR_ID_COMPAQ, 0x007d, 0 },		  /* CHANGELING */
-+	{ PCI_VENDOR_ID_COMPAQ, 0x0085, PHY_ID_BCM5701 }, /* NC7780 */
-+	{ PCI_VENDOR_ID_COMPAQ, 0x0099, PHY_ID_BCM5701 }, /* NC7780_2 */
-+
-+	/* IBM boards. */
-+	{ PCI_VENDOR_ID_IBM, 0x0281, 0 } /* IBM??? */
-+};
-+
-+static inline struct subsys_tbl_ent *lookup_by_subsys(struct tg3 *tp)
-+{
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(subsys_id_to_phy_id); i++) {
-+		if ((subsys_id_to_phy_id[i].subsys_vendor ==
-+		     tp->pdev->subsystem_vendor) &&
-+		    (subsys_id_to_phy_id[i].subsys_devid ==
-+		     tp->pdev->subsystem_device))
-+			return &subsys_id_to_phy_id[i];
-+	}
-+	return NULL;
-+}
-+
-+static int __devinit tg3_phy_probe(struct tg3 *tp)
-+{
-+	u32 eeprom_phy_id, hw_phy_id_1, hw_phy_id_2;
-+	u32 hw_phy_id, hw_phy_id_masked;
-+	u32 val;
-+	int eeprom_signature_found, eeprom_phy_serdes, err;
-+
-+	tp->phy_id = PHY_ID_INVALID;
-+	eeprom_phy_id = PHY_ID_INVALID;
-+	eeprom_phy_serdes = 0;
-+	eeprom_signature_found = 0;
-+	tg3_read_mem(tp, NIC_SRAM_DATA_SIG, &val);
-+	if (val == NIC_SRAM_DATA_SIG_MAGIC) {
-+		u32 nic_cfg, led_cfg;
-+		u32 nic_phy_id, cfg2;
-+
-+		tg3_read_mem(tp, NIC_SRAM_DATA_CFG, &nic_cfg);
-+		tp->nic_sram_data_cfg = nic_cfg;
-+
-+		eeprom_signature_found = 1;
-+
-+		if ((nic_cfg & NIC_SRAM_DATA_CFG_PHY_TYPE_MASK) ==
-+		    NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER)
-+			eeprom_phy_serdes = 1;
-+
-+		tg3_read_mem(tp, NIC_SRAM_DATA_PHY_ID, &nic_phy_id);
-+		if (nic_phy_id != 0) {
-+			u32 id1 = nic_phy_id & NIC_SRAM_DATA_PHY_ID1_MASK;
-+			u32 id2 = nic_phy_id & NIC_SRAM_DATA_PHY_ID2_MASK;
-+
-+			eeprom_phy_id  = (id1 >> 16) << 10;
-+			eeprom_phy_id |= (id2 & 0xfc00) << 16;
-+			eeprom_phy_id |= (id2 & 0x03ff) <<  0;
-+		} else
-+			eeprom_phy_id = 0;
-+
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+			tg3_read_mem(tp, NIC_SRAM_DATA_CFG_2, &led_cfg);
-+			led_cfg &= (NIC_SRAM_DATA_CFG_LED_MODE_MASK |
-+				    SHASTA_EXT_LED_MODE_MASK);
-+		} else
-+			led_cfg = nic_cfg & NIC_SRAM_DATA_CFG_LED_MODE_MASK;
-+
-+		switch (led_cfg) {
-+		default:
-+		case NIC_SRAM_DATA_CFG_LED_MODE_PHY_1:
-+			tp->led_ctrl = LED_CTRL_MODE_PHY_1;
-+			break;
-+
-+		case NIC_SRAM_DATA_CFG_LED_MODE_PHY_2:
-+			tp->led_ctrl = LED_CTRL_MODE_PHY_2;
-+			break;
-+
-+		case NIC_SRAM_DATA_CFG_LED_MODE_MAC:
-+			tp->led_ctrl = LED_CTRL_MODE_MAC;
-+			break;
-+
-+		case SHASTA_EXT_LED_SHARED:
-+			tp->led_ctrl = LED_CTRL_MODE_SHARED;
-+			if (tp->pci_chip_rev_id != CHIPREV_ID_5750_A0 &&
-+			    tp->pci_chip_rev_id != CHIPREV_ID_5750_A1)
-+				tp->led_ctrl |= (LED_CTRL_MODE_PHY_1 |
-+						 LED_CTRL_MODE_PHY_2);
-+			break;
-+
-+		case SHASTA_EXT_LED_MAC:
-+			tp->led_ctrl = LED_CTRL_MODE_SHASTA_MAC;
-+			break;
-+
-+		case SHASTA_EXT_LED_COMBO:
-+			tp->led_ctrl = LED_CTRL_MODE_COMBO;
-+			if (tp->pci_chip_rev_id != CHIPREV_ID_5750_A0)
-+				tp->led_ctrl |= (LED_CTRL_MODE_PHY_1 |
-+						 LED_CTRL_MODE_PHY_2);
-+			break;
-+
-+		};
-+
-+		if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
-+		     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) &&
-+		    tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL)
-+			tp->led_ctrl = LED_CTRL_MODE_PHY_2;
-+
-+		if (((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) ||
-+		     (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
-+		     (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)) &&
-+		    (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP))
-+			tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
-+
-+		if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE) {
-+			tp->tg3_flags |= TG3_FLAG_ENABLE_ASF;
-+			if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-+				tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;
-+		}
-+		if (nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL)
-+			tp->tg3_flags |= TG3_FLAG_SERDES_WOL_CAP;
-+
-+		tg3_read_mem(tp, NIC_SRAM_DATA_PHY_ID, &cfg2);
-+		if (cfg2 & (1 << 17))
-+			tp->tg3_flags2 |= TG3_FLG2_CAPACITIVE_COUPLING;
-+	}
-+
-+	/* Reading the PHY ID register can conflict with ASF
-+	 * firwmare access to the PHY hardware.
-+	 */
-+	err = 0;
-+	if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
-+		hw_phy_id = hw_phy_id_masked = PHY_ID_INVALID;
-+	} else {
-+		/* Now read the physical PHY_ID from the chip and verify
-+		 * that it is sane.  If it doesn't look good, we fall back
-+		 * to either the hard-coded table based PHY_ID and failing
-+		 * that the value found in the eeprom area.
-+		 */
-+		err |= tg3_readphy(tp, MII_PHYSID1, &hw_phy_id_1);
-+		err |= tg3_readphy(tp, MII_PHYSID2, &hw_phy_id_2);
-+
-+		hw_phy_id  = (hw_phy_id_1 & 0xffff) << 10;
-+		hw_phy_id |= (hw_phy_id_2 & 0xfc00) << 16;
-+		hw_phy_id |= (hw_phy_id_2 & 0x03ff) <<  0;
-+
-+		hw_phy_id_masked = hw_phy_id & PHY_ID_MASK;
-+	}
-+
-+	if (!err && KNOWN_PHY_ID(hw_phy_id_masked)) {
-+		tp->phy_id = hw_phy_id;
-+		if (hw_phy_id_masked == PHY_ID_BCM8002)
-+			tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
-+	} else {
-+		if (eeprom_signature_found) {
-+			tp->phy_id = eeprom_phy_id;
-+			if (eeprom_phy_serdes)
-+				tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
-+		} else {
-+			struct subsys_tbl_ent *p;
-+
-+			/* No eeprom signature?  Try the hardcoded
-+			 * subsys device table.
-+			 */
-+			p = lookup_by_subsys(tp);
-+			if (!p)
-+				return -ENODEV;
-+
-+			tp->phy_id = p->phy_id;
-+			if (!tp->phy_id ||
-+			    tp->phy_id == PHY_ID_BCM8002)
-+				tp->tg3_flags2 |= TG3_FLG2_PHY_SERDES;
-+		}
-+	}
-+
-+	if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) &&
-+	    !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) {
-+		u32 bmsr, adv_reg, tg3_ctrl;
-+
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+
-+		if (bmsr & BMSR_LSTATUS)
-+			goto skip_phy_reset;
-+		    
-+		err = tg3_phy_reset(tp);
-+		if (err)
-+			return err;
-+
-+		adv_reg = (ADVERTISE_10HALF | ADVERTISE_10FULL |
-+			   ADVERTISE_100HALF | ADVERTISE_100FULL |
-+			   ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
-+		tg3_ctrl = 0;
-+		if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY)) {
-+			tg3_ctrl = (MII_TG3_CTRL_ADV_1000_HALF |
-+				    MII_TG3_CTRL_ADV_1000_FULL);
-+			if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
-+			    tp->pci_chip_rev_id == CHIPREV_ID_5701_B0)
-+				tg3_ctrl |= (MII_TG3_CTRL_AS_MASTER |
-+					     MII_TG3_CTRL_ENABLE_AS_MASTER);
-+		}
-+
-+		if (!tg3_copper_is_advertising_all(tp)) {
-+			tg3_writephy(tp, MII_ADVERTISE, adv_reg);
-+
-+			if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY))
-+				tg3_writephy(tp, MII_TG3_CTRL, tg3_ctrl);
-+
-+			tg3_writephy(tp, MII_BMCR,
-+				     BMCR_ANENABLE | BMCR_ANRESTART);
-+		}
-+		tg3_phy_set_wirespeed(tp);
-+
-+		tg3_writephy(tp, MII_ADVERTISE, adv_reg);
-+		if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY))
-+			tg3_writephy(tp, MII_TG3_CTRL, tg3_ctrl);
-+	}
-+
-+skip_phy_reset:
-+	if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401) {
-+		err = tg3_init_5401phy_dsp(tp);
-+		if (err)
-+			return err;
-+	}
-+
-+	if (!err && ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401)) {
-+		err = tg3_init_5401phy_dsp(tp);
-+	}
-+
-+	if (!eeprom_signature_found)
-+		tp->led_ctrl = LED_CTRL_MODE_PHY_1;
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
-+		tp->link_config.advertising =
-+			(ADVERTISED_1000baseT_Half |
-+			 ADVERTISED_1000baseT_Full |
-+			 ADVERTISED_Autoneg |
-+			 ADVERTISED_FIBRE);
-+	if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
-+		tp->link_config.advertising &=
-+			~(ADVERTISED_1000baseT_Half |
-+			  ADVERTISED_1000baseT_Full);
-+
-+	return err;
-+}
-+
-+static void __devinit tg3_read_partno(struct tg3 *tp)
-+{
-+	unsigned char vpd_data[256];
-+	int i;
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_SUN_570X) {
-+		/* Sun decided not to put the necessary bits in the
-+		 * NVRAM of their onboard tg3 parts :(
-+		 */
-+		strcpy(tp->board_part_number, "Sun 570X");
-+		return;
-+	}
-+
-+	for (i = 0; i < 256; i += 4) {
-+		u32 tmp;
-+
-+		if (tg3_nvram_read(tp, 0x100 + i, &tmp))
-+			goto out_not_found;
-+
-+		vpd_data[i + 0] = ((tmp >>  0) & 0xff);
-+		vpd_data[i + 1] = ((tmp >>  8) & 0xff);
-+		vpd_data[i + 2] = ((tmp >> 16) & 0xff);
-+		vpd_data[i + 3] = ((tmp >> 24) & 0xff);
-+	}
-+
-+	/* Now parse and find the part number. */
-+	for (i = 0; i < 256; ) {
-+		unsigned char val = vpd_data[i];
-+		int block_end;
-+
-+		if (val == 0x82 || val == 0x91) {
-+			i = (i + 3 +
-+			     (vpd_data[i + 1] +
-+			      (vpd_data[i + 2] << 8)));
-+			continue;
-+		}
-+
-+		if (val != 0x90)
-+			goto out_not_found;
-+
-+		block_end = (i + 3 +
-+			     (vpd_data[i + 1] +
-+			      (vpd_data[i + 2] << 8)));
-+		i += 3;
-+		while (i < block_end) {
-+			if (vpd_data[i + 0] == 'P' &&
-+			    vpd_data[i + 1] == 'N') {
-+				int partno_len = vpd_data[i + 2];
-+
-+				if (partno_len > 24)
-+					goto out_not_found;
-+
-+				memcpy(tp->board_part_number,
-+				       &vpd_data[i + 3],
-+				       partno_len);
-+
-+				/* Success. */
-+				return;
-+			}
-+		}
-+
-+		/* Part number not found. */
-+		goto out_not_found;
-+	}
-+
-+out_not_found:
-+	strcpy(tp->board_part_number, "none");
-+}
-+
-+#ifdef CONFIG_SPARC64
-+static int __devinit tg3_is_sun_570X(struct tg3 *tp)
-+{
-+	struct pci_dev *pdev = tp->pdev;
-+	struct pcidev_cookie *pcp = pdev->sysdata;
-+
-+	if (pcp != NULL) {
-+		int node = pcp->prom_node;
-+		u32 venid;
-+		int err;
-+
-+		err = prom_getproperty(node, "subsystem-vendor-id",
-+				       (char *) &venid, sizeof(venid));
-+		if (err == 0 || err == -1)
-+			return 0;
-+		if (venid == PCI_VENDOR_ID_SUN)
-+			return 1;
-+	}
-+	return 0;
-+}
-+#endif
-+
-+static int __devinit tg3_get_invariants(struct tg3 *tp)
-+{
-+	u32 misc_ctrl_reg;
-+	u32 cacheline_sz_reg;
-+	u32 pci_state_reg, grc_misc_cfg;
-+	u32 val;
-+	u16 pci_cmd;
-+	int err;
-+
-+#ifdef CONFIG_SPARC64
-+	if (tg3_is_sun_570X(tp))
-+		tp->tg3_flags2 |= TG3_FLG2_SUN_570X;
-+#endif
-+
-+	/* If we have an AMD 762 or Intel ICH/ICH0/ICH2 chipset, write
-+	 * reordering to the mailbox registers done by the host
-+	 * controller can cause major troubles.  We read back from
-+	 * every mailbox register write to force the writes to be
-+	 * posted to the chip in order.
-+	 */
-+	if (pci_find_device(PCI_VENDOR_ID_INTEL,
-+			    PCI_DEVICE_ID_INTEL_82801AA_8, NULL) ||
-+	    pci_find_device(PCI_VENDOR_ID_INTEL,
-+			    PCI_DEVICE_ID_INTEL_82801AB_8, NULL) ||
-+	    pci_find_device(PCI_VENDOR_ID_INTEL,
-+			    PCI_DEVICE_ID_INTEL_82801BA_11, NULL) ||
-+	    pci_find_device(PCI_VENDOR_ID_INTEL,
-+			    PCI_DEVICE_ID_INTEL_82801BA_6, NULL) ||
-+	    pci_find_device(PCI_VENDOR_ID_AMD,
-+			    PCI_DEVICE_ID_AMD_FE_GATE_700C, NULL))
-+		tp->tg3_flags |= TG3_FLAG_MBOX_WRITE_REORDER;
-+
-+	/* Force memory write invalidate off.  If we leave it on,
-+	 * then on 5700_BX chips we have to enable a workaround.
-+	 * The workaround is to set the TG3PCI_DMA_RW_CTRL boundary
-+	 * to match the cacheline size.  The Broadcom driver have this
-+	 * workaround but turns MWI off all the times so never uses
-+	 * it.  This seems to suggest that the workaround is insufficient.
-+	 */
-+	pci_read_config_word(tp->pdev, PCI_COMMAND, &pci_cmd);
-+	pci_cmd &= ~PCI_COMMAND_INVALIDATE;
-+	pci_write_config_word(tp->pdev, PCI_COMMAND, pci_cmd);
-+
-+	/* It is absolutely critical that TG3PCI_MISC_HOST_CTRL
-+	 * has the register indirect write enable bit set before
-+	 * we try to access any of the MMIO registers.  It is also
-+	 * critical that the PCI-X hw workaround situation is decided
-+	 * before that as well.
-+	 */
-+	pci_read_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
-+			      &misc_ctrl_reg);
-+
-+	tp->pci_chip_rev_id = (misc_ctrl_reg >>
-+			       MISC_HOST_CTRL_CHIPREV_SHIFT);
-+
-+	/* Initialize misc host control in PCI block. */
-+	tp->misc_host_ctrl |= (misc_ctrl_reg &
-+			       MISC_HOST_CTRL_CHIPREV);
-+	pci_write_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
-+			       tp->misc_host_ctrl);
-+
-+	pci_read_config_dword(tp->pdev, TG3PCI_CACHELINESZ,
-+			      &cacheline_sz_reg);
-+
-+	tp->pci_cacheline_sz = (cacheline_sz_reg >>  0) & 0xff;
-+	tp->pci_lat_timer    = (cacheline_sz_reg >>  8) & 0xff;
-+	tp->pci_hdr_type     = (cacheline_sz_reg >> 16) & 0xff;
-+	tp->pci_bist         = (cacheline_sz_reg >> 24) & 0xff;
-+
-+	if (pci_find_capability(tp->pdev, PCI_CAP_ID_EXP) != 0)
-+		tp->tg3_flags2 |= TG3_FLG2_PCI_EXPRESS;
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 &&
-+	    tp->pci_lat_timer < 64) {
-+		tp->pci_lat_timer = 64;
-+
-+		cacheline_sz_reg  = ((tp->pci_cacheline_sz & 0xff) <<  0);
-+		cacheline_sz_reg |= ((tp->pci_lat_timer    & 0xff) <<  8);
-+		cacheline_sz_reg |= ((tp->pci_hdr_type     & 0xff) << 16);
-+		cacheline_sz_reg |= ((tp->pci_bist         & 0xff) << 24);
-+
-+		pci_write_config_dword(tp->pdev, TG3PCI_CACHELINESZ,
-+				       cacheline_sz_reg);
-+	}
-+
-+	pci_read_config_dword(tp->pdev, TG3PCI_PCISTATE,
-+			      &pci_state_reg);
-+
-+	if ((pci_state_reg & PCISTATE_CONV_PCI_MODE) == 0) {
-+		tp->tg3_flags |= TG3_FLAG_PCIX_MODE;
-+
-+		/* If this is a 5700 BX chipset, and we are in PCI-X
-+		 * mode, enable register write workaround.
-+		 *
-+		 * The workaround is to use indirect register accesses
-+		 * for all chip writes not to mailbox registers.
-+		 */
-+		if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5700_BX) {
-+			u32 pm_reg;
-+			u16 pci_cmd;
-+
-+			tp->tg3_flags |= TG3_FLAG_PCIX_TARGET_HWBUG;
-+
-+			/* The chip can have it's power management PCI config
-+			 * space registers clobbered due to this bug.
-+			 * So explicitly force the chip into D0 here.
-+			 */
-+			pci_read_config_dword(tp->pdev, TG3PCI_PM_CTRL_STAT,
-+					      &pm_reg);
-+			pm_reg &= ~PCI_PM_CTRL_STATE_MASK;
-+			pm_reg |= PCI_PM_CTRL_PME_ENABLE | 0 /* D0 */;
-+			pci_write_config_dword(tp->pdev, TG3PCI_PM_CTRL_STAT,
-+					       pm_reg);
-+
-+			/* Also, force SERR#/PERR# in PCI command. */
-+			pci_read_config_word(tp->pdev, PCI_COMMAND, &pci_cmd);
-+			pci_cmd |= PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
-+			pci_write_config_word(tp->pdev, PCI_COMMAND, pci_cmd);
-+		}
-+	}
-+
-+	/* Back to back register writes can cause problems on this chip,
-+	 * the workaround is to read back all reg writes except those to
-+	 * mailbox regs.  See tg3_write_indirect_reg32().
-+	 *
-+	 * PCI Express 5750_A0 rev chips need this workaround too.
-+	 */
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 ||
-+	    ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) &&
-+	     tp->pci_chip_rev_id == CHIPREV_ID_5750_A0))
-+		tp->tg3_flags |= TG3_FLAG_5701_REG_WRITE_BUG;
-+
-+	if ((pci_state_reg & PCISTATE_BUS_SPEED_HIGH) != 0)
-+		tp->tg3_flags |= TG3_FLAG_PCI_HIGH_SPEED;
-+	if ((pci_state_reg & PCISTATE_BUS_32BIT) != 0)
-+		tp->tg3_flags |= TG3_FLAG_PCI_32BIT;
-+
-+	/* Chip-specific fixup from Broadcom driver */
-+	if ((tp->pci_chip_rev_id == CHIPREV_ID_5704_A0) &&
-+	    (!(pci_state_reg & PCISTATE_RETRY_SAME_DMA))) {
-+		pci_state_reg |= PCISTATE_RETRY_SAME_DMA;
-+		pci_write_config_dword(tp->pdev, TG3PCI_PCISTATE, pci_state_reg);
-+	}
-+
-+	/* Force the chip into D0. */
-+	err = tg3_set_power_state(tp, 0);
-+	if (err) {
-+		printk(KERN_ERR PFX "(%s) transition to D0 failed\n",
-+		       pci_name(tp->pdev));
-+		return err;
-+	}
-+
-+	/* 5700 B0 chips do not support checksumming correctly due
-+	 * to hardware bugs.
-+	 */
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5700_B0)
-+		tp->tg3_flags |= TG3_FLAG_BROKEN_CHECKSUMS;
-+
-+	/* Pseudo-header checksum is done by hardware logic and not
-+	 * the offload processers, so make the chip do the pseudo-
-+	 * header checksums on receive.  For transmit it is more
-+	 * convenient to do the pseudo-header checksum in software
-+	 * as Linux does that on transmit for us in all cases.
-+	 */
-+	tp->tg3_flags |= TG3_FLAG_NO_TX_PSEUDO_CSUM;
-+	tp->tg3_flags &= ~TG3_FLAG_NO_RX_PSEUDO_CSUM;
-+
-+	/* Derive initial jumbo mode from MTU assigned in
-+	 * ether_setup() via the alloc_etherdev() call
-+	 */
-+	if (tp->dev->mtu > ETH_DATA_LEN)
-+		tp->tg3_flags |= TG3_FLAG_JUMBO_ENABLE;
-+
-+	/* Determine WakeOnLan speed to use. */
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
-+	    tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
-+	    tp->pci_chip_rev_id == CHIPREV_ID_5701_B0 ||
-+	    tp->pci_chip_rev_id == CHIPREV_ID_5701_B2) {
-+		tp->tg3_flags &= ~(TG3_FLAG_WOL_SPEED_100MB);
-+	} else {
-+		tp->tg3_flags |= TG3_FLAG_WOL_SPEED_100MB;
-+	}
-+
-+	/* A few boards don't want Ethernet@WireSpeed phy feature */
-+	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700) ||
-+	    ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) &&
-+	     (tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) &&
-+	     (tp->pci_chip_rev_id != CHIPREV_ID_5705_A1)))
-+		tp->tg3_flags2 |= TG3_FLG2_NO_ETH_WIRE_SPEED;
-+
-+	if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5703_AX ||
-+	    GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5704_AX)
-+		tp->tg3_flags2 |= TG3_FLG2_PHY_ADC_BUG;
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0)
-+		tp->tg3_flags2 |= TG3_FLG2_PHY_5704_A0_BUG;
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-+		tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG;
-+
-+	/* Only 5701 and later support tagged irq status mode.
-+	 * Also, 5788 chips cannot use tagged irq status.
-+	 *
-+	 * However, since we are using NAPI avoid tagged irq status
-+	 * because the interrupt condition is more difficult to
-+	 * fully clear in that mode.
-+	 */
-+	tp->coalesce_mode = 0;
-+
-+	if (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5700_AX &&
-+	    GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5700_BX)
-+		tp->coalesce_mode |= HOSTCC_MODE_32BYTE;
-+
-+	/* Initialize MAC MI mode, polling disabled. */
-+	tw32_f(MAC_MI_MODE, tp->mi_mode);
-+	udelay(80);
-+
-+	/* Initialize data/descriptor byte/word swapping. */
-+	val = tr32(GRC_MODE);
-+	val &= GRC_MODE_HOST_STACKUP;
-+	tw32(GRC_MODE, val | tp->grc_mode);
-+
-+	tg3_switch_clocks(tp);
-+
-+	/* Clear this out for sanity. */
-+	tw32(TG3PCI_MEM_WIN_BASE_ADDR, 0);
-+
-+	pci_read_config_dword(tp->pdev, TG3PCI_PCISTATE,
-+			      &pci_state_reg);
-+	if ((pci_state_reg & PCISTATE_CONV_PCI_MODE) == 0 &&
-+	    (tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG) == 0) {
-+		u32 chiprevid = GET_CHIP_REV_ID(tp->misc_host_ctrl);
-+
-+		if (chiprevid == CHIPREV_ID_5701_A0 ||
-+		    chiprevid == CHIPREV_ID_5701_B0 ||
-+		    chiprevid == CHIPREV_ID_5701_B2 ||
-+		    chiprevid == CHIPREV_ID_5701_B5) {
-+			void __iomem *sram_base;
-+
-+			/* Write some dummy words into the SRAM status block
-+			 * area, see if it reads back correctly.  If the return
-+			 * value is bad, force enable the PCIX workaround.
-+			 */
-+			sram_base = tp->regs + NIC_SRAM_WIN_BASE + NIC_SRAM_STATS_BLK;
-+
-+			writel(0x00000000, sram_base);
-+			writel(0x00000000, sram_base + 4);
-+			writel(0xffffffff, sram_base + 4);
-+			if (readl(sram_base) != 0x00000000)
-+				tp->tg3_flags |= TG3_FLAG_PCIX_TARGET_HWBUG;
-+		}
-+	}
-+
-+	udelay(50);
-+	tg3_nvram_init(tp);
-+
-+	grc_misc_cfg = tr32(GRC_MISC_CFG);
-+	grc_misc_cfg &= GRC_MISC_CFG_BOARD_ID_MASK;
-+
-+	/* Broadcom's driver says that CIOBE multisplit has a bug */
-+#if 0
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 &&
-+	    grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5704CIOBE) {
-+		tp->tg3_flags |= TG3_FLAG_SPLIT_MODE;
-+		tp->split_mode_max_reqs = SPLIT_MODE_5704_MAX_REQ;
-+	}
-+#endif
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
-+	    (grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5788 ||
-+	     grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5788M))
-+		tp->tg3_flags2 |= TG3_FLG2_IS_5788;
-+
-+	/* these are limited to 10/100 only */
-+	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 &&
-+	     (grc_misc_cfg == 0x8000 || grc_misc_cfg == 0x4000)) ||
-+	    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
-+	     tp->pdev->vendor == PCI_VENDOR_ID_BROADCOM &&
-+	     (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5901 ||
-+	      tp->pdev->device == PCI_DEVICE_ID_TIGON3_5901_2 ||
-+	      tp->pdev->device == PCI_DEVICE_ID_TIGON3_5705F)) ||
-+	    (tp->pdev->vendor == PCI_VENDOR_ID_BROADCOM &&
-+	     (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5751F ||
-+	      tp->pdev->device == PCI_DEVICE_ID_TIGON3_5753F)))
-+		tp->tg3_flags |= TG3_FLAG_10_100_ONLY;
-+
-+	err = tg3_phy_probe(tp);
-+	if (err) {
-+		printk(KERN_ERR PFX "(%s) phy probe failed, err %d\n",
-+		       pci_name(tp->pdev), err);
-+		/* ... but do not return immediately ... */
-+	}
-+
-+	tg3_read_partno(tp);
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
-+		tp->tg3_flags &= ~TG3_FLAG_USE_MI_INTERRUPT;
-+	} else {
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700)
-+			tp->tg3_flags |= TG3_FLAG_USE_MI_INTERRUPT;
-+		else
-+			tp->tg3_flags &= ~TG3_FLAG_USE_MI_INTERRUPT;
-+	}
-+
-+	/* 5700 {AX,BX} chips have a broken status block link
-+	 * change bit implementation, so we must use the
-+	 * status register in those cases.
-+	 */
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700)
-+		tp->tg3_flags |= TG3_FLAG_USE_LINKCHG_REG;
-+	else
-+		tp->tg3_flags &= ~TG3_FLAG_USE_LINKCHG_REG;
-+
-+	/* The led_ctrl is set during tg3_phy_probe, here we might
-+	 * have to force the link status polling mechanism based
-+	 * upon subsystem IDs.
-+	 */
-+	if (tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL &&
-+	    !(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
-+		tp->tg3_flags |= (TG3_FLAG_USE_MI_INTERRUPT |
-+				  TG3_FLAG_USE_LINKCHG_REG);
-+	}
-+
-+	/* For all SERDES we poll the MAC status register. */
-+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
-+		tp->tg3_flags |= TG3_FLAG_POLL_SERDES;
-+	else
-+		tp->tg3_flags &= ~TG3_FLAG_POLL_SERDES;
-+
-+	/* 5700 BX chips need to have their TX producer index mailboxes
-+	 * written twice to workaround a bug.
-+	 */
-+	if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5700_BX)
-+		tp->tg3_flags |= TG3_FLAG_TXD_MBOX_HWBUG;
-+	else
-+		tp->tg3_flags &= ~TG3_FLAG_TXD_MBOX_HWBUG;
-+
-+	/* It seems all chips can get confused if TX buffers
-+	 * straddle the 4GB address boundary in some cases.
-+	 */
-+	tp->dev->hard_start_xmit = tg3_start_xmit;
-+
-+	tp->rx_offset = 2;
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 &&
-+	    (tp->tg3_flags & TG3_FLAG_PCIX_MODE) != 0)
-+		tp->rx_offset = 0;
-+
-+	/* By default, disable wake-on-lan.  User can change this
-+	 * using ETHTOOL_SWOL.
-+	 */
-+	tp->tg3_flags &= ~TG3_FLAG_WOL_ENABLE;
-+
-+	return err;
-+}
-+
-+#ifdef CONFIG_SPARC64
-+static int __devinit tg3_get_macaddr_sparc(struct tg3 *tp)
-+{
-+	struct net_device *dev = tp->dev;
-+	struct pci_dev *pdev = tp->pdev;
-+	struct pcidev_cookie *pcp = pdev->sysdata;
-+
-+	if (pcp != NULL) {
-+		int node = pcp->prom_node;
-+
-+		if (prom_getproplen(node, "local-mac-address") == 6) {
-+			prom_getproperty(node, "local-mac-address",
-+					 dev->dev_addr, 6);
-+			return 0;
-+		}
-+	}
-+	return -ENODEV;
-+}
-+
-+static int __devinit tg3_get_default_macaddr_sparc(struct tg3 *tp)
-+{
-+	struct net_device *dev = tp->dev;
-+
-+	memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
-+	return 0;
-+}
-+#endif
-+
-+static int __devinit tg3_get_device_address(struct tg3 *tp)
-+{
-+	struct net_device *dev = tp->dev;
-+	u32 hi, lo, mac_offset;
-+
-+#ifdef CONFIG_SPARC64
-+	if (!tg3_get_macaddr_sparc(tp))
-+		return 0;
-+#endif
-+
-+	mac_offset = 0x7c;
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 &&
-+	    !(tp->tg3_flags & TG3_FLG2_SUN_570X)) {
-+		if (tr32(TG3PCI_DUAL_MAC_CTRL) & DUAL_MAC_CTRL_ID)
-+			mac_offset = 0xcc;
-+		if (tg3_nvram_lock(tp))
-+			tw32_f(NVRAM_CMD, NVRAM_CMD_RESET);
-+		else
-+			tg3_nvram_unlock(tp);
-+	}
-+
-+	/* First try to get it from MAC address mailbox. */
-+	tg3_read_mem(tp, NIC_SRAM_MAC_ADDR_HIGH_MBOX, &hi);
-+	if ((hi >> 16) == 0x484b) {
-+		dev->dev_addr[0] = (hi >>  8) & 0xff;
-+		dev->dev_addr[1] = (hi >>  0) & 0xff;
-+
-+		tg3_read_mem(tp, NIC_SRAM_MAC_ADDR_LOW_MBOX, &lo);
-+		dev->dev_addr[2] = (lo >> 24) & 0xff;
-+		dev->dev_addr[3] = (lo >> 16) & 0xff;
-+		dev->dev_addr[4] = (lo >>  8) & 0xff;
-+		dev->dev_addr[5] = (lo >>  0) & 0xff;
-+	}
-+	/* Next, try NVRAM. */
-+	else if (!(tp->tg3_flags & TG3_FLG2_SUN_570X) &&
-+		 !tg3_nvram_read(tp, mac_offset + 0, &hi) &&
-+		 !tg3_nvram_read(tp, mac_offset + 4, &lo)) {
-+		dev->dev_addr[0] = ((hi >> 16) & 0xff);
-+		dev->dev_addr[1] = ((hi >> 24) & 0xff);
-+		dev->dev_addr[2] = ((lo >>  0) & 0xff);
-+		dev->dev_addr[3] = ((lo >>  8) & 0xff);
-+		dev->dev_addr[4] = ((lo >> 16) & 0xff);
-+		dev->dev_addr[5] = ((lo >> 24) & 0xff);
-+	}
-+	/* Finally just fetch it out of the MAC control regs. */
-+	else {
-+		hi = tr32(MAC_ADDR_0_HIGH);
-+		lo = tr32(MAC_ADDR_0_LOW);
-+
-+		dev->dev_addr[5] = lo & 0xff;
-+		dev->dev_addr[4] = (lo >> 8) & 0xff;
-+		dev->dev_addr[3] = (lo >> 16) & 0xff;
-+		dev->dev_addr[2] = (lo >> 24) & 0xff;
-+		dev->dev_addr[1] = hi & 0xff;
-+		dev->dev_addr[0] = (hi >> 8) & 0xff;
-+	}
-+
-+	if (!is_valid_ether_addr(&dev->dev_addr[0])) {
-+#ifdef CONFIG_SPARC64
-+		if (!tg3_get_default_macaddr_sparc(tp))
-+			return 0;
-+#endif
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+static int __devinit tg3_do_test_dma(struct tg3 *tp, u32 *buf, dma_addr_t buf_dma, int size, int to_device)
-+{
-+	struct tg3_internal_buffer_desc test_desc;
-+	u32 sram_dma_descs;
-+	int i, ret;
-+
-+	sram_dma_descs = NIC_SRAM_DMA_DESC_POOL_BASE;
-+
-+	tw32(FTQ_RCVBD_COMP_FIFO_ENQDEQ, 0);
-+	tw32(FTQ_RCVDATA_COMP_FIFO_ENQDEQ, 0);
-+	tw32(RDMAC_STATUS, 0);
-+	tw32(WDMAC_STATUS, 0);
-+
-+	tw32(BUFMGR_MODE, 0);
-+	tw32(FTQ_RESET, 0);
-+
-+	test_desc.addr_hi = ((u64) buf_dma) >> 32;
-+	test_desc.addr_lo = buf_dma & 0xffffffff;
-+	test_desc.nic_mbuf = 0x00002100;
-+	test_desc.len = size;
-+
-+	/*
-+	 * HP ZX1 was seeing test failures for 5701 cards running at 33Mhz
-+	 * the *second* time the tg3 driver was getting loaded after an
-+	 * initial scan.
-+	 *
-+	 * Broadcom tells me:
-+	 *   ...the DMA engine is connected to the GRC block and a DMA
-+	 *   reset may affect the GRC block in some unpredictable way...
-+	 *   The behavior of resets to individual blocks has not been tested.
-+	 *
-+	 * Broadcom noted the GRC reset will also reset all sub-components.
-+	 */
-+	if (to_device) {
-+		test_desc.cqid_sqid = (13 << 8) | 2;
-+
-+		tw32_f(RDMAC_MODE, RDMAC_MODE_ENABLE);
-+		udelay(40);
-+	} else {
-+		test_desc.cqid_sqid = (16 << 8) | 7;
-+
-+		tw32_f(WDMAC_MODE, WDMAC_MODE_ENABLE);
-+		udelay(40);
-+	}
-+	test_desc.flags = 0x00000005;
-+
-+	for (i = 0; i < (sizeof(test_desc) / sizeof(u32)); i++) {
-+		u32 val;
-+
-+		val = *(((u32 *)&test_desc) + i);
-+		pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR,
-+				       sram_dma_descs + (i * sizeof(u32)));
-+		pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_DATA, val);
-+	}
-+	pci_write_config_dword(tp->pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
-+
-+	if (to_device) {
-+		tw32(FTQ_DMA_HIGH_READ_FIFO_ENQDEQ, sram_dma_descs);
-+	} else {
-+		tw32(FTQ_DMA_HIGH_WRITE_FIFO_ENQDEQ, sram_dma_descs);
-+	}
-+
-+	ret = -ENODEV;
-+	for (i = 0; i < 40; i++) {
-+		u32 val;
-+
-+		if (to_device)
-+			val = tr32(FTQ_RCVBD_COMP_FIFO_ENQDEQ);
-+		else
-+			val = tr32(FTQ_RCVDATA_COMP_FIFO_ENQDEQ);
-+		if ((val & 0xffff) == sram_dma_descs) {
-+			ret = 0;
-+			break;
-+		}
-+
-+		udelay(100);
-+	}
-+
-+	return ret;
-+}
-+
-+#define TEST_BUFFER_SIZE	0x400
-+
-+static int __devinit tg3_test_dma(struct tg3 *tp)
-+{
-+	dma_addr_t buf_dma;
-+	u32 *buf;
-+	int ret;
-+
-+	buf = pci_alloc_consistent(tp->pdev, TEST_BUFFER_SIZE, &buf_dma);
-+	if (!buf) {
-+		ret = -ENOMEM;
-+		goto out_nofree;
-+	}
-+
-+	tp->dma_rwctrl = ((0x7 << DMA_RWCTRL_PCI_WRITE_CMD_SHIFT) |
-+			  (0x6 << DMA_RWCTRL_PCI_READ_CMD_SHIFT));
-+
-+#ifndef CONFIG_X86
-+	{
-+		u8 byte;
-+		int cacheline_size;
-+		pci_read_config_byte(tp->pdev, PCI_CACHE_LINE_SIZE, &byte);
-+
-+		if (byte == 0)
-+			cacheline_size = 1024;
-+		else
-+			cacheline_size = (int) byte * 4;
-+
-+		switch (cacheline_size) {
-+		case 16:
-+		case 32:
-+		case 64:
-+		case 128:
-+			if ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) &&
-+			    !(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS)) {
-+				tp->dma_rwctrl |=
-+					DMA_RWCTRL_WRITE_BNDRY_384_PCIX;
-+				break;
-+			} else if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
-+				tp->dma_rwctrl &=
-+					~(DMA_RWCTRL_PCI_WRITE_CMD);
-+				tp->dma_rwctrl |=
-+					DMA_RWCTRL_WRITE_BNDRY_128_PCIE;
-+				break;
-+			}
-+			/* fallthrough */
-+		case 256:
-+			if (!(tp->tg3_flags & TG3_FLAG_PCIX_MODE) &&
-+			    !(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS))
-+				tp->dma_rwctrl |=
-+					DMA_RWCTRL_WRITE_BNDRY_256;
-+			else if (!(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS))
-+				tp->dma_rwctrl |=
-+					DMA_RWCTRL_WRITE_BNDRY_256_PCIX;
-+		};
-+	}
-+#endif
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
-+		/* DMA read watermark not used on PCIE */
-+		tp->dma_rwctrl |= 0x00180000;
-+	} else if (!(tp->tg3_flags & TG3_FLAG_PCIX_MODE)) {
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
-+		    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)
-+			tp->dma_rwctrl |= 0x003f0000;
-+		else
-+			tp->dma_rwctrl |= 0x003f000f;
-+	} else {
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 ||
-+		    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
-+			u32 ccval = (tr32(TG3PCI_CLOCK_CTRL) & 0x1f);
-+
-+			if (ccval == 0x6 || ccval == 0x7)
-+				tp->dma_rwctrl |= DMA_RWCTRL_ONE_DMA;
-+
-+			/* Set bit 23 to renable PCIX hw bug fix */
-+			tp->dma_rwctrl |= 0x009f0000;
-+		} else {
-+			tp->dma_rwctrl |= 0x001b000f;
-+		}
-+	}
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)
-+		tp->dma_rwctrl &= 0xfffffff0;
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) {
-+		/* Remove this if it causes problems for some boards. */
-+		tp->dma_rwctrl |= DMA_RWCTRL_USE_MEM_READ_MULT;
-+
-+		/* On 5700/5701 chips, we need to set this bit.
-+		 * Otherwise the chip will issue cacheline transactions
-+		 * to streamable DMA memory with not all the byte
-+		 * enables turned on.  This is an error on several
-+		 * RISC PCI controllers, in particular sparc64.
-+		 *
-+		 * On 5703/5704 chips, this bit has been reassigned
-+		 * a different meaning.  In particular, it is used
-+		 * on those chips to enable a PCI-X workaround.
-+		 */
-+		tp->dma_rwctrl |= DMA_RWCTRL_ASSERT_ALL_BE;
-+	}
-+
-+	tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);
-+
-+#if 0
-+	/* Unneeded, already done by tg3_get_invariants.  */
-+	tg3_switch_clocks(tp);
-+#endif
-+
-+	ret = 0;
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701)
-+		goto out;
-+
-+	while (1) {
-+		u32 *p = buf, i;
-+
-+		for (i = 0; i < TEST_BUFFER_SIZE / sizeof(u32); i++)
-+			p[i] = i;
-+
-+		/* Send the buffer to the chip. */
-+		ret = tg3_do_test_dma(tp, buf, buf_dma, TEST_BUFFER_SIZE, 1);
-+		if (ret) {
-+			printk(KERN_ERR "tg3_test_dma() Write the buffer failed %d\n", ret);
-+			break;
-+		}
-+
-+#if 0
-+		/* validate data reached card RAM correctly. */
-+		for (i = 0; i < TEST_BUFFER_SIZE / sizeof(u32); i++) {
-+			u32 val;
-+			tg3_read_mem(tp, 0x2100 + (i*4), &val);
-+			if (le32_to_cpu(val) != p[i]) {
-+				printk(KERN_ERR "  tg3_test_dma()  Card buffer corrupted on write! (%d != %d)\n", val, i);
-+				/* ret = -ENODEV here? */
-+			}
-+			p[i] = 0;
-+		}
-+#endif
-+		/* Now read it back. */
-+		ret = tg3_do_test_dma(tp, buf, buf_dma, TEST_BUFFER_SIZE, 0);
-+		if (ret) {
-+			printk(KERN_ERR "tg3_test_dma() Read the buffer failed %d\n", ret);
-+
-+			break;
-+		}
-+
-+		/* Verify it. */
-+		for (i = 0; i < TEST_BUFFER_SIZE / sizeof(u32); i++) {
-+			if (p[i] == i)
-+				continue;
-+
-+			if ((tp->dma_rwctrl & DMA_RWCTRL_WRITE_BNDRY_MASK) ==
-+			    DMA_RWCTRL_WRITE_BNDRY_DISAB) {
-+				tp->dma_rwctrl |= DMA_RWCTRL_WRITE_BNDRY_16;
-+				tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);
-+				break;
-+			} else {
-+				printk(KERN_ERR "tg3_test_dma() buffer corrupted on read back! (%d != %d)\n", p[i], i);
-+				ret = -ENODEV;
-+				goto out;
-+			}
-+		}
-+
-+		if (i == (TEST_BUFFER_SIZE / sizeof(u32))) {
-+			/* Success. */
-+			ret = 0;
-+			break;
-+		}
-+	}
-+
-+out:
-+	pci_free_consistent(tp->pdev, TEST_BUFFER_SIZE, buf, buf_dma);
-+out_nofree:
-+	return ret;
-+}
-+
-+static void __devinit tg3_init_link_config(struct tg3 *tp)
-+{
-+	tp->link_config.advertising =
-+		(ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
-+		 ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
-+		 ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full |
-+		 ADVERTISED_Autoneg | ADVERTISED_MII);
-+	tp->link_config.speed = SPEED_INVALID;
-+	tp->link_config.duplex = DUPLEX_INVALID;
-+	tp->link_config.autoneg = AUTONEG_ENABLE;
-+	netif_carrier_off(tp->dev);
-+	tp->link_config.active_speed = SPEED_INVALID;
-+	tp->link_config.active_duplex = DUPLEX_INVALID;
-+	tp->link_config.phy_is_low_power = 0;
-+	tp->link_config.orig_speed = SPEED_INVALID;
-+	tp->link_config.orig_duplex = DUPLEX_INVALID;
-+	tp->link_config.orig_autoneg = AUTONEG_INVALID;
-+}
-+
-+static void __devinit tg3_init_bufmgr_config(struct tg3 *tp)
-+{
-+	tp->bufmgr_config.mbuf_read_dma_low_water =
-+		DEFAULT_MB_RDMA_LOW_WATER;
-+	tp->bufmgr_config.mbuf_mac_rx_low_water =
-+		DEFAULT_MB_MACRX_LOW_WATER;
-+	tp->bufmgr_config.mbuf_high_water =
-+		DEFAULT_MB_HIGH_WATER;
-+
-+	tp->bufmgr_config.mbuf_read_dma_low_water_jumbo =
-+		DEFAULT_MB_RDMA_LOW_WATER_JUMBO;
-+	tp->bufmgr_config.mbuf_mac_rx_low_water_jumbo =
-+		DEFAULT_MB_MACRX_LOW_WATER_JUMBO;
-+	tp->bufmgr_config.mbuf_high_water_jumbo =
-+		DEFAULT_MB_HIGH_WATER_JUMBO;
-+
-+	tp->bufmgr_config.dma_low_water = DEFAULT_DMA_LOW_WATER;
-+	tp->bufmgr_config.dma_high_water = DEFAULT_DMA_HIGH_WATER;
-+}
-+
-+static char * __devinit tg3_phy_string(struct tg3 *tp)
-+{
-+	switch (tp->phy_id & PHY_ID_MASK) {
-+	case PHY_ID_BCM5400:	return "5400";
-+	case PHY_ID_BCM5401:	return "5401";
-+	case PHY_ID_BCM5411:	return "5411";
-+	case PHY_ID_BCM5701:	return "5701";
-+	case PHY_ID_BCM5703:	return "5703";
-+	case PHY_ID_BCM5704:	return "5704";
-+	case PHY_ID_BCM5705:	return "5705";
-+	case PHY_ID_BCM5750:	return "5750";
-+	case PHY_ID_BCM8002:	return "8002/serdes";
-+	case 0:			return "serdes";
-+	default:		return "unknown";
-+	};
-+}
-+
-+static struct pci_dev * __devinit tg3_find_5704_peer(struct tg3 *tp)
-+{
-+	struct pci_dev *peer;
-+	unsigned int func, devnr = tp->pdev->devfn & ~7;
-+
-+	for (func = 0; func < 8; func++) {
-+		peer = pci_get_slot(tp->pdev->bus, devnr | func);
-+		if (peer && peer != tp->pdev)
-+			break;
-+		pci_dev_put(peer);
-+	}
-+	if (!peer || peer == tp->pdev)
-+		BUG();
-+
-+	/*
-+	 * We don't need to keep the refcount elevated; there's no way
-+	 * to remove one half of this device without removing the other
-+	 */
-+	pci_dev_put(peer);
-+
-+	return peer;
-+}
-+
-+static int __devinit tg3_init_one(struct pci_dev *pdev,
-+				  const struct pci_device_id *ent)
-+{
-+	static int tg3_version_printed = 0;
-+	unsigned long tg3reg_base, tg3reg_len;
-+	struct net_device *dev;
-+	struct tg3 *tp;
-+	int i, err, pci_using_dac, pm_cap;
-+
-+	if (tg3_version_printed++ == 0)
-+		printk(KERN_INFO "%s", version);
-+
-+	err = pci_enable_device(pdev);
-+	if (err) {
-+		printk(KERN_ERR PFX "Cannot enable PCI device, "
-+		       "aborting.\n");
-+		return err;
-+	}
-+
-+	if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
-+		printk(KERN_ERR PFX "Cannot find proper PCI device "
-+		       "base address, aborting.\n");
-+		err = -ENODEV;
-+		goto err_out_disable_pdev;
-+	}
-+
-+	err = pci_request_regions(pdev, DRV_MODULE_NAME);
-+	if (err) {
-+		printk(KERN_ERR PFX "Cannot obtain PCI resources, "
-+		       "aborting.\n");
-+		goto err_out_disable_pdev;
-+	}
-+
-+	pci_set_master(pdev);
-+
-+	/* Find power-management capability. */
-+	pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
-+	if (pm_cap == 0) {
-+		printk(KERN_ERR PFX "Cannot find PowerManagement capability, "
-+		       "aborting.\n");
-+		err = -EIO;
-+		goto err_out_free_res;
-+	}
-+
-+	/* Configure DMA attributes. */
-+	err = pci_set_dma_mask(pdev, 0xffffffffffffffffULL);
-+	if (!err) {
-+		pci_using_dac = 1;
-+		err = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);
-+		if (err < 0) {
-+			printk(KERN_ERR PFX "Unable to obtain 64 bit DMA "
-+			       "for consistent allocations\n");
-+			goto err_out_free_res;
-+		}
-+	} else {
-+		err = pci_set_dma_mask(pdev, 0xffffffffULL);
-+		if (err) {
-+			printk(KERN_ERR PFX "No usable DMA configuration, "
-+			       "aborting.\n");
-+			goto err_out_free_res;
-+		}
-+		pci_using_dac = 0;
-+	}
-+
-+	tg3reg_base = pci_resource_start(pdev, 0);
-+	tg3reg_len = pci_resource_len(pdev, 0);
-+
-+	dev = alloc_etherdev(sizeof(*tp));
-+	if (!dev) {
-+		printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");
-+		err = -ENOMEM;
-+		goto err_out_free_res;
-+	}
-+
-+	SET_MODULE_OWNER(dev);
-+	SET_NETDEV_DEV(dev, &pdev->dev);
-+
-+	if (pci_using_dac)
-+		dev->features |= NETIF_F_HIGHDMA;
-+	dev->features |= NETIF_F_LLTX;
-+#if TG3_VLAN_TAG_USED
-+	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-+	dev->vlan_rx_register = tg3_vlan_rx_register;
-+	dev->vlan_rx_kill_vid = tg3_vlan_rx_kill_vid;
-+#endif
-+
-+	tp = netdev_priv(dev);
-+	tp->pdev = pdev;
-+	tp->dev = dev;
-+	tp->pm_cap = pm_cap;
-+	tp->mac_mode = TG3_DEF_MAC_MODE;
-+	tp->rx_mode = TG3_DEF_RX_MODE;
-+	tp->tx_mode = TG3_DEF_TX_MODE;
-+	tp->mi_mode = MAC_MI_MODE_BASE;
-+	if (tg3_debug > 0)
-+		tp->msg_enable = tg3_debug;
-+	else
-+		tp->msg_enable = TG3_DEF_MSG_ENABLE;
-+
-+	/* The word/byte swap controls here control register access byte
-+	 * swapping.  DMA data byte swapping is controlled in the GRC_MODE
-+	 * setting below.
-+	 */
-+	tp->misc_host_ctrl =
-+		MISC_HOST_CTRL_MASK_PCI_INT |
-+		MISC_HOST_CTRL_WORD_SWAP |
-+		MISC_HOST_CTRL_INDIR_ACCESS |
-+		MISC_HOST_CTRL_PCISTATE_RW;
-+
-+	/* The NONFRM (non-frame) byte/word swap controls take effect
-+	 * on descriptor entries, anything which isn't packet data.
-+	 *
-+	 * The StrongARM chips on the board (one for tx, one for rx)
-+	 * are running in big-endian mode.
-+	 */
-+	tp->grc_mode = (GRC_MODE_WSWAP_DATA | GRC_MODE_BSWAP_DATA |
-+			GRC_MODE_WSWAP_NONFRM_DATA);
-+#ifdef __BIG_ENDIAN
-+	tp->grc_mode |= GRC_MODE_BSWAP_NONFRM_DATA;
-+#endif
-+	spin_lock_init(&tp->lock);
-+	spin_lock_init(&tp->tx_lock);
-+	spin_lock_init(&tp->indirect_lock);
-+	INIT_WORK(&tp->reset_task, tg3_reset_task, tp);
-+
-+	tp->regs = ioremap_nocache(tg3reg_base, tg3reg_len);
-+	if (tp->regs == 0UL) {
-+		printk(KERN_ERR PFX "Cannot map device registers, "
-+		       "aborting.\n");
-+		err = -ENOMEM;
-+		goto err_out_free_dev;
-+	}
-+
-+	tg3_init_link_config(tp);
-+
-+	tg3_init_bufmgr_config(tp);
-+
-+	tp->rx_pending = TG3_DEF_RX_RING_PENDING;
-+	tp->rx_jumbo_pending = TG3_DEF_RX_JUMBO_RING_PENDING;
-+	tp->tx_pending = TG3_DEF_TX_RING_PENDING;
-+
-+	dev->open = tg3_open;
-+	dev->stop = tg3_close;
-+	dev->get_stats = tg3_get_stats;
-+	dev->set_multicast_list = tg3_set_rx_mode;
-+	dev->set_mac_address = tg3_set_mac_addr;
-+	dev->do_ioctl = tg3_ioctl;
-+	dev->tx_timeout = tg3_tx_timeout;
-+	dev->poll = tg3_poll;
-+	dev->ethtool_ops = &tg3_ethtool_ops;
-+	dev->weight = 64;
-+	dev->watchdog_timeo = TG3_TX_TIMEOUT;
-+	dev->change_mtu = tg3_change_mtu;
-+	dev->irq = pdev->irq;
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+	dev->poll_controller = tg3_poll_controller;
-+#endif
-+
-+	err = tg3_get_invariants(tp);
-+	if (err) {
-+		printk(KERN_ERR PFX "Problem fetching invariants of chip, "
-+		       "aborting.\n");
-+		goto err_out_iounmap;
-+	}
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
-+		tp->bufmgr_config.mbuf_read_dma_low_water =
-+			DEFAULT_MB_RDMA_LOW_WATER_5705;
-+		tp->bufmgr_config.mbuf_mac_rx_low_water =
-+			DEFAULT_MB_MACRX_LOW_WATER_5705;
-+		tp->bufmgr_config.mbuf_high_water =
-+			DEFAULT_MB_HIGH_WATER_5705;
-+	}
-+
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0) {
-+		/* Ick.  This needs firmware loading. */
-+		err = tg3_request_firmware(&tg3_fw_5701_a0,
-+					   "tg3/5701_a0-0.0.0", tp);
-+		if (err)
-+			goto err_out_iounmap;
-+	}
-+
-+#if TG3_TSO_SUPPORT != 0
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 ||
-+	    tp->pci_chip_rev_id == CHIPREV_ID_5705_A0 ||
-+	    ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0 &&
-+	     GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750)) {
-+		tp->tg3_flags2 &= ~TG3_FLG2_TSO_CAPABLE;
-+	} else {
-+		const char *name;
-+
-+		name = "tg3/tso-1.4.0";
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
-+			/* 5705 needs a special version of the TSO firmware. */
-+			name = "tg3/tso_5705-1.1.0";
-+		}
-+		err = tg3_request_firmware(&tg3_fw_tso5, name, tp);
-+		if (err) {
-+			/* We can function without TSO; pretend it's
-+			 * not supported. */
-+			printk(KERN_INFO PFX "%s: Firmware \"%s\" not "
-+			       "loaded; continuing without TSO.\n",
-+			       tp->dev->name, name);
-+			tp->tg3_flags2 &= ~TG3_FLG2_TSO_CAPABLE;
-+		} else
-+			tp->tg3_flags2 |= TG3_FLG2_TSO_CAPABLE;
-+	}
-+
-+	/* TSO is off by default, user can enable using ethtool.  */
-+#if 0
-+	if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE)
-+		dev->features |= NETIF_F_TSO;
-+#endif
-+
-+#endif
-+
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 &&
-+	    !(tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) &&
-+	    !(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH)) {
-+		tp->tg3_flags2 |= TG3_FLG2_MAX_RXPEND_64;
-+		tp->rx_pending = 63;
-+	}
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)
-+		tp->pdev_peer = tg3_find_5704_peer(tp);
-+
-+	err = tg3_get_device_address(tp);
-+	if (err) {
-+		printk(KERN_ERR PFX "Could not obtain valid ethernet address, "
-+		       "aborting.\n");
-+		goto err_out_iounmap;
-+	}
-+
-+	/*
-+	 * Reset chip in case UNDI or EFI driver did not shutdown
-+	 * DMA self test will enable WDMAC and we'll see (spurious)
-+	 * pending DMA on the PCI bus at that point.
-+	 */
-+	if ((tr32(HOSTCC_MODE) & HOSTCC_MODE_ENABLE) ||
-+	    (tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) {
-+		pci_save_state(tp->pdev);
-+		tw32(MEMARB_MODE, MEMARB_MODE_ENABLE);
-+		tg3_halt(tp);
-+	}
-+
-+	err = tg3_test_dma(tp);
-+	if (err) {
-+		printk(KERN_ERR PFX "DMA engine test failed, aborting.\n");
-+		goto err_out_iounmap;
-+	}
-+
-+	/* Tigon3 can do ipv4 only... and some chips have buggy
-+	 * checksumming.
-+	 */
-+	if ((tp->tg3_flags & TG3_FLAG_BROKEN_CHECKSUMS) == 0) {
-+		dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
-+		tp->tg3_flags |= TG3_FLAG_RX_CHECKSUMS;
-+	} else
-+		tp->tg3_flags &= ~TG3_FLAG_RX_CHECKSUMS;
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_IS_5788)
-+		dev->features &= ~NETIF_F_HIGHDMA;
-+
-+	/* flow control autonegotiation is default behavior */
-+	tp->tg3_flags |= TG3_FLAG_PAUSE_AUTONEG;
-+
-+	err = register_netdev(dev);
-+	if (err) {
-+		printk(KERN_ERR PFX "Cannot register net device, "
-+		       "aborting.\n");
-+		goto err_out_iounmap;
-+	}
-+
-+	pci_set_drvdata(pdev, dev);
-+
-+	/* Now that we have fully setup the chip, save away a snapshot
-+	 * of the PCI config space.  We need to restore this after
-+	 * GRC_MISC_CFG core clock resets and some resume events.
-+	 */
-+	pci_save_state(tp->pdev);
-+
-+	printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (PCI%s:%s:%s) %sBaseT Ethernet ",
-+	       dev->name,
-+	       tp->board_part_number,
-+	       tp->pci_chip_rev_id,
-+	       tg3_phy_string(tp),
-+	       ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "X" : ""),
-+	       ((tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED) ?
-+		((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "133MHz" : "66MHz") :
-+		((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "100MHz" : "33MHz")),
-+	       ((tp->tg3_flags & TG3_FLAG_PCI_32BIT) ? "32-bit" : "64-bit"),
-+	       (tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100" : "10/100/1000");
-+
-+	for (i = 0; i < 6; i++)
-+		printk("%2.2x%c", dev->dev_addr[i],
-+		       i == 5 ? '\n' : ':');
-+
-+	printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] "
-+	       "MIirq[%d] ASF[%d] Split[%d] WireSpeed[%d] "
-+	       "TSOcap[%d] \n",
-+	       dev->name,
-+	       (tp->tg3_flags & TG3_FLAG_RX_CHECKSUMS) != 0,
-+	       (tp->tg3_flags & TG3_FLAG_USE_LINKCHG_REG) != 0,
-+	       (tp->tg3_flags & TG3_FLAG_USE_MI_INTERRUPT) != 0,
-+	       (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0,
-+	       (tp->tg3_flags & TG3_FLAG_SPLIT_MODE) != 0,
-+	       (tp->tg3_flags2 & TG3_FLG2_NO_ETH_WIRE_SPEED) == 0,
-+	       (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) != 0);
-+
-+	return 0;
-+
-+err_out_iounmap:
-+	iounmap(tp->regs);
-+
-+err_out_free_dev:
-+	free_netdev(dev);
-+
-+err_out_free_res:
-+	pci_release_regions(pdev);
-+
-+err_out_disable_pdev:
-+	pci_disable_device(pdev);
-+	pci_set_drvdata(pdev, NULL);
-+	return err;
-+}
-+
-+static void __devexit tg3_remove_one(struct pci_dev *pdev)
-+{
-+	struct net_device *dev = pci_get_drvdata(pdev);
-+
-+	if (dev) {
-+		struct tg3 *tp = netdev_priv(dev);
-+
-+		unregister_netdev(dev);
-+		iounmap(tp->regs);
-+		free_netdev(dev);
-+		pci_release_regions(pdev);
-+		pci_disable_device(pdev);
-+		pci_set_drvdata(pdev, NULL);
-+	}
-+}
-+
-+static int tg3_suspend(struct pci_dev *pdev, u32 state)
-+{
-+	struct net_device *dev = pci_get_drvdata(pdev);
-+	struct tg3 *tp = netdev_priv(dev);
-+	int err;
-+
-+	if (!netif_running(dev))
-+		return 0;
-+
-+	tg3_netif_stop(tp);
-+
-+	del_timer_sync(&tp->timer);
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+	tg3_disable_ints(tp);
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+
-+	netif_device_detach(dev);
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+	tg3_halt(tp);
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+
-+	err = tg3_set_power_state(tp, state);
-+	if (err) {
-+		spin_lock_irq(&tp->lock);
-+		spin_lock(&tp->tx_lock);
-+
-+		tg3_init_hw(tp);
-+
-+		tp->timer.expires = jiffies + tp->timer_offset;
-+		add_timer(&tp->timer);
-+
-+		netif_device_attach(dev);
-+		tg3_netif_start(tp);
-+
-+		spin_unlock(&tp->tx_lock);
-+		spin_unlock_irq(&tp->lock);
-+	}
-+
-+	return err;
-+}
-+
-+static int tg3_resume(struct pci_dev *pdev)
-+{
-+	struct net_device *dev = pci_get_drvdata(pdev);
-+	struct tg3 *tp = netdev_priv(dev);
-+	int err;
-+
-+	if (!netif_running(dev))
-+		return 0;
-+
-+	pci_restore_state(tp->pdev);
-+
-+	err = tg3_set_power_state(tp, 0);
-+	if (err)
-+		return err;
-+
-+	netif_device_attach(dev);
-+
-+	spin_lock_irq(&tp->lock);
-+	spin_lock(&tp->tx_lock);
-+
-+	tg3_init_hw(tp);
-+
-+	tp->timer.expires = jiffies + tp->timer_offset;
-+	add_timer(&tp->timer);
-+
-+	tg3_enable_ints(tp);
-+
-+	tg3_netif_start(tp);
-+
-+	spin_unlock(&tp->tx_lock);
-+	spin_unlock_irq(&tp->lock);
-+
-+	return 0;
-+}
-+
-+static struct pci_driver tg3_driver = {
-+	.name		= DRV_MODULE_NAME,
-+	.id_table	= tg3_pci_tbl,
-+	.probe		= tg3_init_one,
-+	.remove		= __devexit_p(tg3_remove_one),
-+	.suspend	= tg3_suspend,
-+	.resume		= tg3_resume
-+};
-+
-+static int __init tg3_init(void)
-+{
-+	return pci_module_init(&tg3_driver);
-+}
-+
-+static void __exit tg3_cleanup(void)
-+{
-+	/* Clean up any leftover firmware.  We can't currently
-+	 * do this in tg3_remove_one, because we don't know whether
-+	 * any of the other devices need the firmware. */
-+	tg3_release_firmware(&tg3_fw_5701_a0);
-+#if TG3_TSO_SUPPORT != 0
-+	tg3_release_firmware(&tg3_fw_tso5);
-+	tg3_release_firmware(&tg3_fw_tso);
-+#endif /* TG3_TSO_SUPPORT */
-+
-+	pci_unregister_driver(&tg3_driver);
-+}
-+
-+module_init(tg3_init);
-+module_exit(tg3_cleanup);

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-08 21:44:08 UTC (rev 2656)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-08 21:48:15 UTC (rev 2657)
@@ -45,7 +45,6 @@
 + docbook-fix-function-parameter-descriptin-in-fbmem.dpatch
 + docbook-move-kernel-doc-comment-next-to-function.dpatch
 + drivers-add-scsi_changer.dpatch
-+ drivers-net-tg3-readd.dpatch
 + modular-ide-pnp.dpatch
 + x86-i486_emu.dpatch
 + powerpc-therm-adt746x-new-i2c-fix.dpatch