]> git.ipfire.org Git - thirdparty/ipxe.git/commitdiff
[intel] Replace driver for Intel Gigabit NICs
authorMichael Brown <mcb30@ipxe.org>
Mon, 23 Apr 2012 22:29:18 +0000 (23:29 +0100)
committerMichael Brown <mcb30@ipxe.org>
Mon, 23 Apr 2012 22:29:18 +0000 (23:29 +0100)
Tested-by: Robin Smidsrød <robin@smidsrod.no>
Tested-by: Thomas Miletich <thomas.miletich@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
65 files changed:
src/drivers/net/e1000/e1000.c [deleted file]
src/drivers/net/e1000/e1000.h [deleted file]
src/drivers/net/e1000/e1000_82540.c [deleted file]
src/drivers/net/e1000/e1000_82541.c [deleted file]
src/drivers/net/e1000/e1000_82541.h [deleted file]
src/drivers/net/e1000/e1000_82542.c [deleted file]
src/drivers/net/e1000/e1000_82543.c [deleted file]
src/drivers/net/e1000/e1000_82543.h [deleted file]
src/drivers/net/e1000/e1000_api.c [deleted file]
src/drivers/net/e1000/e1000_api.h [deleted file]
src/drivers/net/e1000/e1000_defines.h [deleted file]
src/drivers/net/e1000/e1000_hw.h [deleted file]
src/drivers/net/e1000/e1000_mac.c [deleted file]
src/drivers/net/e1000/e1000_mac.h [deleted file]
src/drivers/net/e1000/e1000_main.c [deleted file]
src/drivers/net/e1000/e1000_manage.c [deleted file]
src/drivers/net/e1000/e1000_manage.h [deleted file]
src/drivers/net/e1000/e1000_nvm.c [deleted file]
src/drivers/net/e1000/e1000_nvm.h [deleted file]
src/drivers/net/e1000/e1000_osdep.h [deleted file]
src/drivers/net/e1000/e1000_phy.c [deleted file]
src/drivers/net/e1000/e1000_phy.h [deleted file]
src/drivers/net/e1000/e1000_regs.h [deleted file]
src/drivers/net/e1000e/e1000e.c [deleted file]
src/drivers/net/e1000e/e1000e.h [deleted file]
src/drivers/net/e1000e/e1000e_80003es2lan.c [deleted file]
src/drivers/net/e1000e/e1000e_80003es2lan.h [deleted file]
src/drivers/net/e1000e/e1000e_82571.c [deleted file]
src/drivers/net/e1000e/e1000e_82571.h [deleted file]
src/drivers/net/e1000e/e1000e_defines.h [deleted file]
src/drivers/net/e1000e/e1000e_hw.h [deleted file]
src/drivers/net/e1000e/e1000e_ich8lan.c [deleted file]
src/drivers/net/e1000e/e1000e_ich8lan.h [deleted file]
src/drivers/net/e1000e/e1000e_mac.c [deleted file]
src/drivers/net/e1000e/e1000e_mac.h [deleted file]
src/drivers/net/e1000e/e1000e_main.c [deleted file]
src/drivers/net/e1000e/e1000e_manage.c [deleted file]
src/drivers/net/e1000e/e1000e_manage.h [deleted file]
src/drivers/net/e1000e/e1000e_nvm.c [deleted file]
src/drivers/net/e1000e/e1000e_nvm.h [deleted file]
src/drivers/net/e1000e/e1000e_phy.c [deleted file]
src/drivers/net/e1000e/e1000e_phy.h [deleted file]
src/drivers/net/e1000e/e1000e_regs.h [deleted file]
src/drivers/net/igb/igb.c [deleted file]
src/drivers/net/igb/igb.h [deleted file]
src/drivers/net/igb/igb_82575.c [deleted file]
src/drivers/net/igb/igb_82575.h [deleted file]
src/drivers/net/igb/igb_api.c [deleted file]
src/drivers/net/igb/igb_api.h [deleted file]
src/drivers/net/igb/igb_defines.h [deleted file]
src/drivers/net/igb/igb_hw.h [deleted file]
src/drivers/net/igb/igb_mac.c [deleted file]
src/drivers/net/igb/igb_mac.h [deleted file]
src/drivers/net/igb/igb_main.c [deleted file]
src/drivers/net/igb/igb_manage.c [deleted file]
src/drivers/net/igb/igb_manage.h [deleted file]
src/drivers/net/igb/igb_nvm.c [deleted file]
src/drivers/net/igb/igb_nvm.h [deleted file]
src/drivers/net/igb/igb_osdep.h [deleted file]
src/drivers/net/igb/igb_phy.c [deleted file]
src/drivers/net/igb/igb_phy.h [deleted file]
src/drivers/net/igb/igb_regs.h [deleted file]
src/drivers/net/intel.c [new file with mode: 0644]
src/drivers/net/intel.h [new file with mode: 0644]
src/include/ipxe/errfile.h

diff --git a/src/drivers/net/e1000/e1000.c b/src/drivers/net/e1000/e1000.c
deleted file mode 100644 (file)
index a32a4d7..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-REQUIRE_OBJECT(e1000_main);
-REQUIRE_OBJECT(e1000_82540);
-REQUIRE_OBJECT(e1000_82541);
-REQUIRE_OBJECT(e1000_82542);
-REQUIRE_OBJECT(e1000_82543);
diff --git a/src/drivers/net/e1000/e1000.h b/src/drivers/net/e1000/e1000.h
deleted file mode 100644 (file)
index 31dbb85..0000000
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-/* Linux PRO/1000 Ethernet Driver main header file */
-
-#ifndef _E1000_H_
-#define _E1000_H_
-
-#include "e1000_api.h"
-
-#define BAR_0          0
-#define BAR_1          1
-#define BAR_5          5
-
-struct e1000_adapter;
-
-/* TX/RX descriptor defines */
-#define E1000_DEFAULT_TXD                  256
-#define E1000_MAX_TXD                      256
-#define E1000_MIN_TXD                       80
-#define E1000_MAX_82544_TXD               4096
-
-#define E1000_DEFAULT_TXD_PWR               12
-#define E1000_MAX_TXD_PWR                   12
-#define E1000_MIN_TXD_PWR                    7
-
-#define E1000_DEFAULT_RXD                  256
-#define E1000_MAX_RXD                      256
-
-#define E1000_MIN_RXD                       80
-#define E1000_MAX_82544_RXD               4096
-
-#define E1000_MIN_ITR_USECS                 10 /* 100000 irq/sec */
-#define E1000_MAX_ITR_USECS              10000 /* 100    irq/sec */
-
-
-/* this is the size past which hardware will drop packets when setting LPE=0 */
-#define MAXIMUM_ETHERNET_VLAN_SIZE 1522
-
-/* Supported Rx Buffer Sizes */
-#define E1000_RXBUFFER_128   128
-#define E1000_RXBUFFER_256   256
-#define E1000_RXBUFFER_512   512
-#define E1000_RXBUFFER_1024  1024
-#define E1000_RXBUFFER_2048  2048
-#define E1000_RXBUFFER_4096  4096
-#define E1000_RXBUFFER_8192  8192
-#define E1000_RXBUFFER_16384 16384
-
-/* SmartSpeed delimiters */
-#define E1000_SMARTSPEED_DOWNSHIFT 3
-#define E1000_SMARTSPEED_MAX       15
-
-/* Packet Buffer allocations */
-#define E1000_PBA_BYTES_SHIFT 0xA
-#define E1000_TX_HEAD_ADDR_SHIFT 7
-#define E1000_PBA_TX_MASK 0xFFFF0000
-
-/* Early Receive defines */
-#define E1000_ERT_2048 0x100
-
-#define E1000_FC_PAUSE_TIME 0x0680 /* 858 usec */
-
-/* How many Tx Descriptors do we need to call netif_wake_queue ? */
-#define E1000_TX_QUEUE_WAKE    16
-/* How many Rx Buffers do we bundle into one write to the hardware ? */
-#define E1000_RX_BUFFER_WRITE  16      /* Must be power of 2 */
-
-#define AUTO_ALL_MODES            0
-#define E1000_EEPROM_82544_APM    0x0004
-#define E1000_EEPROM_APME         0x0400
-
-/* wrapper around a pointer to a socket buffer,
- * so a DMA handle can be stored along with the buffer */
-struct e1000_buffer {
-       struct sk_buff *skb;
-       dma_addr_t dma;
-       unsigned long time_stamp;
-       u16 length;
-       u16 next_to_watch;
-};
-
-struct e1000_rx_buffer {
-       struct sk_buff *skb;
-       dma_addr_t dma;
-       struct page *page;
-};
-
-
-
-struct e1000_tx_ring {
-       /* pointer to the descriptor ring memory */
-       void *desc;
-       /* physical address of the descriptor ring */
-       dma_addr_t dma;
-       /* length of descriptor ring in bytes */
-       unsigned int size;
-       /* number of descriptors in the ring */
-       unsigned int count;
-       /* next descriptor to associate a buffer with */
-       unsigned int next_to_use;
-       /* next descriptor to check for DD status bit */
-       unsigned int next_to_clean;
-       /* array of buffer information structs */
-       struct e1000_buffer *buffer_info;
-
-       spinlock_t tx_lock;
-       u16 tdh;
-       u16 tdt;
-
-       /* TXDdescriptor index increment to be used when advancing
-       * to the next descriptor. This is normally one, but on some
-       * architectures, but on some architectures there are cache
-       * coherency issues that require only the first descriptor in
-       * cache line can be used.
-       */
-       unsigned int step;
-
-       bool last_tx_tso;
-};
-
-struct e1000_rx_ring {
-       struct e1000_adapter *adapter; /* back link */
-       /* pointer to the descriptor ring memory */
-       void *desc;
-       /* physical address of the descriptor ring */
-       dma_addr_t dma;
-       /* length of descriptor ring in bytes */
-       unsigned int size;
-       /* number of descriptors in the ring */
-       unsigned int count;
-       /* next descriptor to associate a buffer with */
-       unsigned int next_to_use;
-       /* next descriptor to check for DD status bit */
-       unsigned int next_to_clean;
-       /* array of buffer information structs */
-       struct e1000_rx_buffer *buffer_info;
-       struct sk_buff *rx_skb_top;
-
-       /* cpu for rx queue */
-       int cpu;
-
-       u16 rdh;
-       u16 rdt;
-};
-
-
-#define E1000_TX_DESC_INC(R,index) \
-       {index += (R)->step; if (index == (R)->count) index = 0; }
-
-#define E1000_TX_DESC_DEC(R,index) \
-       { if (index == 0) index = (R)->count - (R)->step; \
-       else index -= (R)->step; }
-
-#define E1000_DESC_UNUSED(R) \
-       ((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \
-       (R)->next_to_clean - (R)->next_to_use - 1)
-
-#define E1000_RX_DESC_EXT(R, i)            \
-       (&(((union e1000_rx_desc_extended *)((R).desc))[i]))
-#define E1000_GET_DESC(R, i, type)     (&(((struct type *)((R).desc))[i]))
-#define E1000_RX_DESC(R, i)            E1000_GET_DESC(R, i, e1000_rx_desc)
-#define E1000_TX_DESC(R, i)            E1000_GET_DESC(R, i, e1000_tx_desc)
-#define E1000_CONTEXT_DESC(R, i)       E1000_GET_DESC(R, i, e1000_context_desc)
-
-/* board specific private data structure */
-
-struct e1000_adapter {
-       u32 bd_number;
-       u32 rx_buffer_len;
-       u32 wol;
-       u32 smartspeed;
-       u32 en_mng_pt;
-       u16 link_speed;
-       u16 link_duplex;
-       spinlock_t stats_lock;
-       unsigned int total_tx_bytes;
-       unsigned int total_tx_packets;
-       unsigned int total_rx_bytes;
-       unsigned int total_rx_packets;
-       /* Interrupt Throttle Rate */
-       u32 itr;
-       u32 itr_setting;
-       u16 tx_itr;
-       u16 rx_itr;
-
-       bool fc_autoneg;
-
-       /* TX */
-       struct e1000_tx_ring *tx_ring;
-       unsigned int restart_queue;
-       unsigned long tx_queue_len;
-       u32 txd_cmd;
-       u32 tx_int_delay;
-       u32 tx_abs_int_delay;
-       u32 gotc;
-       u64 gotc_old;
-       u64 tpt_old;
-       u64 colc_old;
-       u32 tx_timeout_count;
-       u32 tx_fifo_head;
-       u32 tx_head_addr;
-       u32 tx_fifo_size;
-       u8 tx_timeout_factor;
-       bool pcix_82544;
-       bool detect_tx_hung;
-
-       /* RX */
-       bool (*clean_rx) (struct e1000_adapter *adapter,
-                              struct e1000_rx_ring *rx_ring);
-       void (*alloc_rx_buf) (struct e1000_adapter *adapter,
-                             struct e1000_rx_ring *rx_ring,
-                               int cleaned_count);
-       struct e1000_rx_ring *rx_ring;
-
-       u64 hw_csum_err;
-       u64 hw_csum_good;
-       u32 alloc_rx_buff_failed;
-       u32 rx_int_delay;
-       u32 rx_abs_int_delay;
-       bool rx_csum;
-       u32 gorc;
-       u64 gorc_old;
-       u32 max_frame_size;
-       u32 min_frame_size;
-
-
-       /* OS defined structs */
-       struct net_device *netdev;
-       struct pci_device *pdev;
-       struct net_device_stats net_stats;
-
-       /* structs defined in e1000_hw.h */
-       struct e1000_hw hw;
-       struct e1000_hw_stats stats;
-       struct e1000_phy_info phy_info;
-       struct e1000_phy_stats phy_stats;
-
-       int msg_enable;
-       /* to not mess up cache alignment, always add to the bottom */
-       unsigned long state;
-       u32 eeprom_wol;
-
-       u32 *config_space;
-
-       /* hardware capability, feature, and workaround flags */
-       unsigned int flags;
-
-       /* upper limit parameter for tx desc size */
-       u32 tx_desc_pwr;
-
-#define NUM_TX_DESC    8
-#define NUM_RX_DESC    8
-
-       struct io_buffer *tx_iobuf[NUM_TX_DESC];
-       struct io_buffer *rx_iobuf[NUM_RX_DESC];
-
-       struct e1000_tx_desc *tx_base;
-       struct e1000_rx_desc *rx_base;
-
-       uint32_t tx_ring_size;
-       uint32_t rx_ring_size;
-
-       uint32_t tx_head;
-       uint32_t tx_tail;
-       uint32_t tx_fill_ctr;
-
-       uint32_t rx_curr;
-
-       uint32_t ioaddr;
-       uint32_t irqno;
-};
-
-#define E1000_FLAG_HAS_SMBUS                (1 << 0)
-#define E1000_FLAG_HAS_INTR_MODERATION      (1 << 4)
-#define E1000_FLAG_BAD_TX_CARRIER_STATS_FD  (1 << 6)
-#define E1000_FLAG_QUAD_PORT_A              (1 << 8)
-#define E1000_FLAG_SMART_POWER_DOWN         (1 << 9)
-
-extern char e1000_driver_name[];
-extern const char e1000_driver_version[];
-
-extern void e1000_power_up_phy(struct e1000_hw *hw);
-
-extern void e1000_set_ethtool_ops(struct net_device *netdev);
-extern void e1000_check_options(struct e1000_adapter *adapter);
-
-extern int e1000_up(struct e1000_adapter *adapter);
-extern void e1000_down(struct e1000_adapter *adapter);
-extern void e1000_reinit_locked(struct e1000_adapter *adapter);
-extern void e1000_reset(struct e1000_adapter *adapter);
-extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx);
-extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
-extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
-extern void e1000_update_stats(struct e1000_adapter *adapter);
-
-#endif /* _E1000_H_ */
diff --git a/src/drivers/net/e1000/e1000_82540.c b/src/drivers/net/e1000/e1000_82540.c
deleted file mode 100644 (file)
index 41f3f97..0000000
+++ /dev/null
@@ -1,754 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/*
- * 82540EM Gigabit Ethernet Controller
- * 82540EP Gigabit Ethernet Controller
- * 82545EM Gigabit Ethernet Controller (Copper)
- * 82545EM Gigabit Ethernet Controller (Fiber)
- * 82545GM Gigabit Ethernet Controller
- * 82546EB Gigabit Ethernet Controller (Copper)
- * 82546EB Gigabit Ethernet Controller (Fiber)
- * 82546GB Gigabit Ethernet Controller
- */
-
-#include "e1000_api.h"
-
-static s32  e1000_init_phy_params_82540(struct e1000_hw *hw);
-static s32  e1000_init_nvm_params_82540(struct e1000_hw *hw);
-static s32  e1000_init_mac_params_82540(struct e1000_hw *hw);
-static s32  e1000_adjust_serdes_amplitude_82540(struct e1000_hw *hw);
-static void e1000_clear_hw_cntrs_82540(struct e1000_hw *hw);
-static s32  e1000_init_hw_82540(struct e1000_hw *hw);
-static s32  e1000_reset_hw_82540(struct e1000_hw *hw);
-static s32  e1000_set_phy_mode_82540(struct e1000_hw *hw);
-static s32  e1000_set_vco_speed_82540(struct e1000_hw *hw);
-static s32  e1000_setup_copper_link_82540(struct e1000_hw *hw);
-static s32  e1000_setup_fiber_serdes_link_82540(struct e1000_hw *hw);
-static void e1000_power_down_phy_copper_82540(struct e1000_hw *hw);
-static s32  e1000_read_mac_addr_82540(struct e1000_hw *hw);
-
-/**
- * e1000_init_phy_params_82540 - Init PHY func ptrs.
- * @hw: pointer to the HW structure
- **/
-static s32 e1000_init_phy_params_82540(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-
-       phy->addr                      = 1;
-       phy->autoneg_mask              = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-       phy->reset_delay_us            = 10000;
-       phy->type                      = e1000_phy_m88;
-
-       /* Function Pointers */
-       phy->ops.check_polarity        = e1000_check_polarity_m88;
-       phy->ops.commit                = e1000_phy_sw_reset_generic;
-#if 0
-       phy->ops.force_speed_duplex    = e1000_phy_force_speed_duplex_m88;
-#endif
-#if 0
-       phy->ops.get_cable_length      = e1000_get_cable_length_m88;
-#endif
-       phy->ops.get_cfg_done          = e1000_get_cfg_done_generic;
-       phy->ops.read_reg              = e1000_read_phy_reg_m88;
-       phy->ops.reset                 = e1000_phy_hw_reset_generic;
-       phy->ops.write_reg             = e1000_write_phy_reg_m88;
-       phy->ops.get_info              = e1000_get_phy_info_m88;
-       phy->ops.power_up              = e1000_power_up_phy_copper;
-       phy->ops.power_down            = e1000_power_down_phy_copper_82540;
-
-       ret_val = e1000_get_phy_id(hw);
-       if (ret_val)
-               goto out;
-
-       /* Verify phy id */
-       switch (hw->mac.type) {
-       case e1000_82540:
-       case e1000_82545:
-       case e1000_82545_rev_3:
-       case e1000_82546:
-       case e1000_82546_rev_3:
-               if (phy->id == M88E1011_I_PHY_ID)
-                       break;
-               /* Fall Through */
-       default:
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-               break;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- * e1000_init_nvm_params_82540 - Init NVM func ptrs.
- * @hw: pointer to the HW structure
- **/
-static s32 e1000_init_nvm_params_82540(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = E1000_READ_REG(hw, E1000_EECD);
-
-       DEBUGFUNC("e1000_init_nvm_params_82540");
-
-       nvm->type               = e1000_nvm_eeprom_microwire;
-       nvm->delay_usec         = 50;
-       nvm->opcode_bits        = 3;
-       switch (nvm->override) {
-       case e1000_nvm_override_microwire_large:
-               nvm->address_bits       = 8;
-               nvm->word_size          = 256;
-               break;
-       case e1000_nvm_override_microwire_small:
-               nvm->address_bits       = 6;
-               nvm->word_size          = 64;
-               break;
-       default:
-               nvm->address_bits       = eecd & E1000_EECD_SIZE ? 8 : 6;
-               nvm->word_size          = eecd & E1000_EECD_SIZE ? 256 : 64;
-               break;
-       }
-
-       /* Function Pointers */
-       nvm->ops.acquire            = e1000_acquire_nvm_generic;
-       nvm->ops.read               = e1000_read_nvm_microwire;
-       nvm->ops.release            = e1000_release_nvm_generic;
-       nvm->ops.update             = e1000_update_nvm_checksum_generic;
-       nvm->ops.valid_led_default  = e1000_valid_led_default_generic;
-       nvm->ops.validate           = e1000_validate_nvm_checksum_generic;
-       nvm->ops.write              = e1000_write_nvm_microwire;
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_init_mac_params_82540 - Init MAC func ptrs.
- * @hw: pointer to the HW structure
- **/
-static s32 e1000_init_mac_params_82540(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_init_mac_params_82540");
-
-       /* Set media type */
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82545EM_FIBER:
-       case E1000_DEV_ID_82545GM_FIBER:
-       case E1000_DEV_ID_82546EB_FIBER:
-       case E1000_DEV_ID_82546GB_FIBER:
-               hw->phy.media_type = e1000_media_type_fiber;
-               break;
-       case E1000_DEV_ID_82545GM_SERDES:
-       case E1000_DEV_ID_82546GB_SERDES:
-               hw->phy.media_type = e1000_media_type_internal_serdes;
-               break;
-       default:
-               hw->phy.media_type = e1000_media_type_copper;
-               break;
-       }
-
-       /* Set mta register count */
-       mac->mta_reg_count = 128;
-       /* Set rar entry count */
-       mac->rar_entry_count = E1000_RAR_ENTRIES;
-
-       /* Function pointers */
-
-       /* bus type/speed/width */
-       mac->ops.get_bus_info = e1000_get_bus_info_pci_generic;
-       /* function id */
-       mac->ops.set_lan_id = e1000_set_lan_id_multi_port_pci;
-       /* reset */
-       mac->ops.reset_hw = e1000_reset_hw_82540;
-       /* hw initialization */
-       mac->ops.init_hw = e1000_init_hw_82540;
-       /* link setup */
-       mac->ops.setup_link = e1000_setup_link_generic;
-       /* physical interface setup */
-       mac->ops.setup_physical_interface =
-               (hw->phy.media_type == e1000_media_type_copper)
-                       ? e1000_setup_copper_link_82540
-                       : e1000_setup_fiber_serdes_link_82540;
-       /* check for link */
-       switch (hw->phy.media_type) {
-       case e1000_media_type_copper:
-               mac->ops.check_for_link = e1000_check_for_copper_link_generic;
-               break;
-       case e1000_media_type_fiber:
-               mac->ops.check_for_link = e1000_check_for_fiber_link_generic;
-               break;
-       case e1000_media_type_internal_serdes:
-               mac->ops.check_for_link = e1000_check_for_serdes_link_generic;
-               break;
-       default:
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-               break;
-       }
-       /* link info */
-       mac->ops.get_link_up_info =
-               (hw->phy.media_type == e1000_media_type_copper)
-                       ? e1000_get_speed_and_duplex_copper_generic
-                       : e1000_get_speed_and_duplex_fiber_serdes_generic;
-       /* multicast address update */
-       mac->ops.update_mc_addr_list = e1000_update_mc_addr_list_generic;
-       /* writing VFTA */
-       mac->ops.write_vfta = e1000_write_vfta_generic;
-       /* clearing VFTA */
-       mac->ops.clear_vfta = e1000_clear_vfta_generic;
-       /* setting MTA */
-       mac->ops.mta_set = e1000_mta_set_generic;
-       /* read mac address */
-       mac->ops.read_mac_addr = e1000_read_mac_addr_82540;
-       /* ID LED init */
-       mac->ops.id_led_init = e1000_id_led_init_generic;
-       /* setup LED */
-       mac->ops.setup_led = e1000_setup_led_generic;
-       /* cleanup LED */
-       mac->ops.cleanup_led = e1000_cleanup_led_generic;
-       /* turn on/off LED */
-       mac->ops.led_on = e1000_led_on_generic;
-       mac->ops.led_off = e1000_led_off_generic;
-       /* clear hardware counters */
-       mac->ops.clear_hw_cntrs = e1000_clear_hw_cntrs_82540;
-
-out:
-       return ret_val;
-}
-
-/**
- * e1000_init_function_pointers_82540 - Init func ptrs.
- * @hw: pointer to the HW structure
- *
- * Called to initialize all function pointers and parameters.
- **/
-void e1000_init_function_pointers_82540(struct e1000_hw *hw)
-{
-       DEBUGFUNC("e1000_init_function_pointers_82540");
-
-       hw->mac.ops.init_params = e1000_init_mac_params_82540;
-       hw->nvm.ops.init_params = e1000_init_nvm_params_82540;
-       hw->phy.ops.init_params = e1000_init_phy_params_82540;
-}
-
-/**
- *  e1000_reset_hw_82540 - Reset hardware
- *  @hw: pointer to the HW structure
- *
- *  This resets the hardware into a known state.
- **/
-static s32 e1000_reset_hw_82540(struct e1000_hw *hw)
-{
-       u32 ctrl, manc;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_reset_hw_82540");
-
-       DEBUGOUT("Masking off all interrupts\n");
-       E1000_WRITE_REG(hw, E1000_IMC, 0xFFFFFFFF);
-
-       E1000_WRITE_REG(hw, E1000_RCTL, 0);
-       E1000_WRITE_REG(hw, E1000_TCTL, E1000_TCTL_PSP);
-       E1000_WRITE_FLUSH(hw);
-
-       /*
-        * Delay to allow any outstanding PCI transactions to complete
-        * before resetting the device.
-        */
-       msec_delay(10);
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       DEBUGOUT("Issuing a global reset to 82540/82545/82546 MAC\n");
-       switch (hw->mac.type) {
-       case e1000_82545_rev_3:
-       case e1000_82546_rev_3:
-               E1000_WRITE_REG(hw, E1000_CTRL_DUP, ctrl | E1000_CTRL_RST);
-               break;
-       default:
-               /*
-                * These controllers can't ack the 64-bit write when
-                * issuing the reset, so we use IO-mapping as a
-                * workaround to issue the reset.
-                */
-               E1000_WRITE_REG_IO(hw, E1000_CTRL, ctrl | E1000_CTRL_RST);
-               break;
-       }
-
-       /* Wait for EEPROM reload */
-       msec_delay(5);
-
-       /* Disable HW ARPs on ASF enabled adapters */
-       manc = E1000_READ_REG(hw, E1000_MANC);
-       manc &= ~E1000_MANC_ARP_EN;
-       E1000_WRITE_REG(hw, E1000_MANC, manc);
-
-       E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff);
-       E1000_READ_REG(hw, E1000_ICR);
-
-       return ret_val;
-}
-
-/**
- *  e1000_init_hw_82540 - Initialize hardware
- *  @hw: pointer to the HW structure
- *
- *  This inits the hardware readying it for operation.
- **/
-static s32 e1000_init_hw_82540(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 txdctl, ctrl_ext;
-       s32 ret_val = E1000_SUCCESS;
-       u16 i;
-
-       DEBUGFUNC("e1000_init_hw_82540");
-
-       /* Initialize identification LED */
-       ret_val = mac->ops.id_led_init(hw);
-       if (ret_val) {
-               DEBUGOUT("Error initializing identification LED\n");
-               /* This is not fatal and we should not stop init due to this */
-       }
-
-       /* Disabling VLAN filtering */
-       DEBUGOUT("Initializing the IEEE VLAN\n");
-       if (mac->type < e1000_82545_rev_3)
-               E1000_WRITE_REG(hw, E1000_VET, 0);
-
-       mac->ops.clear_vfta(hw);
-
-       /* Setup the receive address. */
-       e1000_init_rx_addrs_generic(hw, mac->rar_entry_count);
-
-       /* Zero out the Multicast HASH table */
-       DEBUGOUT("Zeroing the MTA\n");
-       for (i = 0; i < mac->mta_reg_count; i++) {
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
-               /*
-                * Avoid back to back register writes by adding the register
-                * read (flush).  This is to protect against some strange
-                * bridge configurations that may issue Memory Write Block
-                * (MWB) to our register space.  The *_rev_3 hardware at
-                * least doesn't respond correctly to every other dword in an
-                * MWB to our register space.
-                */
-               E1000_WRITE_FLUSH(hw);
-       }
-
-       if (mac->type < e1000_82545_rev_3)
-               e1000_pcix_mmrbc_workaround_generic(hw);
-
-       /* Setup link and flow control */
-       ret_val = mac->ops.setup_link(hw);
-
-       txdctl = E1000_READ_REG(hw, E1000_TXDCTL(0));
-       txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |
-                E1000_TXDCTL_FULL_TX_DESC_WB;
-       E1000_WRITE_REG(hw, E1000_TXDCTL(0), txdctl);
-
-       /*
-        * Clear all of the statistics registers (clear on read).  It is
-        * important that we do this after we have tried to establish link
-        * because the symbol error count will increment wildly if there
-        * is no link.
-        */
-       e1000_clear_hw_cntrs_82540(hw);
-
-       if ((hw->device_id == E1000_DEV_ID_82546GB_QUAD_COPPER) ||
-           (hw->device_id == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3)) {
-               ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
-               /*
-                * Relaxed ordering must be disabled to avoid a parity
-                * error crash in a PCI slot.
-                */
-               ctrl_ext |= E1000_CTRL_EXT_RO_DIS;
-               E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_setup_copper_link_82540 - Configure copper link settings
- *  @hw: pointer to the HW structure
- *
- *  Calls the appropriate function to configure the link for auto-neg or forced
- *  speed and duplex.  Then we check for link, once link is established calls
- *  to configure collision distance and flow control are called.  If link is
- *  not established, we return -E1000_ERR_PHY (-2).
- **/
-static s32 e1000_setup_copper_link_82540(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       DEBUGFUNC("e1000_setup_copper_link_82540");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       ctrl |= E1000_CTRL_SLU;
-       ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-       ret_val = e1000_set_phy_mode_82540(hw);
-       if (ret_val)
-               goto out;
-
-       if (hw->mac.type == e1000_82545_rev_3 ||
-           hw->mac.type == e1000_82546_rev_3) {
-               ret_val = hw->phy.ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &data);
-               if (ret_val)
-                       goto out;
-               data |= 0x00000008;
-               ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, data);
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1000_copper_link_setup_m88(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000_setup_copper_link_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_setup_fiber_serdes_link_82540 - Setup link for fiber/serdes
- *  @hw: pointer to the HW structure
- *
- *  Set the output amplitude to the value in the EEPROM and adjust the VCO
- *  speed to improve Bit Error Rate (BER) performance.  Configures collision
- *  distance and flow control for fiber and serdes links.  Upon successful
- *  setup, poll for link.
- **/
-static s32 e1000_setup_fiber_serdes_link_82540(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_setup_fiber_serdes_link_82540");
-
-       switch (mac->type) {
-       case e1000_82545_rev_3:
-       case e1000_82546_rev_3:
-               if (hw->phy.media_type == e1000_media_type_internal_serdes) {
-                       /*
-                        * If we're on serdes media, adjust the output
-                        * amplitude to value set in the EEPROM.
-                        */
-                       ret_val = e1000_adjust_serdes_amplitude_82540(hw);
-                       if (ret_val)
-                               goto out;
-               }
-               /* Adjust VCO speed to improve BER performance */
-               ret_val = e1000_set_vco_speed_82540(hw);
-               if (ret_val)
-                       goto out;
-       default:
-               break;
-       }
-
-       ret_val = e1000_setup_fiber_serdes_link_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_adjust_serdes_amplitude_82540 - Adjust amplitude based on EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Adjust the SERDES output amplitude based on the EEPROM settings.
- **/
-static s32 e1000_adjust_serdes_amplitude_82540(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 nvm_data;
-
-       DEBUGFUNC("e1000_adjust_serdes_amplitude_82540");
-
-       ret_val = hw->nvm.ops.read(hw, NVM_SERDES_AMPLITUDE, 1, &nvm_data);
-       if (ret_val)
-               goto out;
-
-       if (nvm_data != NVM_RESERVED_WORD) {
-               /* Adjust serdes output amplitude only. */
-               nvm_data &= NVM_SERDES_AMPLITUDE_MASK;
-               ret_val = hw->phy.ops.write_reg(hw,
-                                            M88E1000_PHY_EXT_CTRL,
-                                            nvm_data);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_set_vco_speed_82540 - Set VCO speed for better performance
- *  @hw: pointer to the HW structure
- *
- *  Set the VCO speed to improve Bit Error Rate (BER) performance.
- **/
-static s32 e1000_set_vco_speed_82540(struct e1000_hw *hw)
-{
-       s32  ret_val = E1000_SUCCESS;
-       u16 default_page = 0;
-       u16 phy_data;
-
-       DEBUGFUNC("e1000_set_vco_speed_82540");
-
-       /* Set PHY register 30, page 5, bit 8 to 0 */
-
-       ret_val = hw->phy.ops.read_reg(hw,
-                                   M88E1000_PHY_PAGE_SELECT,
-                                   &default_page);
-       if (ret_val)
-               goto out;
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0005);
-       if (ret_val)
-               goto out;
-
-       ret_val = hw->phy.ops.read_reg(hw, M88E1000_PHY_GEN_CONTROL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data &= ~M88E1000_PHY_VCO_REG_BIT8;
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /* Set PHY register 30, page 4, bit 11 to 1 */
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0004);
-       if (ret_val)
-               goto out;
-
-       ret_val = hw->phy.ops.read_reg(hw, M88E1000_PHY_GEN_CONTROL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data |= M88E1000_PHY_VCO_REG_BIT11;
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, phy_data);
-       if (ret_val)
-               goto out;
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_PAGE_SELECT,
-                                     default_page);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_set_phy_mode_82540 - Set PHY to class A mode
- *  @hw: pointer to the HW structure
- *
- *  Sets the PHY to class A mode and assumes the following operations will
- *  follow to enable the new class mode:
- *    1.  Do a PHY soft reset.
- *    2.  Restart auto-negotiation or force link.
- **/
-static s32 e1000_set_phy_mode_82540(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 nvm_data;
-
-       DEBUGFUNC("e1000_set_phy_mode_82540");
-
-       if (hw->mac.type != e1000_82545_rev_3)
-               goto out;
-
-       ret_val = hw->nvm.ops.read(hw, NVM_PHY_CLASS_WORD, 1, &nvm_data);
-       if (ret_val) {
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-       if ((nvm_data != NVM_RESERVED_WORD) && (nvm_data & NVM_PHY_CLASS_A)) {
-               ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_PAGE_SELECT,
-                                             0x000B);
-               if (ret_val) {
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-               }
-               ret_val = hw->phy.ops.write_reg(hw,
-                                             M88E1000_PHY_GEN_CONTROL,
-                                             0x8104);
-               if (ret_val) {
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-               }
-
-               phy->reset_disable = false;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- * e1000_power_down_phy_copper_82540 - Remove link in case of PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, remove the link.
- **/
-static void e1000_power_down_phy_copper_82540(struct e1000_hw *hw)
-{
-       /* If the management interface is not enabled, then power down */
-       if (!(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_SMBUS_EN))
-               e1000_power_down_phy_copper(hw);
-
-       return;
-}
-
-/**
- *  e1000_clear_hw_cntrs_82540 - Clear device specific hardware counters
- *  @hw: pointer to the HW structure
- *
- *  Clears the hardware counters by reading the counter registers.
- **/
-static void e1000_clear_hw_cntrs_82540(struct e1000_hw *hw)
-{
-       DEBUGFUNC("e1000_clear_hw_cntrs_82540");
-
-       e1000_clear_hw_cntrs_base_generic(hw);
-
-#if 0
-       E1000_READ_REG(hw, E1000_PRC64);
-       E1000_READ_REG(hw, E1000_PRC127);
-       E1000_READ_REG(hw, E1000_PRC255);
-       E1000_READ_REG(hw, E1000_PRC511);
-       E1000_READ_REG(hw, E1000_PRC1023);
-       E1000_READ_REG(hw, E1000_PRC1522);
-       E1000_READ_REG(hw, E1000_PTC64);
-       E1000_READ_REG(hw, E1000_PTC127);
-       E1000_READ_REG(hw, E1000_PTC255);
-       E1000_READ_REG(hw, E1000_PTC511);
-       E1000_READ_REG(hw, E1000_PTC1023);
-       E1000_READ_REG(hw, E1000_PTC1522);
-
-       E1000_READ_REG(hw, E1000_ALGNERRC);
-       E1000_READ_REG(hw, E1000_RXERRC);
-       E1000_READ_REG(hw, E1000_TNCRS);
-       E1000_READ_REG(hw, E1000_CEXTERR);
-       E1000_READ_REG(hw, E1000_TSCTC);
-       E1000_READ_REG(hw, E1000_TSCTFC);
-
-       E1000_READ_REG(hw, E1000_MGTPRC);
-       E1000_READ_REG(hw, E1000_MGTPDC);
-       E1000_READ_REG(hw, E1000_MGTPTC);
-#endif
-}
-
-/**
- *  e1000_read_mac_addr_82540 - Read device MAC address
- *  @hw: pointer to the HW structure
- *
- *  Reads the device MAC address from the EEPROM and stores the value.
- *  Since devices with two ports use the same EEPROM, we increment the
- *  last bit in the MAC address for the second port.
- *
- *  This version is being used over generic because of customer issues
- *  with VmWare and Virtual Box when using generic. It seems in
- *  the emulated 82545, RAR[0] does NOT have a valid address after a
- *  reset, this older method works and using this breaks nothing for
- *  these legacy adapters.
- **/
-s32 e1000_read_mac_addr_82540(struct e1000_hw *hw)
-{
-       s32  ret_val = E1000_SUCCESS;
-       u16 offset, nvm_data, i;
-
-       DEBUGFUNC("e1000_read_mac_addr");
-
-       for (i = 0; i < ETH_ADDR_LEN; i += 2) {
-               offset = i >> 1;
-               ret_val = hw->nvm.ops.read(hw, offset, 1, &nvm_data);
-               if (ret_val) {
-                       DEBUGOUT("NVM Read Error\n");
-                       goto out;
-               }
-               hw->mac.perm_addr[i] = (u8)(nvm_data & 0xFF);
-               hw->mac.perm_addr[i+1] = (u8)(nvm_data >> 8);
-       }
-
-       /* Flip last bit of mac address if we're on second port */
-       if (hw->bus.func == E1000_FUNC_1)
-               hw->mac.perm_addr[5] ^= 1;
-
-       for (i = 0; i < ETH_ADDR_LEN; i++)
-               hw->mac.addr[i] = hw->mac.perm_addr[i];
-
-out:
-       return ret_val;
-}
-
-static struct pci_device_id e1000_82540_nics[] = {
-     PCI_ROM(0x8086, 0x100E, "E1000_DEV_ID_82540EM", "E1000_DEV_ID_82540EM", e1000_82540),
-     PCI_ROM(0x8086, 0x1015, "E1000_DEV_ID_82540EM_LOM", "E1000_DEV_ID_82540EM_LOM", e1000_82540),
-     PCI_ROM(0x8086, 0x1016, "E1000_DEV_ID_82540EP_LOM", "E1000_DEV_ID_82540EP_LOM", e1000_82540),
-     PCI_ROM(0x8086, 0x1017, "E1000_DEV_ID_82540EP", "E1000_DEV_ID_82540EP", e1000_82540),
-     PCI_ROM(0x8086, 0x101E, "E1000_DEV_ID_82540EP_LP", "E1000_DEV_ID_82540EP_LP", e1000_82540),
-     PCI_ROM(0x8086, 0x100F, "E1000_DEV_ID_82545EM_COPPER", "E1000_DEV_ID_82545EM_COPPER", e1000_82545),
-     PCI_ROM(0x8086, 0x1011, "E1000_DEV_ID_82545EM_FIBER", "E1000_DEV_ID_82545EM_FIBER", e1000_82545),
-     PCI_ROM(0x8086, 0x1026, "E1000_DEV_ID_82545GM_COPPER", "E1000_DEV_ID_82545GM_COPPER", e1000_82545_rev_3),
-     PCI_ROM(0x8086, 0x1027, "E1000_DEV_ID_82545GM_FIBER", "E1000_DEV_ID_82545GM_FIBER", e1000_82545_rev_3),
-     PCI_ROM(0x8086, 0x1028, "E1000_DEV_ID_82545GM_SERDES", "E1000_DEV_ID_82545GM_SERDES", e1000_82545_rev_3),
-     PCI_ROM(0x8086, 0x1010, "E1000_DEV_ID_82546EB_COPPER", "E1000_DEV_ID_82546EB_COPPER", e1000_82546),
-     PCI_ROM(0x8086, 0x1012, "E1000_DEV_ID_82546EB_FIBER", "E1000_DEV_ID_82546EB_FIBER", e1000_82546),
-     PCI_ROM(0x8086, 0x101D, "E1000_DEV_ID_82546EB_QUAD_COPPER", "E1000_DEV_ID_82546EB_QUAD_COPPER", e1000_82546),
-     PCI_ROM(0x8086, 0x1079, "E1000_DEV_ID_82546GB_COPPER", "E1000_DEV_ID_82546GB_COPPER", e1000_82546_rev_3),
-     PCI_ROM(0x8086, 0x107A, "E1000_DEV_ID_82546GB_FIBER", "E1000_DEV_ID_82546GB_FIBER", e1000_82546_rev_3),
-     PCI_ROM(0x8086, 0x107B, "E1000_DEV_ID_82546GB_SERDES", "E1000_DEV_ID_82546GB_SERDES", e1000_82546_rev_3),
-     PCI_ROM(0x8086, 0x108A, "E1000_DEV_ID_82546GB_PCIE", "E1000_DEV_ID_82546GB_PCIE", e1000_82546_rev_3),
-     PCI_ROM(0x8086, 0x1099, "E1000_DEV_ID_82546GB_QUAD_COPPER", "E1000_DEV_ID_82546GB_QUAD_COPPER", e1000_82546_rev_3),
-     PCI_ROM(0x8086, 0x10B5, "E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3", "E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3", e1000_82546_rev_3),
-};
-
-struct pci_driver e1000_82540_driver __pci_driver = {
-       .ids = e1000_82540_nics,
-       .id_count = (sizeof (e1000_82540_nics) / sizeof (e1000_82540_nics[0])),
-       .probe = e1000_probe,
-       .remove = e1000_remove,
-};
diff --git a/src/drivers/net/e1000/e1000_82541.c b/src/drivers/net/e1000/e1000_82541.c
deleted file mode 100644 (file)
index 2d1aecc..0000000
+++ /dev/null
@@ -1,1314 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/*
- * 82541EI Gigabit Ethernet Controller
- * 82541ER Gigabit Ethernet Controller
- * 82541GI Gigabit Ethernet Controller
- * 82541PI Gigabit Ethernet Controller
- * 82547EI Gigabit Ethernet Controller
- * 82547GI Gigabit Ethernet Controller
- */
-
-#include "e1000_api.h"
-
-static s32  e1000_init_phy_params_82541(struct e1000_hw *hw);
-static s32  e1000_init_nvm_params_82541(struct e1000_hw *hw);
-static s32  e1000_init_mac_params_82541(struct e1000_hw *hw);
-static s32  e1000_reset_hw_82541(struct e1000_hw *hw);
-static s32  e1000_init_hw_82541(struct e1000_hw *hw);
-static s32  e1000_get_link_up_info_82541(struct e1000_hw *hw, u16 *speed,
-                                         u16 *duplex);
-static s32  e1000_phy_hw_reset_82541(struct e1000_hw *hw);
-static s32  e1000_setup_copper_link_82541(struct e1000_hw *hw);
-static s32  e1000_check_for_link_82541(struct e1000_hw *hw);
-#if 0
-static s32  e1000_get_cable_length_igp_82541(struct e1000_hw *hw);
-#endif
-static s32  e1000_set_d3_lplu_state_82541(struct e1000_hw *hw,
-                                          bool active);
-static s32  e1000_setup_led_82541(struct e1000_hw *hw);
-static s32  e1000_cleanup_led_82541(struct e1000_hw *hw);
-static void e1000_clear_hw_cntrs_82541(struct e1000_hw *hw);
-#if 0
-static s32  e1000_config_dsp_after_link_change_82541(struct e1000_hw *hw,
-                                                     bool link_up);
-#endif
-static s32  e1000_phy_init_script_82541(struct e1000_hw *hw);
-static void e1000_power_down_phy_copper_82541(struct e1000_hw *hw);
-
-#if 0
-static const u16 e1000_igp_cable_length_table[] =
-    { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-      5, 10, 10, 10, 10, 10, 10, 10, 20, 20, 20, 20, 20, 25, 25, 25,
-      25, 25, 25, 25, 30, 30, 30, 30, 40, 40, 40, 40, 40, 40, 40, 40,
-      40, 50, 50, 50, 50, 50, 50, 50, 60, 60, 60, 60, 60, 60, 60, 60,
-      60, 70, 70, 70, 70, 70, 70, 80, 80, 80, 80, 80, 80, 90, 90, 90,
-      90, 90, 90, 90, 90, 90, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
-      100, 100, 100, 100, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110,
-      110, 110, 110, 110, 110, 110, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120};
-#define IGP01E1000_AGC_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_igp_cable_length_table) / \
-                 sizeof(e1000_igp_cable_length_table[0]))
-#endif
-/**
- *  e1000_init_phy_params_82541 - Init PHY func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_phy_params_82541(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_init_phy_params_82541");
-
-       phy->addr                      = 1;
-       phy->autoneg_mask              = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-       phy->reset_delay_us            = 10000;
-       phy->type                      = e1000_phy_igp;
-
-       /* Function Pointers */
-       phy->ops.check_polarity        = e1000_check_polarity_igp;
-#if 0
-       phy->ops.force_speed_duplex    = e1000_phy_force_speed_duplex_igp;
-#endif
-#if 0
-       phy->ops.get_cable_length      = e1000_get_cable_length_igp_82541;
-#endif
-       phy->ops.get_cfg_done          = e1000_get_cfg_done_generic;
-       phy->ops.get_info              = e1000_get_phy_info_igp;
-       phy->ops.read_reg              = e1000_read_phy_reg_igp;
-       phy->ops.reset                 = e1000_phy_hw_reset_82541;
-       phy->ops.set_d3_lplu_state     = e1000_set_d3_lplu_state_82541;
-       phy->ops.write_reg             = e1000_write_phy_reg_igp;
-       phy->ops.power_up              = e1000_power_up_phy_copper;
-       phy->ops.power_down            = e1000_power_down_phy_copper_82541;
-
-       ret_val = e1000_get_phy_id(hw);
-       if (ret_val)
-               goto out;
-
-       /* Verify phy id */
-       if (phy->id != IGP01E1000_I_PHY_ID) {
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_init_nvm_params_82541 - Init NVM func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_nvm_params_82541(struct e1000_hw *hw)
-{
-       struct   e1000_nvm_info *nvm = &hw->nvm;
-       s32  ret_val = E1000_SUCCESS;
-       u32 eecd = E1000_READ_REG(hw, E1000_EECD);
-       u16 size;
-
-       DEBUGFUNC("e1000_init_nvm_params_82541");
-
-       switch (nvm->override) {
-       case e1000_nvm_override_spi_large:
-               nvm->type = e1000_nvm_eeprom_spi;
-               eecd |= E1000_EECD_ADDR_BITS;
-               break;
-       case e1000_nvm_override_spi_small:
-               nvm->type = e1000_nvm_eeprom_spi;
-               eecd &= ~E1000_EECD_ADDR_BITS;
-               break;
-       case e1000_nvm_override_microwire_large:
-               nvm->type = e1000_nvm_eeprom_microwire;
-               eecd |= E1000_EECD_SIZE;
-               break;
-       case e1000_nvm_override_microwire_small:
-               nvm->type = e1000_nvm_eeprom_microwire;
-               eecd &= ~E1000_EECD_SIZE;
-               break;
-       default:
-               nvm->type = eecd & E1000_EECD_TYPE
-                           ? e1000_nvm_eeprom_spi
-                           : e1000_nvm_eeprom_microwire;
-               break;
-       }
-
-       if (nvm->type == e1000_nvm_eeprom_spi) {
-               nvm->address_bits       = (eecd & E1000_EECD_ADDR_BITS)
-                                         ? 16 : 8;
-               nvm->delay_usec         = 1;
-               nvm->opcode_bits        = 8;
-               nvm->page_size          = (eecd & E1000_EECD_ADDR_BITS)
-                                         ? 32 : 8;
-
-               /* Function Pointers */
-               nvm->ops.acquire        = e1000_acquire_nvm_generic;
-               nvm->ops.read           = e1000_read_nvm_spi;
-               nvm->ops.release        = e1000_release_nvm_generic;
-               nvm->ops.update         = e1000_update_nvm_checksum_generic;
-               nvm->ops.valid_led_default = e1000_valid_led_default_generic;
-               nvm->ops.validate       = e1000_validate_nvm_checksum_generic;
-               nvm->ops.write          = e1000_write_nvm_spi;
-
-               /*
-                * nvm->word_size must be discovered after the pointers
-                * are set so we can verify the size from the nvm image
-                * itself.  Temporarily set it to a dummy value so the
-                * read will work.
-                */
-               nvm->word_size = 64;
-               ret_val = nvm->ops.read(hw, NVM_CFG, 1, &size);
-               if (ret_val)
-                       goto out;
-               size = (size & NVM_SIZE_MASK) >> NVM_SIZE_SHIFT;
-               /*
-                * if size != 0, it can be added to a constant and become
-                * the left-shift value to set the word_size.  Otherwise,
-                * word_size stays at 64.
-                */
-               if (size) {
-                       size += NVM_WORD_SIZE_BASE_SHIFT_82541;
-                       nvm->word_size = 1 << size;
-               }
-       } else {
-               nvm->address_bits       = (eecd & E1000_EECD_ADDR_BITS)
-                                         ? 8 : 6;
-               nvm->delay_usec         = 50;
-               nvm->opcode_bits        = 3;
-               nvm->word_size          = (eecd & E1000_EECD_ADDR_BITS)
-                                         ? 256 : 64;
-
-               /* Function Pointers */
-               nvm->ops.acquire        = e1000_acquire_nvm_generic;
-               nvm->ops.read           = e1000_read_nvm_microwire;
-               nvm->ops.release        = e1000_release_nvm_generic;
-               nvm->ops.update         = e1000_update_nvm_checksum_generic;
-               nvm->ops.valid_led_default = e1000_valid_led_default_generic;
-               nvm->ops.validate       = e1000_validate_nvm_checksum_generic;
-               nvm->ops.write          = e1000_write_nvm_microwire;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_init_mac_params_82541 - Init MAC func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_mac_params_82541(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-
-       DEBUGFUNC("e1000_init_mac_params_82541");
-
-       /* Set media type */
-       hw->phy.media_type = e1000_media_type_copper;
-       /* Set mta register count */
-       mac->mta_reg_count = 128;
-       /* Set rar entry count */
-       mac->rar_entry_count = E1000_RAR_ENTRIES;
-       /* Set if part includes ASF firmware */
-       mac->asf_firmware_present = true;
-
-       /* Function Pointers */
-
-       /* bus type/speed/width */
-       mac->ops.get_bus_info = e1000_get_bus_info_pci_generic;
-       /* function id */
-       mac->ops.set_lan_id = e1000_set_lan_id_single_port;
-       /* reset */
-       mac->ops.reset_hw = e1000_reset_hw_82541;
-       /* hw initialization */
-       mac->ops.init_hw = e1000_init_hw_82541;
-       /* link setup */
-       mac->ops.setup_link = e1000_setup_link_generic;
-       /* physical interface link setup */
-       mac->ops.setup_physical_interface = e1000_setup_copper_link_82541;
-       /* check for link */
-       mac->ops.check_for_link = e1000_check_for_link_82541;
-       /* link info */
-       mac->ops.get_link_up_info = e1000_get_link_up_info_82541;
-       /* multicast address update */
-       mac->ops.update_mc_addr_list = e1000_update_mc_addr_list_generic;
-       /* writing VFTA */
-       mac->ops.write_vfta = e1000_write_vfta_generic;
-       /* clearing VFTA */
-       mac->ops.clear_vfta = e1000_clear_vfta_generic;
-       /* setting MTA */
-       mac->ops.mta_set = e1000_mta_set_generic;
-       /* ID LED init */
-       mac->ops.id_led_init = e1000_id_led_init_generic;
-       /* setup LED */
-       mac->ops.setup_led = e1000_setup_led_82541;
-       /* cleanup LED */
-       mac->ops.cleanup_led = e1000_cleanup_led_82541;
-       /* turn on/off LED */
-       mac->ops.led_on = e1000_led_on_generic;
-       mac->ops.led_off = e1000_led_off_generic;
-       /* clear hardware counters */
-       mac->ops.clear_hw_cntrs = e1000_clear_hw_cntrs_82541;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_init_function_pointers_82541 - Init func ptrs.
- *  @hw: pointer to the HW structure
- *
- *  Called to initialize all function pointers and parameters.
- **/
-void e1000_init_function_pointers_82541(struct e1000_hw *hw)
-{
-       DEBUGFUNC("e1000_init_function_pointers_82541");
-
-       hw->mac.ops.init_params = e1000_init_mac_params_82541;
-       hw->nvm.ops.init_params = e1000_init_nvm_params_82541;
-       hw->phy.ops.init_params = e1000_init_phy_params_82541;
-}
-
-/**
- *  e1000_reset_hw_82541 - Reset hardware
- *  @hw: pointer to the HW structure
- *
- *  This resets the hardware into a known state.
- **/
-static s32 e1000_reset_hw_82541(struct e1000_hw *hw)
-{
-       u32 ledctl, ctrl, manc;
-
-       DEBUGFUNC("e1000_reset_hw_82541");
-
-       DEBUGOUT("Masking off all interrupts\n");
-       E1000_WRITE_REG(hw, E1000_IMC, 0xFFFFFFFF);
-
-       E1000_WRITE_REG(hw, E1000_RCTL, 0);
-       E1000_WRITE_REG(hw, E1000_TCTL, E1000_TCTL_PSP);
-       E1000_WRITE_FLUSH(hw);
-
-       /*
-        * Delay to allow any outstanding PCI transactions to complete
-        * before resetting the device.
-        */
-       msec_delay(10);
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       /* Must reset the Phy before resetting the MAC */
-       if ((hw->mac.type == e1000_82541) || (hw->mac.type == e1000_82547)) {
-               E1000_WRITE_REG(hw, E1000_CTRL, (ctrl | E1000_CTRL_PHY_RST));
-               msec_delay(5);
-       }
-
-       DEBUGOUT("Issuing a global reset to 82541/82547 MAC\n");
-       switch (hw->mac.type) {
-       case e1000_82541:
-       case e1000_82541_rev_2:
-               /*
-                * These controllers can't ack the 64-bit write when
-                * issuing the reset, so we use IO-mapping as a
-                * workaround to issue the reset.
-                */
-               E1000_WRITE_REG_IO(hw, E1000_CTRL, ctrl | E1000_CTRL_RST);
-               break;
-       default:
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_RST);
-               break;
-       }
-
-       /* Wait for NVM reload */
-       msec_delay(20);
-
-       /* Disable HW ARPs on ASF enabled adapters */
-       manc = E1000_READ_REG(hw, E1000_MANC);
-       manc &= ~E1000_MANC_ARP_EN;
-       E1000_WRITE_REG(hw, E1000_MANC, manc);
-
-       if ((hw->mac.type == e1000_82541) || (hw->mac.type == e1000_82547)) {
-               e1000_phy_init_script_82541(hw);
-
-               /* Configure activity LED after Phy reset */
-               ledctl = E1000_READ_REG(hw, E1000_LEDCTL);
-               ledctl &= IGP_ACTIVITY_LED_MASK;
-               ledctl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
-               E1000_WRITE_REG(hw, E1000_LEDCTL, ledctl);
-       }
-
-       /* Once again, mask the interrupts */
-       DEBUGOUT("Masking off all interrupts\n");
-       E1000_WRITE_REG(hw, E1000_IMC, 0xFFFFFFFF);
-
-       /* Clear any pending interrupt events. */
-       E1000_READ_REG(hw, E1000_ICR);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_init_hw_82541 - Initialize hardware
- *  @hw: pointer to the HW structure
- *
- *  This inits the hardware readying it for operation.
- **/
-static s32 e1000_init_hw_82541(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_dev_spec_82541 *dev_spec = &hw->dev_spec._82541;
-       u32 i, txdctl;
-       s32 ret_val;
-
-       DEBUGFUNC("e1000_init_hw_82541");
-
-       /* Initialize identification LED */
-       ret_val = mac->ops.id_led_init(hw);
-       if (ret_val) {
-               DEBUGOUT("Error initializing identification LED\n");
-               /* This is not fatal and we should not stop init due to this */
-       }
-
-       /* Storing the Speed Power Down  value for later use */
-       ret_val = hw->phy.ops.read_reg(hw,
-                                      IGP01E1000_GMII_FIFO,
-                                      &dev_spec->spd_default);
-       if (ret_val)
-               goto out;
-
-       /* Disabling VLAN filtering */
-       DEBUGOUT("Initializing the IEEE VLAN\n");
-       mac->ops.clear_vfta(hw);
-
-       /* Setup the receive address. */
-       e1000_init_rx_addrs_generic(hw, mac->rar_entry_count);
-
-       /* Zero out the Multicast HASH table */
-       DEBUGOUT("Zeroing the MTA\n");
-       for (i = 0; i < mac->mta_reg_count; i++) {
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
-               /*
-                * Avoid back to back register writes by adding the register
-                * read (flush).  This is to protect against some strange
-                * bridge configurations that may issue Memory Write Block
-                * (MWB) to our register space.
-                */
-               E1000_WRITE_FLUSH(hw);
-       }
-
-       /* Setup link and flow control */
-       ret_val = mac->ops.setup_link(hw);
-
-       txdctl = E1000_READ_REG(hw, E1000_TXDCTL(0));
-       txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |
-                E1000_TXDCTL_FULL_TX_DESC_WB;
-       E1000_WRITE_REG(hw, E1000_TXDCTL(0), txdctl);
-
-       /*
-        * Clear all of the statistics registers (clear on read).  It is
-        * important that we do this after we have tried to establish link
-        * because the symbol error count will increment wildly if there
-        * is no link.
-        */
-       e1000_clear_hw_cntrs_82541(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- * e1000_get_link_up_info_82541 - Report speed and duplex
- * @hw: pointer to the HW structure
- * @speed: pointer to speed buffer
- * @duplex: pointer to duplex buffer
- *
- * Retrieve the current speed and duplex configuration.
- **/
-static s32 e1000_get_link_up_info_82541(struct e1000_hw *hw, u16 *speed,
-                                        u16 *duplex)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-       DEBUGFUNC("e1000_get_link_up_info_82541");
-
-       ret_val = e1000_get_speed_and_duplex_copper_generic(hw, speed, duplex);
-       if (ret_val)
-               goto out;
-
-       if (!phy->speed_downgraded)
-               goto out;
-
-       /*
-        * IGP01 PHY may advertise full duplex operation after speed
-        * downgrade even if it is operating at half duplex.
-        * Here we set the duplex settings to match the duplex in the
-        * link partner's capabilities.
-        */
-       ret_val = phy->ops.read_reg(hw, PHY_AUTONEG_EXP, &data);
-       if (ret_val)
-               goto out;
-
-       if (!(data & NWAY_ER_LP_NWAY_CAPS)) {
-               *duplex = HALF_DUPLEX;
-       } else {
-               ret_val = phy->ops.read_reg(hw, PHY_LP_ABILITY, &data);
-               if (ret_val)
-                       goto out;
-
-               if (*speed == SPEED_100) {
-                       if (!(data & NWAY_LPAR_100TX_FD_CAPS))
-                               *duplex = HALF_DUPLEX;
-               } else if (*speed == SPEED_10) {
-                       if (!(data & NWAY_LPAR_10T_FD_CAPS))
-                               *duplex = HALF_DUPLEX;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_phy_hw_reset_82541 - PHY hardware reset
- *  @hw: pointer to the HW structure
- *
- *  Verify the reset block is not blocking us from resetting.  Acquire
- *  semaphore (if necessary) and read/set/write the device control reset
- *  bit in the PHY.  Wait the appropriate delay time for the device to
- *  reset and release the semaphore (if necessary).
- **/
-static s32 e1000_phy_hw_reset_82541(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u32 ledctl;
-
-       DEBUGFUNC("e1000_phy_hw_reset_82541");
-
-       ret_val = e1000_phy_hw_reset_generic(hw);
-       if (ret_val)
-               goto out;
-
-       e1000_phy_init_script_82541(hw);
-
-       if ((hw->mac.type == e1000_82541) || (hw->mac.type == e1000_82547)) {
-               /* Configure activity LED after PHY reset */
-               ledctl = E1000_READ_REG(hw, E1000_LEDCTL);
-               ledctl &= IGP_ACTIVITY_LED_MASK;
-               ledctl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
-               E1000_WRITE_REG(hw, E1000_LEDCTL, ledctl);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_setup_copper_link_82541 - Configure copper link settings
- *  @hw: pointer to the HW structure
- *
- *  Calls the appropriate function to configure the link for auto-neg or forced
- *  speed and duplex.  Then we check for link, once link is established calls
- *  to configure collision distance and flow control are called.  If link is
- *  not established, we return -E1000_ERR_PHY (-2).
- **/
-static s32 e1000_setup_copper_link_82541(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       struct e1000_dev_spec_82541 *dev_spec = &hw->dev_spec._82541;
-       s32  ret_val;
-       u32 ctrl, ledctl;
-
-       DEBUGFUNC("e1000_setup_copper_link_82541");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       ctrl |= E1000_CTRL_SLU;
-       ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-       hw->phy.reset_disable = false;
-
-       /* Earlier revs of the IGP phy require us to force MDI. */
-       if (hw->mac.type == e1000_82541 || hw->mac.type == e1000_82547) {
-               dev_spec->dsp_config = e1000_dsp_config_disabled;
-               phy->mdix = 1;
-       } else {
-               dev_spec->dsp_config = e1000_dsp_config_enabled;
-       }
-
-       ret_val = e1000_copper_link_setup_igp(hw);
-       if (ret_val)
-               goto out;
-
-       if (hw->mac.autoneg) {
-               if (dev_spec->ffe_config == e1000_ffe_config_active)
-                       dev_spec->ffe_config = e1000_ffe_config_enabled;
-       }
-
-       /* Configure activity LED after Phy reset */
-       ledctl = E1000_READ_REG(hw, E1000_LEDCTL);
-       ledctl &= IGP_ACTIVITY_LED_MASK;
-       ledctl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
-       E1000_WRITE_REG(hw, E1000_LEDCTL, ledctl);
-
-       ret_val = e1000_setup_copper_link_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_check_for_link_82541 - Check/Store link connection
- *  @hw: pointer to the HW structure
- *
- *  This checks the link condition of the adapter and stores the
- *  results in the hw->mac structure.
- **/
-static s32 e1000_check_for_link_82541(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val;
-       bool link;
-
-       DEBUGFUNC("e1000_check_for_link_82541");
-
-       /*
-        * We only want to go out to the PHY registers to see if Auto-Neg
-        * has completed and/or if our link status has changed.  The
-        * get_link_status flag is set upon receiving a Link Status
-        * Change or Rx Sequence Error interrupt.
-        */
-       if (!mac->get_link_status) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       /*
-        * First we want to see if the MII Status Register reports
-        * link.  If so, then we want to get the current speed/duplex
-        * of the PHY.
-        */
-       ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               ret_val = -E1000_ERR_CONFIG;
-#if 0
-               ret_val = e1000_config_dsp_after_link_change_82541(hw, false);
-#endif
-               goto out; /* No link detected */
-       }
-
-       mac->get_link_status = false;
-
-       /*
-        * Check if there was DownShift, must be checked
-        * immediately after link-up
-        */
-       e1000_check_downshift_generic(hw);
-
-       /*
-        * If we are forcing speed/duplex, then we simply return since
-        * we have already determined whether we have link or not.
-        */
-       if (!mac->autoneg) {
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-#if 0
-       ret_val = e1000_config_dsp_after_link_change_82541(hw, true);
-#endif
-
-       /*
-        * Auto-Neg is enabled.  Auto Speed Detection takes care
-        * of MAC speed/duplex configuration.  So we only need to
-        * configure Collision Distance in the MAC.
-        */
-       e1000_config_collision_dist_generic(hw);
-
-       /*
-        * Configure Flow Control now that Auto-Neg has completed.
-        * First, we need to restore the desired flow control
-        * settings because we may have had to re-autoneg with a
-        * different link partner.
-        */
-       ret_val = e1000_config_fc_after_link_up_generic(hw);
-       if (ret_val) {
-               DEBUGOUT("Error configuring flow control\n");
-       }
-
-out:
-       return ret_val;
-}
-
-#if 0
-/**
- *  e1000_config_dsp_after_link_change_82541 - Config DSP after link
- *  @hw: pointer to the HW structure
- *  @link_up: boolean flag for link up status
- *
- *  Return E1000_ERR_PHY when failing to read/write the PHY, else E1000_SUCCESS
- *  at any other case.
- *
- *  82541_rev_2 & 82547_rev_2 have the capability to configure the DSP when a
- *  gigabit link is achieved to improve link quality.
- **/
-static s32 e1000_config_dsp_after_link_change_82541(struct e1000_hw *hw,
-                                                    bool link_up)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       struct e1000_dev_spec_82541 *dev_spec = &hw->dev_spec._82541;
-       s32 ret_val;
-       u32 idle_errs = 0;
-       u16 phy_data, phy_saved_data, speed, duplex, i;
-       u16 ffe_idle_err_timeout = FFE_IDLE_ERR_COUNT_TIMEOUT_20;
-       u16 dsp_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
-                                                  {IGP01E1000_PHY_AGC_PARAM_A,
-                                                   IGP01E1000_PHY_AGC_PARAM_B,
-                                                   IGP01E1000_PHY_AGC_PARAM_C,
-                                                   IGP01E1000_PHY_AGC_PARAM_D};
-
-       DEBUGFUNC("e1000_config_dsp_after_link_change_82541");
-
-       if (link_up) {
-               ret_val = hw->mac.ops.get_link_up_info(hw, &speed, &duplex);
-               if (ret_val) {
-                       DEBUGOUT("Error getting link speed and duplex\n");
-                       goto out;
-               }
-
-               if (speed != SPEED_1000) {
-                       ret_val = E1000_SUCCESS;
-                       goto out;
-               }
-
-#if 0
-               ret_val = phy->ops.get_cable_length(hw);
-#endif
-               ret_val = -E1000_ERR_CONFIG;
-               if (ret_val)
-                       goto out;
-
-               if ((dev_spec->dsp_config == e1000_dsp_config_enabled) &&
-                   phy->min_cable_length >= 50) {
-
-                       for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
-                               ret_val = phy->ops.read_reg(hw,
-                                                           dsp_reg_array[i],
-                                                           &phy_data);
-                               if (ret_val)
-                                       goto out;
-
-                               phy_data &= ~IGP01E1000_PHY_EDAC_MU_INDEX;
-
-                               ret_val = phy->ops.write_reg(hw,
-                                                            dsp_reg_array[i],
-                                                            phy_data);
-                               if (ret_val)
-                                       goto out;
-                       }
-                       dev_spec->dsp_config = e1000_dsp_config_activated;
-               }
-
-               if ((dev_spec->ffe_config != e1000_ffe_config_enabled) ||
-                   (phy->min_cable_length >= 50)) {
-                       ret_val = E1000_SUCCESS;
-                       goto out;
-               }
-
-               /* clear previous idle error counts */
-               ret_val = phy->ops.read_reg(hw, PHY_1000T_STATUS, &phy_data);
-               if (ret_val)
-                       goto out;
-
-               for (i = 0; i < ffe_idle_err_timeout; i++) {
-                       usec_delay(1000);
-                       ret_val = phy->ops.read_reg(hw,
-                                                   PHY_1000T_STATUS,
-                                                   &phy_data);
-                       if (ret_val)
-                               goto out;
-
-                       idle_errs += (phy_data & SR_1000T_IDLE_ERROR_CNT);
-                       if (idle_errs > SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT) {
-                               dev_spec->ffe_config = e1000_ffe_config_active;
-
-                               ret_val = phy->ops.write_reg(hw,
-                                                 IGP01E1000_PHY_DSP_FFE,
-                                                 IGP01E1000_PHY_DSP_FFE_CM_CP);
-                               if (ret_val)
-                                       goto out;
-                               break;
-                       }
-
-                       if (idle_errs)
-                               ffe_idle_err_timeout =
-                                                FFE_IDLE_ERR_COUNT_TIMEOUT_100;
-               }
-       } else {
-               if (dev_spec->dsp_config == e1000_dsp_config_activated) {
-                       /*
-                        * Save off the current value of register 0x2F5B
-                        * to be restored at the end of the routines.
-                        */
-                       ret_val = phy->ops.read_reg(hw,
-                                                   0x2F5B,
-                                                   &phy_saved_data);
-                       if (ret_val)
-                               goto out;
-
-                       /* Disable the PHY transmitter */
-                       ret_val = phy->ops.write_reg(hw, 0x2F5B, 0x0003);
-                       if (ret_val)
-                               goto out;
-
-                       msec_delay_irq(20);
-
-                       ret_val = phy->ops.write_reg(hw,
-                                                    0x0000,
-                                                    IGP01E1000_IEEE_FORCE_GIG);
-                       if (ret_val)
-                               goto out;
-                       for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
-                               ret_val = phy->ops.read_reg(hw,
-                                                           dsp_reg_array[i],
-                                                           &phy_data);
-                               if (ret_val)
-                                       goto out;
-
-                               phy_data &= ~IGP01E1000_PHY_EDAC_MU_INDEX;
-                               phy_data |= IGP01E1000_PHY_EDAC_SIGN_EXT_9_BITS;
-
-                               ret_val = phy->ops.write_reg(hw,
-                                                            dsp_reg_array[i],
-                                                            phy_data);
-                               if (ret_val)
-                                       goto out;
-                       }
-
-                       ret_val = phy->ops.write_reg(hw,
-                                              0x0000,
-                                              IGP01E1000_IEEE_RESTART_AUTONEG);
-                       if (ret_val)
-                               goto out;
-
-                       msec_delay_irq(20);
-
-                       /* Now enable the transmitter */
-                       ret_val = phy->ops.write_reg(hw,
-                                                    0x2F5B,
-                                                    phy_saved_data);
-                       if (ret_val)
-                               goto out;
-
-                       dev_spec->dsp_config = e1000_dsp_config_enabled;
-               }
-
-               if (dev_spec->ffe_config != e1000_ffe_config_active) {
-                       ret_val = E1000_SUCCESS;
-                       goto out;
-               }
-
-               /*
-                * Save off the current value of register 0x2F5B
-                * to be restored at the end of the routines.
-                */
-               ret_val = phy->ops.read_reg(hw, 0x2F5B, &phy_saved_data);
-               if (ret_val)
-                       goto out;
-
-               /* Disable the PHY transmitter */
-               ret_val = phy->ops.write_reg(hw, 0x2F5B, 0x0003);
-               if (ret_val)
-                       goto out;
-
-               msec_delay_irq(20);
-
-               ret_val = phy->ops.write_reg(hw,
-                                            0x0000,
-                                            IGP01E1000_IEEE_FORCE_GIG);
-               if (ret_val)
-                       goto out;
-
-               ret_val = phy->ops.write_reg(hw,
-                                            IGP01E1000_PHY_DSP_FFE,
-                                            IGP01E1000_PHY_DSP_FFE_DEFAULT);
-               if (ret_val)
-                       goto out;
-
-               ret_val = phy->ops.write_reg(hw,
-                                            0x0000,
-                                            IGP01E1000_IEEE_RESTART_AUTONEG);
-               if (ret_val)
-                       goto out;
-
-               msec_delay_irq(20);
-
-               /* Now enable the transmitter */
-               ret_val = phy->ops.write_reg(hw, 0x2F5B, phy_saved_data);
-
-               if (ret_val)
-                       goto out;
-
-               dev_spec->ffe_config = e1000_ffe_config_enabled;
-       }
-
-out:
-       return ret_val;
-}
-#endif
-
-#if 0
-/**
- *  e1000_get_cable_length_igp_82541 - Determine cable length for igp PHY
- *  @hw: pointer to the HW structure
- *
- *  The automatic gain control (agc) normalizes the amplitude of the
- *  received signal, adjusting for the attenuation produced by the
- *  cable.  By reading the AGC registers, which represent the
- *  combination of coarse and fine gain value, the value can be put
- *  into a lookup table to obtain the approximate cable length
- *  for each channel.
- **/
-static s32 e1000_get_cable_length_igp_82541(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 i, data;
-       u16 cur_agc_value, agc_value = 0;
-       u16 min_agc_value = IGP01E1000_AGC_LENGTH_TABLE_SIZE;
-       u16 agc_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
-                                                        {IGP01E1000_PHY_AGC_A,
-                                                         IGP01E1000_PHY_AGC_B,
-                                                         IGP01E1000_PHY_AGC_C,
-                                                         IGP01E1000_PHY_AGC_D};
-
-       DEBUGFUNC("e1000_get_cable_length_igp_82541");
-
-       /* Read the AGC registers for all channels */
-       for (i = 0; i < IGP01E1000_PHY_CHANNEL_NUM; i++) {
-               ret_val = phy->ops.read_reg(hw, agc_reg_array[i], &data);
-               if (ret_val)
-                       goto out;
-
-               cur_agc_value = data >> IGP01E1000_AGC_LENGTH_SHIFT;
-
-               /* Bounds checking */
-               if ((cur_agc_value >= IGP01E1000_AGC_LENGTH_TABLE_SIZE - 1) ||
-                   (cur_agc_value == 0)) {
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-               }
-
-               agc_value += cur_agc_value;
-
-               if (min_agc_value > cur_agc_value)
-                       min_agc_value = cur_agc_value;
-       }
-
-       /* Remove the minimal AGC result for length < 50m */
-       if (agc_value < IGP01E1000_PHY_CHANNEL_NUM * 50) {
-               agc_value -= min_agc_value;
-               /* Average the three remaining channels for the length. */
-               agc_value /= (IGP01E1000_PHY_CHANNEL_NUM - 1);
-       } else {
-               /* Average the channels for the length. */
-               agc_value /= IGP01E1000_PHY_CHANNEL_NUM;
-       }
-
-       phy->min_cable_length = (e1000_igp_cable_length_table[agc_value] >
-                                IGP01E1000_AGC_RANGE)
-                               ? (e1000_igp_cable_length_table[agc_value] -
-                                  IGP01E1000_AGC_RANGE)
-                               : 0;
-       phy->max_cable_length = e1000_igp_cable_length_table[agc_value] +
-                               IGP01E1000_AGC_RANGE;
-
-       phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
-
-out:
-       return ret_val;
-}
-#endif
-
-/**
- *  e1000_set_d3_lplu_state_82541 - Sets low power link up state for D3
- *  @hw: pointer to the HW structure
- *  @active: boolean used to enable/disable lplu
- *
- *  Success returns 0, Failure returns 1
- *
- *  The low power link up (lplu) state is set to the power management level D3
- *  and SmartSpeed is disabled when active is true, else clear lplu for D3
- *  and enable Smartspeed.  LPLU and Smartspeed are mutually exclusive.  LPLU
- *  is used during Dx states where the power conservation is most important.
- *  During driver activity, SmartSpeed should be enabled so performance is
- *  maintained.
- **/
-static s32 e1000_set_d3_lplu_state_82541(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-       DEBUGFUNC("e1000_set_d3_lplu_state_82541");
-
-       switch (hw->mac.type) {
-       case e1000_82541_rev_2:
-       case e1000_82547_rev_2:
-               break;
-       default:
-               ret_val = e1000_set_d3_lplu_state_generic(hw, active);
-               goto out;
-               break;
-       }
-
-       ret_val = phy->ops.read_reg(hw, IGP01E1000_GMII_FIFO, &data);
-       if (ret_val)
-               goto out;
-
-       if (!active) {
-               data &= ~IGP01E1000_GMII_FLEX_SPD;
-               ret_val = phy->ops.write_reg(hw, IGP01E1000_GMII_FIFO, data);
-               if (ret_val)
-                       goto out;
-
-               /*
-                * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
-                * during Dx states where the power conservation is most
-                * important.  During driver activity we should enable
-                * SmartSpeed, so performance is maintained.
-                */
-               if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = phy->ops.read_reg(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = phy->ops.read_reg(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               }
-       } else if ((phy->autoneg_advertised == E1000_ALL_SPEED_DUPLEX) ||
-                  (phy->autoneg_advertised == E1000_ALL_NOT_GIG) ||
-                  (phy->autoneg_advertised == E1000_ALL_10_SPEED)) {
-               data |= IGP01E1000_GMII_FLEX_SPD;
-               ret_val = phy->ops.write_reg(hw, IGP01E1000_GMII_FIFO, data);
-               if (ret_val)
-                       goto out;
-
-               /* When LPLU is enabled, we should disable SmartSpeed */
-               ret_val = phy->ops.read_reg(hw,
-                                           IGP01E1000_PHY_PORT_CONFIG,
-                                           &data);
-               if (ret_val)
-                       goto out;
-
-               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-               ret_val = phy->ops.write_reg(hw,
-                                            IGP01E1000_PHY_PORT_CONFIG,
-                                            data);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_setup_led_82541 - Configures SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This prepares the SW controllable LED for use and saves the current state
- *  of the LED so it can be later restored.
- **/
-static s32 e1000_setup_led_82541(struct e1000_hw *hw __unused)
-{
-#if 0
-       struct e1000_dev_spec_82541 *dev_spec = &hw->dev_spec._82541;
-       s32 ret_val;
-
-       DEBUGFUNC("e1000_setup_led_82541");
-
-       ret_val = hw->phy.ops.read_reg(hw,
-                                      IGP01E1000_GMII_FIFO,
-                                      &dev_spec->spd_default);
-       if (ret_val)
-               goto out;
-
-       ret_val = hw->phy.ops.write_reg(hw,
-                                       IGP01E1000_GMII_FIFO,
-                                       (u16)(dev_spec->spd_default &
-                                               ~IGP01E1000_GMII_SPD));
-       if (ret_val)
-               goto out;
-
-       E1000_WRITE_REG(hw, E1000_LEDCTL, hw->mac.ledctl_mode1);
-
-out:
-       return ret_val;
-#endif
-        return 0;
-}
-
-/**
- *  e1000_cleanup_led_82541 - Set LED config to default operation
- *  @hw: pointer to the HW structure
- *
- *  Remove the current LED configuration and set the LED configuration
- *  to the default value, saved from the EEPROM.
- **/
-static s32 e1000_cleanup_led_82541(struct e1000_hw *hw __unused)
-{
-#if 0
-       struct e1000_dev_spec_82541 *dev_spec = &hw->dev_spec._82541;
-       s32 ret_val;
-
-       DEBUGFUNC("e1000_cleanup_led_82541");
-
-       ret_val = hw->phy.ops.write_reg(hw,
-                                       IGP01E1000_GMII_FIFO,
-                                       dev_spec->spd_default);
-       if (ret_val)
-               goto out;
-
-       E1000_WRITE_REG(hw, E1000_LEDCTL, hw->mac.ledctl_default);
-
-out:
-       return ret_val;
-#endif
-        return 0;
-}
-
-/**
- *  e1000_phy_init_script_82541 - Initialize GbE PHY
- *  @hw: pointer to the HW structure
- *
- *  Initializes the IGP PHY.
- **/
-static s32 e1000_phy_init_script_82541(struct e1000_hw *hw)
-{
-       struct e1000_dev_spec_82541 *dev_spec = &hw->dev_spec._82541;
-       u32 ret_val;
-       u16 phy_saved_data;
-
-       DEBUGFUNC("e1000_phy_init_script_82541");
-
-       if (!dev_spec->phy_init_script) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       /* Delay after phy reset to enable NVM configuration to load */
-       msec_delay(20);
-
-       /*
-        * Save off the current value of register 0x2F5B to be restored at
-        * the end of this routine.
-        */
-       ret_val = hw->phy.ops.read_reg(hw, 0x2F5B, &phy_saved_data);
-
-       /* Disabled the PHY transmitter */
-       hw->phy.ops.write_reg(hw, 0x2F5B, 0x0003);
-
-       msec_delay(20);
-
-       hw->phy.ops.write_reg(hw, 0x0000, 0x0140);
-
-       msec_delay(5);
-
-       switch (hw->mac.type) {
-       case e1000_82541:
-       case e1000_82547:
-               hw->phy.ops.write_reg(hw, 0x1F95, 0x0001);
-
-               hw->phy.ops.write_reg(hw, 0x1F71, 0xBD21);
-
-               hw->phy.ops.write_reg(hw, 0x1F79, 0x0018);
-
-               hw->phy.ops.write_reg(hw, 0x1F30, 0x1600);
-
-               hw->phy.ops.write_reg(hw, 0x1F31, 0x0014);
-
-               hw->phy.ops.write_reg(hw, 0x1F32, 0x161C);
-
-               hw->phy.ops.write_reg(hw, 0x1F94, 0x0003);
-
-               hw->phy.ops.write_reg(hw, 0x1F96, 0x003F);
-
-               hw->phy.ops.write_reg(hw, 0x2010, 0x0008);
-               break;
-       case e1000_82541_rev_2:
-       case e1000_82547_rev_2:
-               hw->phy.ops.write_reg(hw, 0x1F73, 0x0099);
-               break;
-       default:
-               break;
-       }
-
-       hw->phy.ops.write_reg(hw, 0x0000, 0x3300);
-
-       msec_delay(20);
-
-       /* Now enable the transmitter */
-       hw->phy.ops.write_reg(hw, 0x2F5B, phy_saved_data);
-
-       if (hw->mac.type == e1000_82547) {
-               u16 fused, fine, coarse;
-
-               /* Move to analog registers page */
-               hw->phy.ops.read_reg(hw,
-                                 IGP01E1000_ANALOG_SPARE_FUSE_STATUS,
-                                 &fused);
-
-               if (!(fused & IGP01E1000_ANALOG_SPARE_FUSE_ENABLED)) {
-                       hw->phy.ops.read_reg(hw,
-                                         IGP01E1000_ANALOG_FUSE_STATUS,
-                                         &fused);
-
-                       fine = fused & IGP01E1000_ANALOG_FUSE_FINE_MASK;
-                       coarse = fused & IGP01E1000_ANALOG_FUSE_COARSE_MASK;
-
-                       if (coarse > IGP01E1000_ANALOG_FUSE_COARSE_THRESH) {
-                               coarse -= IGP01E1000_ANALOG_FUSE_COARSE_10;
-                               fine -= IGP01E1000_ANALOG_FUSE_FINE_1;
-                       } else if (coarse ==
-                                  IGP01E1000_ANALOG_FUSE_COARSE_THRESH)
-                               fine -= IGP01E1000_ANALOG_FUSE_FINE_10;
-
-                       fused = (fused & IGP01E1000_ANALOG_FUSE_POLY_MASK) |
-                               (fine & IGP01E1000_ANALOG_FUSE_FINE_MASK) |
-                               (coarse & IGP01E1000_ANALOG_FUSE_COARSE_MASK);
-
-                       hw->phy.ops.write_reg(hw,
-                                          IGP01E1000_ANALOG_FUSE_CONTROL,
-                                          fused);
-                       hw->phy.ops.write_reg(hw,
-                                     IGP01E1000_ANALOG_FUSE_BYPASS,
-                                     IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL);
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- * e1000_power_down_phy_copper_82541 - Remove link in case of PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, remove the link.
- **/
-static void e1000_power_down_phy_copper_82541(struct e1000_hw *hw)
-{
-       /* If the management interface is not enabled, then power down */
-       if (!(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_SMBUS_EN))
-               e1000_power_down_phy_copper(hw);
-
-       return;
-}
-
-/**
- *  e1000_clear_hw_cntrs_82541 - Clear device specific hardware counters
- *  @hw: pointer to the HW structure
- *
- *  Clears the hardware counters by reading the counter registers.
- **/
-static void e1000_clear_hw_cntrs_82541(struct e1000_hw *hw)
-{
-       DEBUGFUNC("e1000_clear_hw_cntrs_82541");
-
-       e1000_clear_hw_cntrs_base_generic(hw);
-
-#if 0
-       E1000_READ_REG(hw, E1000_PRC64);
-       E1000_READ_REG(hw, E1000_PRC127);
-       E1000_READ_REG(hw, E1000_PRC255);
-       E1000_READ_REG(hw, E1000_PRC511);
-       E1000_READ_REG(hw, E1000_PRC1023);
-       E1000_READ_REG(hw, E1000_PRC1522);
-       E1000_READ_REG(hw, E1000_PTC64);
-       E1000_READ_REG(hw, E1000_PTC127);
-       E1000_READ_REG(hw, E1000_PTC255);
-       E1000_READ_REG(hw, E1000_PTC511);
-       E1000_READ_REG(hw, E1000_PTC1023);
-       E1000_READ_REG(hw, E1000_PTC1522);
-
-       E1000_READ_REG(hw, E1000_ALGNERRC);
-       E1000_READ_REG(hw, E1000_RXERRC);
-       E1000_READ_REG(hw, E1000_TNCRS);
-       E1000_READ_REG(hw, E1000_CEXTERR);
-       E1000_READ_REG(hw, E1000_TSCTC);
-       E1000_READ_REG(hw, E1000_TSCTFC);
-
-       E1000_READ_REG(hw, E1000_MGTPRC);
-       E1000_READ_REG(hw, E1000_MGTPDC);
-       E1000_READ_REG(hw, E1000_MGTPTC);
-#endif
-}
-
-static struct pci_device_id e1000_82541_nics[] = {
-     PCI_ROM(0x8086, 0x1013, "E1000_DEV_ID_82541EI", "E1000_DEV_ID_82541EI", e1000_82541),
-     PCI_ROM(0x8086, 0x1014, "E1000_DEV_ID_82541ER_LOM", "E1000_DEV_ID_82541ER_LOM", e1000_82541),
-     PCI_ROM(0x8086, 0x1018, "E1000_DEV_ID_82541EI_MOBILE", "E1000_DEV_ID_82541EI_MOBILE", e1000_82541),
-     PCI_ROM(0x8086, 0x1019, "E1000_DEV_ID_82547EI", "E1000_DEV_ID_82547EI", e1000_82547),
-     PCI_ROM(0x8086, 0x101A, "E1000_DEV_ID_82547EI_MOBILE", "E1000_DEV_ID_82547EI_MOBILE", e1000_82547),
-     PCI_ROM(0x8086, 0x1075, "E1000_DEV_ID_82547GI", "E1000_DEV_ID_82547GI", e1000_82547_rev_2),
-     PCI_ROM(0x8086, 0x1076, "E1000_DEV_ID_82541GI", "E1000_DEV_ID_82541GI", e1000_82541_rev_2),
-     PCI_ROM(0x8086, 0x1077, "E1000_DEV_ID_82541GI_MOBILE", "E1000_DEV_ID_82541GI_MOBILE", e1000_82541_rev_2),
-     PCI_ROM(0x8086, 0x1078, "E1000_DEV_ID_82541ER", "E1000_DEV_ID_82541ER", e1000_82541_rev_2),
-     PCI_ROM(0x8086, 0x107C, "E1000_DEV_ID_82541GI_LF", "E1000_DEV_ID_82541GI_LF", e1000_82541_rev_2),
-};
-
-struct pci_driver e1000_82541_driver __pci_driver = {
-       .ids = e1000_82541_nics,
-       .id_count = (sizeof (e1000_82541_nics) / sizeof (e1000_82541_nics[0])),
-       .probe = e1000_probe,
-       .remove = e1000_remove,
-};
diff --git a/src/drivers/net/e1000/e1000_82541.h b/src/drivers/net/e1000/e1000_82541.h
deleted file mode 100644 (file)
index f86a148..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000_82541_H_
-#define _E1000_82541_H_
-
-#define NVM_WORD_SIZE_BASE_SHIFT_82541 (NVM_WORD_SIZE_BASE_SHIFT + 1)
-
-#define IGP01E1000_PHY_CHANNEL_NUM                    4
-
-#define IGP01E1000_PHY_AGC_A                     0x1172
-#define IGP01E1000_PHY_AGC_B                     0x1272
-#define IGP01E1000_PHY_AGC_C                     0x1472
-#define IGP01E1000_PHY_AGC_D                     0x1872
-
-#define IGP01E1000_PHY_AGC_PARAM_A               0x1171
-#define IGP01E1000_PHY_AGC_PARAM_B               0x1271
-#define IGP01E1000_PHY_AGC_PARAM_C               0x1471
-#define IGP01E1000_PHY_AGC_PARAM_D               0x1871
-
-#define IGP01E1000_PHY_EDAC_MU_INDEX             0xC000
-#define IGP01E1000_PHY_EDAC_SIGN_EXT_9_BITS      0x8000
-
-#define IGP01E1000_PHY_DSP_RESET                 0x1F33
-
-#define IGP01E1000_PHY_DSP_FFE                   0x1F35
-#define IGP01E1000_PHY_DSP_FFE_CM_CP             0x0069
-#define IGP01E1000_PHY_DSP_FFE_DEFAULT           0x002A
-
-#define IGP01E1000_IEEE_FORCE_GIG                0x0140
-#define IGP01E1000_IEEE_RESTART_AUTONEG          0x3300
-
-#define IGP01E1000_AGC_LENGTH_SHIFT                   7
-#define IGP01E1000_AGC_RANGE                         10
-
-#define FFE_IDLE_ERR_COUNT_TIMEOUT_20                20
-#define FFE_IDLE_ERR_COUNT_TIMEOUT_100              100
-
-#define IGP01E1000_ANALOG_FUSE_STATUS            0x20D0
-#define IGP01E1000_ANALOG_SPARE_FUSE_STATUS      0x20D1
-#define IGP01E1000_ANALOG_FUSE_CONTROL           0x20DC
-#define IGP01E1000_ANALOG_FUSE_BYPASS            0x20DE
-
-#define IGP01E1000_ANALOG_SPARE_FUSE_ENABLED     0x0100
-#define IGP01E1000_ANALOG_FUSE_FINE_MASK         0x0F80
-#define IGP01E1000_ANALOG_FUSE_COARSE_MASK       0x0070
-#define IGP01E1000_ANALOG_FUSE_COARSE_THRESH     0x0040
-#define IGP01E1000_ANALOG_FUSE_COARSE_10         0x0010
-#define IGP01E1000_ANALOG_FUSE_FINE_1            0x0080
-#define IGP01E1000_ANALOG_FUSE_FINE_10           0x0500
-#define IGP01E1000_ANALOG_FUSE_POLY_MASK         0xF000
-#define IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL 0x0002
-
-#define IGP01E1000_MSE_CHANNEL_D                 0x000F
-#define IGP01E1000_MSE_CHANNEL_C                 0x00F0
-#define IGP01E1000_MSE_CHANNEL_B                 0x0F00
-#define IGP01E1000_MSE_CHANNEL_A                 0xF000
-
-#endif
diff --git a/src/drivers/net/e1000/e1000_82542.c b/src/drivers/net/e1000/e1000_82542.c
deleted file mode 100644 (file)
index b6d5202..0000000
+++ /dev/null
@@ -1,571 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/*
- * 82542 Gigabit Ethernet Controller
- */
-
-#include "e1000_api.h"
-
-static s32  e1000_init_phy_params_82542(struct e1000_hw *hw);
-static s32  e1000_init_nvm_params_82542(struct e1000_hw *hw);
-static s32  e1000_init_mac_params_82542(struct e1000_hw *hw);
-static s32  e1000_get_bus_info_82542(struct e1000_hw *hw);
-static s32  e1000_reset_hw_82542(struct e1000_hw *hw);
-static s32  e1000_init_hw_82542(struct e1000_hw *hw);
-static s32  e1000_setup_link_82542(struct e1000_hw *hw);
-static s32  e1000_led_on_82542(struct e1000_hw *hw);
-static s32  e1000_led_off_82542(struct e1000_hw *hw);
-static void e1000_rar_set_82542(struct e1000_hw *hw, u8 *addr, u32 index);
-static void e1000_clear_hw_cntrs_82542(struct e1000_hw *hw);
-
-/**
- *  e1000_init_phy_params_82542 - Init PHY func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_phy_params_82542(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_init_phy_params_82542");
-
-       phy->type               = e1000_phy_none;
-
-       return ret_val;
-}
-
-/**
- *  e1000_init_nvm_params_82542 - Init NVM func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_nvm_params_82542(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-
-       DEBUGFUNC("e1000_init_nvm_params_82542");
-
-       nvm->address_bits       =  6;
-       nvm->delay_usec         = 50;
-       nvm->opcode_bits        =  3;
-       nvm->type               = e1000_nvm_eeprom_microwire;
-       nvm->word_size          = 64;
-
-       /* Function Pointers */
-       nvm->ops.read           = e1000_read_nvm_microwire;
-       nvm->ops.release        = e1000_stop_nvm;
-       nvm->ops.write          = e1000_write_nvm_microwire;
-       nvm->ops.update         = e1000_update_nvm_checksum_generic;
-       nvm->ops.validate       = e1000_validate_nvm_checksum_generic;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_init_mac_params_82542 - Init MAC func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_mac_params_82542(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-
-       DEBUGFUNC("e1000_init_mac_params_82542");
-
-       /* Set media type */
-       hw->phy.media_type = e1000_media_type_fiber;
-
-       /* Set mta register count */
-       mac->mta_reg_count = 128;
-       /* Set rar entry count */
-       mac->rar_entry_count = E1000_RAR_ENTRIES;
-
-       /* Function pointers */
-
-       /* bus type/speed/width */
-       mac->ops.get_bus_info = e1000_get_bus_info_82542;
-       /* function id */
-       mac->ops.set_lan_id = e1000_set_lan_id_multi_port_pci;
-       /* reset */
-       mac->ops.reset_hw = e1000_reset_hw_82542;
-       /* hw initialization */
-       mac->ops.init_hw = e1000_init_hw_82542;
-       /* link setup */
-       mac->ops.setup_link = e1000_setup_link_82542;
-       /* phy/fiber/serdes setup */
-       mac->ops.setup_physical_interface = e1000_setup_fiber_serdes_link_generic;
-       /* check for link */
-       mac->ops.check_for_link = e1000_check_for_fiber_link_generic;
-       /* multicast address update */
-       mac->ops.update_mc_addr_list = e1000_update_mc_addr_list_generic;
-       /* writing VFTA */
-       mac->ops.write_vfta = e1000_write_vfta_generic;
-       /* clearing VFTA */
-       mac->ops.clear_vfta = e1000_clear_vfta_generic;
-       /* setting MTA */
-       mac->ops.mta_set = e1000_mta_set_generic;
-       /* set RAR */
-       mac->ops.rar_set = e1000_rar_set_82542;
-       /* turn on/off LED */
-       mac->ops.led_on = e1000_led_on_82542;
-       mac->ops.led_off = e1000_led_off_82542;
-       /* clear hardware counters */
-       mac->ops.clear_hw_cntrs = e1000_clear_hw_cntrs_82542;
-       /* link info */
-       mac->ops.get_link_up_info = e1000_get_speed_and_duplex_fiber_serdes_generic;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_init_function_pointers_82542 - Init func ptrs.
- *  @hw: pointer to the HW structure
- *
- *  Called to initialize all function pointers and parameters.
- **/
-void e1000_init_function_pointers_82542(struct e1000_hw *hw)
-{
-       DEBUGFUNC("e1000_init_function_pointers_82542");
-
-       hw->mac.ops.init_params = e1000_init_mac_params_82542;
-       hw->nvm.ops.init_params = e1000_init_nvm_params_82542;
-       hw->phy.ops.init_params = e1000_init_phy_params_82542;
-}
-
-/**
- *  e1000_get_bus_info_82542 - Obtain bus information for adapter
- *  @hw: pointer to the HW structure
- *
- *  This will obtain information about the HW bus for which the
- *  adapter is attached and stores it in the hw structure.
- **/
-static s32 e1000_get_bus_info_82542(struct e1000_hw *hw)
-{
-       DEBUGFUNC("e1000_get_bus_info_82542");
-
-       hw->bus.type = e1000_bus_type_pci;
-       hw->bus.speed = e1000_bus_speed_unknown;
-       hw->bus.width = e1000_bus_width_unknown;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_reset_hw_82542 - Reset hardware
- *  @hw: pointer to the HW structure
- *
- *  This resets the hardware into a known state.
- **/
-static s32 e1000_reset_hw_82542(struct e1000_hw *hw)
-{
-       struct e1000_bus_info *bus = &hw->bus;
-       s32 ret_val = E1000_SUCCESS;
-       u32 ctrl;
-
-       DEBUGFUNC("e1000_reset_hw_82542");
-
-       if (hw->revision_id == E1000_REVISION_2) {
-               DEBUGOUT("Disabling MWI on 82542 rev 2\n");
-               e1000_pci_clear_mwi(hw);
-       }
-
-       DEBUGOUT("Masking off all interrupts\n");
-       E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff);
-
-       E1000_WRITE_REG(hw, E1000_RCTL, 0);
-       E1000_WRITE_REG(hw, E1000_TCTL, E1000_TCTL_PSP);
-       E1000_WRITE_FLUSH(hw);
-
-       /*
-        * Delay to allow any outstanding PCI transactions to complete before
-        * resetting the device
-        */
-       msec_delay(10);
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       DEBUGOUT("Issuing a global reset to 82542/82543 MAC\n");
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_RST);
-
-       hw->nvm.ops.reload(hw);
-       msec_delay(2);
-
-       E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff);
-       E1000_READ_REG(hw, E1000_ICR);
-
-       if (hw->revision_id == E1000_REVISION_2) {
-               if (bus->pci_cmd_word & CMD_MEM_WRT_INVALIDATE)
-                       e1000_pci_set_mwi(hw);
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_init_hw_82542 - Initialize hardware
- *  @hw: pointer to the HW structure
- *
- *  This inits the hardware readying it for operation.
- **/
-static s32 e1000_init_hw_82542(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_dev_spec_82542 *dev_spec = &hw->dev_spec._82542;
-       s32 ret_val = E1000_SUCCESS;
-       u32 ctrl;
-       u16 i;
-
-       DEBUGFUNC("e1000_init_hw_82542");
-
-       /* Disabling VLAN filtering */
-       E1000_WRITE_REG(hw, E1000_VET, 0);
-       mac->ops.clear_vfta(hw);
-
-       /* For 82542 (rev 2.0), disable MWI and put the receiver into reset */
-       if (hw->revision_id == E1000_REVISION_2) {
-               DEBUGOUT("Disabling MWI on 82542 rev 2.0\n");
-               e1000_pci_clear_mwi(hw);
-               E1000_WRITE_REG(hw, E1000_RCTL, E1000_RCTL_RST);
-               E1000_WRITE_FLUSH(hw);
-               msec_delay(5);
-       }
-
-       /* Setup the receive address. */
-       e1000_init_rx_addrs_generic(hw, mac->rar_entry_count);
-
-       /* For 82542 (rev 2.0), take the receiver out of reset and enable MWI */
-       if (hw->revision_id == E1000_REVISION_2) {
-               E1000_WRITE_REG(hw, E1000_RCTL, 0);
-               E1000_WRITE_FLUSH(hw);
-               msec_delay(1);
-               if (hw->bus.pci_cmd_word & CMD_MEM_WRT_INVALIDATE)
-                       e1000_pci_set_mwi(hw);
-       }
-
-       /* Zero out the Multicast HASH table */
-       DEBUGOUT("Zeroing the MTA\n");
-       for (i = 0; i < mac->mta_reg_count; i++)
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
-
-       /*
-        * Set the PCI priority bit correctly in the CTRL register.  This
-        * determines if the adapter gives priority to receives, or if it
-        * gives equal priority to transmits and receives.
-        */
-       if (dev_spec->dma_fairness) {
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_PRIOR);
-       }
-
-       /* Setup link and flow control */
-       ret_val = e1000_setup_link_82542(hw);
-
-       /*
-        * Clear all of the statistics registers (clear on read).  It is
-        * important that we do this after we have tried to establish link
-        * because the symbol error count will increment wildly if there
-        * is no link.
-        */
-       e1000_clear_hw_cntrs_82542(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_setup_link_82542 - Setup flow control and link settings
- *  @hw: pointer to the HW structure
- *
- *  Determines which flow control settings to use, then configures flow
- *  control.  Calls the appropriate media-specific link configuration
- *  function.  Assuming the adapter has a valid link partner, a valid link
- *  should be established.  Assumes the hardware has previously been reset
- *  and the transmitter and receiver are not enabled.
- **/
-static s32 e1000_setup_link_82542(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_setup_link_82542");
-
-       ret_val = e1000_set_default_fc_generic(hw);
-       if (ret_val)
-               goto out;
-
-       hw->fc.requested_mode &= ~e1000_fc_tx_pause;
-
-       if (mac->report_tx_early == 1)
-               hw->fc.requested_mode &= ~e1000_fc_rx_pause;
-
-       /*
-        * Save off the requested flow control mode for use later.  Depending
-        * on the link partner's capabilities, we may or may not use this mode.
-        */
-       hw->fc.current_mode = hw->fc.requested_mode;
-
-       DEBUGOUT1("After fix-ups FlowControl is now = %x\n",
-                                                    hw->fc.current_mode);
-
-       /* Call the necessary subroutine to configure the link. */
-       ret_val = mac->ops.setup_physical_interface(hw);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Initialize the flow control address, type, and PAUSE timer
-        * registers to their default values.  This is done even if flow
-        * control is disabled, because it does not hurt anything to
-        * initialize these registers.
-        */
-       DEBUGOUT("Initializing Flow Control address, type and timer regs\n");
-
-       E1000_WRITE_REG(hw, E1000_FCAL, FLOW_CONTROL_ADDRESS_LOW);
-       E1000_WRITE_REG(hw, E1000_FCAH, FLOW_CONTROL_ADDRESS_HIGH);
-       E1000_WRITE_REG(hw, E1000_FCT, FLOW_CONTROL_TYPE);
-
-       E1000_WRITE_REG(hw, E1000_FCTTV, hw->fc.pause_time);
-
-       ret_val = e1000_set_fc_watermarks_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_led_on_82542 - Turn on SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  Turns the SW defined LED on.
- **/
-static s32 e1000_led_on_82542(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       DEBUGFUNC("e1000_led_on_82542");
-
-       ctrl |= E1000_CTRL_SWDPIN0;
-       ctrl |= E1000_CTRL_SWDPIO0;
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-       return E1000_SUCCESS;
-#endif
-       return 0;
-}
-
-/**
- *  e1000_led_off_82542 - Turn off SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  Turns the SW defined LED off.
- **/
-static s32 e1000_led_off_82542(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       DEBUGFUNC("e1000_led_off_82542");
-
-       ctrl &= ~E1000_CTRL_SWDPIN0;
-       ctrl |= E1000_CTRL_SWDPIO0;
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-       return E1000_SUCCESS;
-#endif
-       return 0;
-}
-
-/**
- *  e1000_rar_set_82542 - Set receive address register
- *  @hw: pointer to the HW structure
- *  @addr: pointer to the receive address
- *  @index: receive address array register
- *
- *  Sets the receive address array register at index to the address passed
- *  in by addr.
- **/
-static void e1000_rar_set_82542(struct e1000_hw *hw, u8 *addr, u32 index)
-{
-       u32 rar_low, rar_high;
-
-       DEBUGFUNC("e1000_rar_set_82542");
-
-       /*
-        * HW expects these in little endian so we reverse the byte order
-        * from network order (big endian) to little endian
-        */
-       rar_low = ((u32) addr[0] |
-                  ((u32) addr[1] << 8) |
-                  ((u32) addr[2] << 16) | ((u32) addr[3] << 24));
-
-       rar_high = ((u32) addr[4] | ((u32) addr[5] << 8));
-
-       /* If MAC address zero, no need to set the AV bit */
-       if (rar_low || rar_high)
-               rar_high |= E1000_RAH_AV;
-
-       E1000_WRITE_REG_ARRAY(hw, E1000_RA, (index << 1), rar_low);
-       E1000_WRITE_REG_ARRAY(hw, E1000_RA, ((index << 1) + 1), rar_high);
-}
-
-/**
- *  e1000_translate_register_82542 - Translate the proper register offset
- *  @reg: e1000 register to be read
- *
- *  Registers in 82542 are located in different offsets than other adapters
- *  even though they function in the same manner.  This function takes in
- *  the name of the register to read and returns the correct offset for
- *  82542 silicon.
- **/
-u32 e1000_translate_register_82542(u32 reg)
-{
-       /*
-        * Some of the 82542 registers are located at different
-        * offsets than they are in newer adapters.
-        * Despite the difference in location, the registers
-        * function in the same manner.
-        */
-       switch (reg) {
-       case E1000_RA:
-               reg = 0x00040;
-               break;
-       case E1000_RDTR:
-               reg = 0x00108;
-               break;
-       case E1000_RDBAL(0):
-               reg = 0x00110;
-               break;
-       case E1000_RDBAH(0):
-               reg = 0x00114;
-               break;
-       case E1000_RDLEN(0):
-               reg = 0x00118;
-               break;
-       case E1000_RDH(0):
-               reg = 0x00120;
-               break;
-       case E1000_RDT(0):
-               reg = 0x00128;
-               break;
-       case E1000_RDBAL(1):
-               reg = 0x00138;
-               break;
-       case E1000_RDBAH(1):
-               reg = 0x0013C;
-               break;
-       case E1000_RDLEN(1):
-               reg = 0x00140;
-               break;
-       case E1000_RDH(1):
-               reg = 0x00148;
-               break;
-       case E1000_RDT(1):
-               reg = 0x00150;
-               break;
-       case E1000_FCRTH:
-               reg = 0x00160;
-               break;
-       case E1000_FCRTL:
-               reg = 0x00168;
-               break;
-       case E1000_MTA:
-               reg = 0x00200;
-               break;
-       case E1000_TDBAL(0):
-               reg = 0x00420;
-               break;
-       case E1000_TDBAH(0):
-               reg = 0x00424;
-               break;
-       case E1000_TDLEN(0):
-               reg = 0x00428;
-               break;
-       case E1000_TDH(0):
-               reg = 0x00430;
-               break;
-       case E1000_TDT(0):
-               reg = 0x00438;
-               break;
-       case E1000_TIDV:
-               reg = 0x00440;
-               break;
-       case E1000_VFTA:
-               reg = 0x00600;
-               break;
-       case E1000_TDFH:
-               reg = 0x08010;
-               break;
-       case E1000_TDFT:
-               reg = 0x08018;
-               break;
-       default:
-               break;
-       }
-
-       return reg;
-}
-
-/**
- *  e1000_clear_hw_cntrs_82542 - Clear device specific hardware counters
- *  @hw: pointer to the HW structure
- *
- *  Clears the hardware counters by reading the counter registers.
- **/
-static void e1000_clear_hw_cntrs_82542(struct e1000_hw *hw)
-{
-       DEBUGFUNC("e1000_clear_hw_cntrs_82542");
-
-       e1000_clear_hw_cntrs_base_generic(hw);
-
-#if 0
-       E1000_READ_REG(hw, E1000_PRC64);
-       E1000_READ_REG(hw, E1000_PRC127);
-       E1000_READ_REG(hw, E1000_PRC255);
-       E1000_READ_REG(hw, E1000_PRC511);
-       E1000_READ_REG(hw, E1000_PRC1023);
-       E1000_READ_REG(hw, E1000_PRC1522);
-       E1000_READ_REG(hw, E1000_PTC64);
-       E1000_READ_REG(hw, E1000_PTC127);
-       E1000_READ_REG(hw, E1000_PTC255);
-       E1000_READ_REG(hw, E1000_PTC511);
-       E1000_READ_REG(hw, E1000_PTC1023);
-       E1000_READ_REG(hw, E1000_PTC1522);
-#endif
-}
-
-static struct pci_device_id e1000_82542_nics[] = {
-     PCI_ROM(0x8086, 0x1000, "E1000_DEV_ID_82542", "E1000_DEV_ID_82542", e1000_82542),
-};
-
-struct pci_driver e1000_82542_driver __pci_driver = {
-       .ids = e1000_82542_nics,
-       .id_count = (sizeof (e1000_82542_nics) / sizeof (e1000_82542_nics[0])),
-       .probe = e1000_probe,
-       .remove = e1000_remove,
-};
diff --git a/src/drivers/net/e1000/e1000_82543.c b/src/drivers/net/e1000/e1000_82543.c
deleted file mode 100644 (file)
index 848c99e..0000000
+++ /dev/null
@@ -1,1635 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/*
- * 82543GC Gigabit Ethernet Controller (Fiber)
- * 82543GC Gigabit Ethernet Controller (Copper)
- * 82544EI Gigabit Ethernet Controller (Copper)
- * 82544EI Gigabit Ethernet Controller (Fiber)
- * 82544GC Gigabit Ethernet Controller (Copper)
- * 82544GC Gigabit Ethernet Controller (LOM)
- */
-
-#include "e1000_api.h"
-
-static s32  e1000_init_phy_params_82543(struct e1000_hw *hw);
-static s32  e1000_init_nvm_params_82543(struct e1000_hw *hw);
-static s32  e1000_init_mac_params_82543(struct e1000_hw *hw);
-static s32  e1000_read_phy_reg_82543(struct e1000_hw *hw, u32 offset,
-                                     u16 *data);
-static s32  e1000_write_phy_reg_82543(struct e1000_hw *hw, u32 offset,
-                                      u16 data);
-#if 0
-static s32  e1000_phy_force_speed_duplex_82543(struct e1000_hw *hw);
-#endif
-static s32  e1000_phy_hw_reset_82543(struct e1000_hw *hw);
-static s32  e1000_reset_hw_82543(struct e1000_hw *hw);
-static s32  e1000_init_hw_82543(struct e1000_hw *hw);
-static s32  e1000_setup_link_82543(struct e1000_hw *hw);
-static s32  e1000_setup_copper_link_82543(struct e1000_hw *hw);
-static s32  e1000_setup_fiber_link_82543(struct e1000_hw *hw);
-static s32  e1000_check_for_copper_link_82543(struct e1000_hw *hw);
-static s32  e1000_check_for_fiber_link_82543(struct e1000_hw *hw);
-static s32  e1000_led_on_82543(struct e1000_hw *hw);
-static s32  e1000_led_off_82543(struct e1000_hw *hw);
-static void e1000_write_vfta_82543(struct e1000_hw *hw, u32 offset,
-                                   u32 value);
-static void e1000_mta_set_82543(struct e1000_hw *hw, u32 hash_value);
-static void e1000_clear_hw_cntrs_82543(struct e1000_hw *hw);
-static s32  e1000_config_mac_to_phy_82543(struct e1000_hw *hw);
-static bool e1000_init_phy_disabled_82543(struct e1000_hw *hw);
-static void e1000_lower_mdi_clk_82543(struct e1000_hw *hw, u32 *ctrl);
-static s32  e1000_polarity_reversal_workaround_82543(struct e1000_hw *hw);
-static void e1000_raise_mdi_clk_82543(struct e1000_hw *hw, u32 *ctrl);
-static u16  e1000_shift_in_mdi_bits_82543(struct e1000_hw *hw);
-static void e1000_shift_out_mdi_bits_82543(struct e1000_hw *hw, u32 data,
-                                           u16 count);
-static bool e1000_tbi_compatibility_enabled_82543(struct e1000_hw *hw);
-static void e1000_set_tbi_compatibility_82543(struct e1000_hw *hw, bool state);
-static void e1000_set_tbi_sbp_82543(struct e1000_hw *hw, bool state);
-
-/**
- *  e1000_init_phy_params_82543 - Init PHY func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_phy_params_82543(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_init_phy_params_82543");
-
-       if (hw->phy.media_type != e1000_media_type_copper) {
-               phy->type               = e1000_phy_none;
-               goto out;
-       } else {
-               phy->ops.power_up       = e1000_power_up_phy_copper;
-               phy->ops.power_down     = e1000_power_down_phy_copper;
-       }
-
-       phy->addr                       = 1;
-       phy->autoneg_mask               = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-       phy->reset_delay_us             = 10000;
-       phy->type                       = e1000_phy_m88;
-
-       /* Function Pointers */
-       phy->ops.check_polarity         = e1000_check_polarity_m88;
-       phy->ops.commit                 = e1000_phy_sw_reset_generic;
-#if 0
-       phy->ops.force_speed_duplex     = e1000_phy_force_speed_duplex_82543;
-#endif
-#if 0
-       phy->ops.get_cable_length       = e1000_get_cable_length_m88;
-#endif
-       phy->ops.get_cfg_done           = e1000_get_cfg_done_generic;
-       phy->ops.read_reg               = (hw->mac.type == e1000_82543)
-                                         ? e1000_read_phy_reg_82543
-                                         : e1000_read_phy_reg_m88;
-       phy->ops.reset                  = (hw->mac.type == e1000_82543)
-                                         ? e1000_phy_hw_reset_82543
-                                         : e1000_phy_hw_reset_generic;
-       phy->ops.write_reg              = (hw->mac.type == e1000_82543)
-                                         ? e1000_write_phy_reg_82543
-                                         : e1000_write_phy_reg_m88;
-       phy->ops.get_info               = e1000_get_phy_info_m88;
-
-       /*
-        * The external PHY of the 82543 can be in a funky state.
-        * Resetting helps us read the PHY registers for acquiring
-        * the PHY ID.
-        */
-       if (!e1000_init_phy_disabled_82543(hw)) {
-               ret_val = phy->ops.reset(hw);
-               if (ret_val) {
-                       DEBUGOUT("Resetting PHY during init failed.\n");
-                       goto out;
-               }
-               msec_delay(20);
-       }
-
-       ret_val = e1000_get_phy_id(hw);
-       if (ret_val)
-               goto out;
-
-       /* Verify phy id */
-       switch (hw->mac.type) {
-       case e1000_82543:
-               if (phy->id != M88E1000_E_PHY_ID) {
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-               }
-               break;
-       case e1000_82544:
-               if (phy->id != M88E1000_I_PHY_ID) {
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-               }
-               break;
-       default:
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-               break;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_init_nvm_params_82543 - Init NVM func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_nvm_params_82543(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-
-       DEBUGFUNC("e1000_init_nvm_params_82543");
-
-       nvm->type               = e1000_nvm_eeprom_microwire;
-       nvm->word_size          = 64;
-       nvm->delay_usec         = 50;
-       nvm->address_bits       =  6;
-       nvm->opcode_bits        =  3;
-
-       /* Function Pointers */
-       nvm->ops.read           = e1000_read_nvm_microwire;
-       nvm->ops.update         = e1000_update_nvm_checksum_generic;
-       nvm->ops.valid_led_default = e1000_valid_led_default_generic;
-       nvm->ops.validate       = e1000_validate_nvm_checksum_generic;
-       nvm->ops.write          = e1000_write_nvm_microwire;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_init_mac_params_82543 - Init MAC func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000_init_mac_params_82543(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-
-       DEBUGFUNC("e1000_init_mac_params_82543");
-
-       /* Set media type */
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82543GC_FIBER:
-       case E1000_DEV_ID_82544EI_FIBER:
-               hw->phy.media_type = e1000_media_type_fiber;
-               break;
-       default:
-               hw->phy.media_type = e1000_media_type_copper;
-               break;
-       }
-
-       /* Set mta register count */
-       mac->mta_reg_count = 128;
-       /* Set rar entry count */
-       mac->rar_entry_count = E1000_RAR_ENTRIES;
-
-       /* Function pointers */
-
-       /* bus type/speed/width */
-       mac->ops.get_bus_info = e1000_get_bus_info_pci_generic;
-       /* function id */
-       mac->ops.set_lan_id = e1000_set_lan_id_multi_port_pci;
-       /* reset */
-       mac->ops.reset_hw = e1000_reset_hw_82543;
-       /* hw initialization */
-       mac->ops.init_hw = e1000_init_hw_82543;
-       /* link setup */
-       mac->ops.setup_link = e1000_setup_link_82543;
-       /* physical interface setup */
-       mac->ops.setup_physical_interface =
-               (hw->phy.media_type == e1000_media_type_copper)
-                       ? e1000_setup_copper_link_82543
-                       : e1000_setup_fiber_link_82543;
-       /* check for link */
-       mac->ops.check_for_link =
-               (hw->phy.media_type == e1000_media_type_copper)
-                       ? e1000_check_for_copper_link_82543
-                       : e1000_check_for_fiber_link_82543;
-       /* link info */
-       mac->ops.get_link_up_info =
-               (hw->phy.media_type == e1000_media_type_copper)
-                       ? e1000_get_speed_and_duplex_copper_generic
-                       : e1000_get_speed_and_duplex_fiber_serdes_generic;
-       /* multicast address update */
-       mac->ops.update_mc_addr_list = e1000_update_mc_addr_list_generic;
-       /* writing VFTA */
-       mac->ops.write_vfta = e1000_write_vfta_82543;
-       /* clearing VFTA */
-       mac->ops.clear_vfta = e1000_clear_vfta_generic;
-       /* setting MTA */
-       mac->ops.mta_set = e1000_mta_set_82543;
-       /* turn on/off LED */
-       mac->ops.led_on = e1000_led_on_82543;
-       mac->ops.led_off = e1000_led_off_82543;
-       /* clear hardware counters */
-       mac->ops.clear_hw_cntrs = e1000_clear_hw_cntrs_82543;
-
-       /* Set tbi compatibility */
-       if ((hw->mac.type != e1000_82543) ||
-           (hw->phy.media_type == e1000_media_type_fiber))
-               e1000_set_tbi_compatibility_82543(hw, false);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_init_function_pointers_82543 - Init func ptrs.
- *  @hw: pointer to the HW structure
- *
- *  Called to initialize all function pointers and parameters.
- **/
-void e1000_init_function_pointers_82543(struct e1000_hw *hw)
-{
-       DEBUGFUNC("e1000_init_function_pointers_82543");
-
-       hw->mac.ops.init_params = e1000_init_mac_params_82543;
-       hw->nvm.ops.init_params = e1000_init_nvm_params_82543;
-       hw->phy.ops.init_params = e1000_init_phy_params_82543;
-}
-
-/**
- *  e1000_tbi_compatibility_enabled_82543 - Returns TBI compat status
- *  @hw: pointer to the HW structure
- *
- *  Returns the current status of 10-bit Interface (TBI) compatibility
- *  (enabled/disabled).
- **/
-static bool e1000_tbi_compatibility_enabled_82543(struct e1000_hw *hw)
-{
-       struct e1000_dev_spec_82543 *dev_spec = &hw->dev_spec._82543;
-       bool state = false;
-
-       DEBUGFUNC("e1000_tbi_compatibility_enabled_82543");
-
-       if (hw->mac.type != e1000_82543) {
-               DEBUGOUT("TBI compatibility workaround for 82543 only.\n");
-               goto out;
-       }
-
-       state = (dev_spec->tbi_compatibility & TBI_COMPAT_ENABLED)
-               ? true : false;
-
-out:
-       return state;
-}
-
-/**
- *  e1000_set_tbi_compatibility_82543 - Set TBI compatibility
- *  @hw: pointer to the HW structure
- *  @state: enable/disable TBI compatibility
- *
- *  Enables or disabled 10-bit Interface (TBI) compatibility.
- **/
-static void e1000_set_tbi_compatibility_82543(struct e1000_hw *hw, bool state)
-{
-       struct e1000_dev_spec_82543 *dev_spec = &hw->dev_spec._82543;
-
-       DEBUGFUNC("e1000_set_tbi_compatibility_82543");
-
-       if (hw->mac.type != e1000_82543) {
-               DEBUGOUT("TBI compatibility workaround for 82543 only.\n");
-               goto out;
-       }
-
-       if (state)
-               dev_spec->tbi_compatibility |= TBI_COMPAT_ENABLED;
-       else
-               dev_spec->tbi_compatibility &= ~TBI_COMPAT_ENABLED;
-
-out:
-       return;
-}
-
-/**
- *  e1000_tbi_sbp_enabled_82543 - Returns TBI SBP status
- *  @hw: pointer to the HW structure
- *
- *  Returns the current status of 10-bit Interface (TBI) store bad packet (SBP)
- *  (enabled/disabled).
- **/
-bool e1000_tbi_sbp_enabled_82543(struct e1000_hw *hw)
-{
-       struct e1000_dev_spec_82543 *dev_spec = &hw->dev_spec._82543;
-       bool state = false;
-
-       DEBUGFUNC("e1000_tbi_sbp_enabled_82543");
-
-       if (hw->mac.type != e1000_82543) {
-               DEBUGOUT("TBI compatibility workaround for 82543 only.\n");
-               goto out;
-       }
-
-       state = (dev_spec->tbi_compatibility & TBI_SBP_ENABLED)
-               ? true : false;
-
-out:
-       return state;
-}
-
-/**
- *  e1000_set_tbi_sbp_82543 - Set TBI SBP
- *  @hw: pointer to the HW structure
- *  @state: enable/disable TBI store bad packet
- *
- *  Enables or disabled 10-bit Interface (TBI) store bad packet (SBP).
- **/
-static void e1000_set_tbi_sbp_82543(struct e1000_hw *hw, bool state)
-{
-       struct e1000_dev_spec_82543 *dev_spec = &hw->dev_spec._82543;
-
-       DEBUGFUNC("e1000_set_tbi_sbp_82543");
-
-       if (state && e1000_tbi_compatibility_enabled_82543(hw))
-               dev_spec->tbi_compatibility |= TBI_SBP_ENABLED;
-       else
-               dev_spec->tbi_compatibility &= ~TBI_SBP_ENABLED;
-
-       return;
-}
-
-/**
- *  e1000_init_phy_disabled_82543 - Returns init PHY status
- *  @hw: pointer to the HW structure
- *
- *  Returns the current status of whether PHY initialization is disabled.
- *  True if PHY initialization is disabled else false.
- **/
-static bool e1000_init_phy_disabled_82543(struct e1000_hw *hw)
-{
-       struct e1000_dev_spec_82543 *dev_spec = &hw->dev_spec._82543;
-       bool ret_val;
-
-       DEBUGFUNC("e1000_init_phy_disabled_82543");
-
-       if (hw->mac.type != e1000_82543) {
-               ret_val = false;
-               goto out;
-       }
-
-       ret_val = dev_spec->init_phy_disabled;
-
-out:
-       return ret_val;
-}
-
-#if 0
-/**
- *  e1000_tbi_adjust_stats_82543 - Adjust stats when TBI enabled
- *  @hw: pointer to the HW structure
- *  @stats: Struct containing statistic register values
- *  @frame_len: The length of the frame in question
- *  @mac_addr: The Ethernet destination address of the frame in question
- *  @max_frame_size: The maximum frame size
- *
- *  Adjusts the statistic counters when a frame is accepted by TBI_ACCEPT
- **/
-void e1000_tbi_adjust_stats_82543(struct e1000_hw *hw,
-                                  struct e1000_hw_stats *stats, u32 frame_len,
-                                  u8 *mac_addr, u32 max_frame_size)
-{
-       if (!(e1000_tbi_sbp_enabled_82543(hw)))
-               goto out;
-
-       /* First adjust the frame length. */
-       frame_len--;
-       /*
-        * We need to adjust the statistics counters, since the hardware
-        * counters overcount this packet as a CRC error and undercount
-        * the packet as a good packet
-        */
-       /* This packet should not be counted as a CRC error.    */
-       stats->crcerrs--;
-       /* This packet does count as a Good Packet Received.    */
-       stats->gprc++;
-
-       /* Adjust the Good Octets received counters             */
-       stats->gorc += frame_len;
-
-       /*
-        * Is this a broadcast or multicast?  Check broadcast first,
-        * since the test for a multicast frame will test positive on
-        * a broadcast frame.
-        */
-       if ((mac_addr[0] == 0xff) && (mac_addr[1] == 0xff))
-               /* Broadcast packet */
-               stats->bprc++;
-       else if (*mac_addr & 0x01)
-               /* Multicast packet */
-               stats->mprc++;
-
-       /*
-        * In this case, the hardware has overcounted the number of
-        * oversize frames.
-        */
-       if ((frame_len == max_frame_size) && (stats->roc > 0))
-               stats->roc--;
-
-       /*
-        * Adjust the bin counters when the extra byte put the frame in the
-        * wrong bin. Remember that the frame_len was adjusted above.
-        */
-       if (frame_len == 64) {
-               stats->prc64++;
-               stats->prc127--;
-       } else if (frame_len == 127) {
-               stats->prc127++;
-               stats->prc255--;
-       } else if (frame_len == 255) {
-               stats->prc255++;
-               stats->prc511--;
-       } else if (frame_len == 511) {
-               stats->prc511++;
-               stats->prc1023--;
-       } else if (frame_len == 1023) {
-               stats->prc1023++;
-               stats->prc1522--;
-       } else if (frame_len == 1522) {
-               stats->prc1522++;
-       }
-
-out:
-       return;
-}
-#endif
-
-/**
- *  e1000_read_phy_reg_82543 - Read PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Reads the PHY at offset and stores the information read to data.
- **/
-static s32 e1000_read_phy_reg_82543(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       u32 mdic;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_read_phy_reg_82543");
-
-       if (offset > MAX_PHY_REG_ADDRESS) {
-               DEBUGOUT1("PHY Address %d is out of range\n", offset);
-               ret_val = -E1000_ERR_PARAM;
-               goto out;
-       }
-
-       /*
-        * We must first send a preamble through the MDIO pin to signal the
-        * beginning of an MII instruction.  This is done by sending 32
-        * consecutive "1" bits.
-        */
-       e1000_shift_out_mdi_bits_82543(hw, PHY_PREAMBLE, PHY_PREAMBLE_SIZE);
-
-       /*
-        * Now combine the next few fields that are required for a read
-        * operation.  We use this method instead of calling the
-        * e1000_shift_out_mdi_bits routine five different times.  The format
-        * of an MII read instruction consists of a shift out of 14 bits and
-        * is defined as follows:
-        *      <Preamble><SOF><Op Code><Phy Addr><Offset>
-        * followed by a shift in of 18 bits.  This first two bits shifted in
-        * are TurnAround bits used to avoid contention on the MDIO pin when a
-        * READ operation is performed.  These two bits are thrown away
-        * followed by a shift in of 16 bits which contains the desired data.
-        */
-       mdic = (offset | (hw->phy.addr << 5) |
-               (PHY_OP_READ << 10) | (PHY_SOF << 12));
-
-       e1000_shift_out_mdi_bits_82543(hw, mdic, 14);
-
-       /*
-        * Now that we've shifted out the read command to the MII, we need to
-        * "shift in" the 16-bit value (18 total bits) of the requested PHY
-        * register address.
-        */
-       *data = e1000_shift_in_mdi_bits_82543(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_write_phy_reg_82543 - Write PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be written
- *  @data: pointer to the data to be written at offset
- *
- *  Writes data to the PHY at offset.
- **/
-static s32 e1000_write_phy_reg_82543(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       u32 mdic;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_write_phy_reg_82543");
-
-       if (offset > MAX_PHY_REG_ADDRESS) {
-               DEBUGOUT1("PHY Address %d is out of range\n", offset);
-               ret_val = -E1000_ERR_PARAM;
-               goto out;
-       }
-
-       /*
-        * We'll need to use the SW defined pins to shift the write command
-        * out to the PHY. We first send a preamble to the PHY to signal the
-        * beginning of the MII instruction.  This is done by sending 32
-        * consecutive "1" bits.
-        */
-       e1000_shift_out_mdi_bits_82543(hw, PHY_PREAMBLE, PHY_PREAMBLE_SIZE);
-
-       /*
-        * Now combine the remaining required fields that will indicate a
-        * write operation. We use this method instead of calling the
-        * e1000_shift_out_mdi_bits routine for each field in the command. The
-        * format of a MII write instruction is as follows:
-        * <Preamble><SOF><Op Code><Phy Addr><Reg Addr><Turnaround><Data>.
-        */
-       mdic = ((PHY_TURNAROUND) | (offset << 2) | (hw->phy.addr << 7) |
-               (PHY_OP_WRITE << 12) | (PHY_SOF << 14));
-       mdic <<= 16;
-       mdic |= (u32) data;
-
-       e1000_shift_out_mdi_bits_82543(hw, mdic, 32);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_raise_mdi_clk_82543 - Raise Management Data Input clock
- *  @hw: pointer to the HW structure
- *  @ctrl: pointer to the control register
- *
- *  Raise the management data input clock by setting the MDC bit in the control
- *  register.
- **/
-static void e1000_raise_mdi_clk_82543(struct e1000_hw *hw, u32 *ctrl)
-{
-       /*
-        * Raise the clock input to the Management Data Clock (by setting the
-        * MDC bit), and then delay a sufficient amount of time.
-        */
-       E1000_WRITE_REG(hw, E1000_CTRL, (*ctrl | E1000_CTRL_MDC));
-       E1000_WRITE_FLUSH(hw);
-       usec_delay(10);
-}
-
-/**
- *  e1000_lower_mdi_clk_82543 - Lower Management Data Input clock
- *  @hw: pointer to the HW structure
- *  @ctrl: pointer to the control register
- *
- *  Lower the management data input clock by clearing the MDC bit in the
- *  control register.
- **/
-static void e1000_lower_mdi_clk_82543(struct e1000_hw *hw, u32 *ctrl)
-{
-       /*
-        * Lower the clock input to the Management Data Clock (by clearing the
-        * MDC bit), and then delay a sufficient amount of time.
-        */
-       E1000_WRITE_REG(hw, E1000_CTRL, (*ctrl & ~E1000_CTRL_MDC));
-       E1000_WRITE_FLUSH(hw);
-       usec_delay(10);
-}
-
-/**
- *  e1000_shift_out_mdi_bits_82543 - Shift data bits our to the PHY
- *  @hw: pointer to the HW structure
- *  @data: data to send to the PHY
- *  @count: number of bits to shift out
- *
- *  We need to shift 'count' bits out to the PHY.  So, the value in the
- *  "data" parameter will be shifted out to the PHY one bit at a time.
- *  In order to do this, "data" must be broken down into bits.
- **/
-static void e1000_shift_out_mdi_bits_82543(struct e1000_hw *hw, u32 data,
-                                           u16 count)
-{
-       u32 ctrl, mask;
-
-       /*
-        * We need to shift "count" number of bits out to the PHY.  So, the
-        * value in the "data" parameter will be shifted out to the PHY one
-        * bit at a time.  In order to do this, "data" must be broken down
-        * into bits.
-        */
-       mask = 0x01;
-       mask <<= (count -1);
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       /* Set MDIO_DIR and MDC_DIR direction bits to be used as output pins. */
-       ctrl |= (E1000_CTRL_MDIO_DIR | E1000_CTRL_MDC_DIR);
-
-       while (mask) {
-               /*
-                * A "1" is shifted out to the PHY by setting the MDIO bit to
-                * "1" and then raising and lowering the Management Data Clock.
-                * A "0" is shifted out to the PHY by setting the MDIO bit to
-                * "0" and then raising and lowering the clock.
-                */
-               if (data & mask) ctrl |= E1000_CTRL_MDIO;
-               else ctrl &= ~E1000_CTRL_MDIO;
-
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-               E1000_WRITE_FLUSH(hw);
-
-               usec_delay(10);
-
-               e1000_raise_mdi_clk_82543(hw, &ctrl);
-               e1000_lower_mdi_clk_82543(hw, &ctrl);
-
-               mask >>= 1;
-       }
-}
-
-/**
- *  e1000_shift_in_mdi_bits_82543 - Shift data bits in from the PHY
- *  @hw: pointer to the HW structure
- *
- *  In order to read a register from the PHY, we need to shift 18 bits
- *  in from the PHY.  Bits are "shifted in" by raising the clock input to
- *  the PHY (setting the MDC bit), and then reading the value of the data out
- *  MDIO bit.
- **/
-static u16 e1000_shift_in_mdi_bits_82543(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       u16 data = 0;
-       u8 i;
-
-       /*
-        * In order to read a register from the PHY, we need to shift in a
-        * total of 18 bits from the PHY.  The first two bit (turnaround)
-        * times are used to avoid contention on the MDIO pin when a read
-        * operation is performed.  These two bits are ignored by us and
-        * thrown away.  Bits are "shifted in" by raising the input to the
-        * Management Data Clock (setting the MDC bit) and then reading the
-        * value of the MDIO bit.
-        */
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       /*
-        * Clear MDIO_DIR (SWDPIO1) to indicate this bit is to be used as
-        * input.
-        */
-       ctrl &= ~E1000_CTRL_MDIO_DIR;
-       ctrl &= ~E1000_CTRL_MDIO;
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-       E1000_WRITE_FLUSH(hw);
-
-       /*
-        * Raise and lower the clock before reading in the data.  This accounts
-        * for the turnaround bits.  The first clock occurred when we clocked
-        * out the last bit of the Register Address.
-        */
-       e1000_raise_mdi_clk_82543(hw, &ctrl);
-       e1000_lower_mdi_clk_82543(hw, &ctrl);
-
-       for (data = 0, i = 0; i < 16; i++) {
-               data <<= 1;
-               e1000_raise_mdi_clk_82543(hw, &ctrl);
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               /* Check to see if we shifted in a "1". */
-               if (ctrl & E1000_CTRL_MDIO)
-                       data |= 1;
-               e1000_lower_mdi_clk_82543(hw, &ctrl);
-       }
-
-       e1000_raise_mdi_clk_82543(hw, &ctrl);
-       e1000_lower_mdi_clk_82543(hw, &ctrl);
-
-       return data;
-}
-
-#if 0
-/**
- *  e1000_phy_force_speed_duplex_82543 - Force speed/duplex for PHY
- *  @hw: pointer to the HW structure
- *
- *  Calls the function to force speed and duplex for the m88 PHY, and
- *  if the PHY is not auto-negotiating and the speed is forced to 10Mbit,
- *  then call the function for polarity reversal workaround.
- **/
-static s32 e1000_phy_force_speed_duplex_82543(struct e1000_hw *hw)
-{
-       s32 ret_val;
-
-       DEBUGFUNC("e1000_phy_force_speed_duplex_82543");
-
-       ret_val = e1000_phy_force_speed_duplex_m88(hw);
-       if (ret_val)
-               goto out;
-
-       if (!hw->mac.autoneg &&
-           (hw->mac.forced_speed_duplex & E1000_ALL_10_SPEED))
-               ret_val = e1000_polarity_reversal_workaround_82543(hw);
-
-out:
-       return ret_val;
-}
-#endif
-
-/**
- *  e1000_polarity_reversal_workaround_82543 - Workaround polarity reversal
- *  @hw: pointer to the HW structure
- *
- *  When forcing link to 10 Full or 10 Half, the PHY can reverse the polarity
- *  inadvertently.  To workaround the issue, we disable the transmitter on
- *  the PHY until we have established the link partner's link parameters.
- **/
-static s32 e1000_polarity_reversal_workaround_82543(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 mii_status_reg;
-       u16 i;
-       bool link;
-
-       if (!(hw->phy.ops.write_reg))
-               goto out;
-
-       /* Polarity reversal workaround for forced 10F/10H links. */
-
-       /* Disable the transmitter on the PHY */
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0019);
-       if (ret_val)
-               goto out;
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFFFF);
-       if (ret_val)
-               goto out;
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0000);
-       if (ret_val)
-               goto out;
-
-       /*
-        * This loop will early-out if the NO link condition has been met.
-        * In other words, DO NOT use e1000_phy_has_link_generic() here.
-        */
-       for (i = PHY_FORCE_TIME; i > 0; i--) {
-               /*
-                * Read the MII Status Register and wait for Link Status bit
-                * to be clear.
-                */
-
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       goto out;
-
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       goto out;
-
-               if ((mii_status_reg & ~MII_SR_LINK_STATUS) == 0)
-                       break;
-               msec_delay_irq(100);
-       }
-
-       /* Recommended delay time after link has been lost */
-       msec_delay_irq(1000);
-
-       /* Now we will re-enable the transmitter on the PHY */
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0019);
-       if (ret_val)
-               goto out;
-       msec_delay_irq(50);
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFFF0);
-       if (ret_val)
-               goto out;
-       msec_delay_irq(50);
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xFF00);
-       if (ret_val)
-               goto out;
-       msec_delay_irq(50);
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0x0000);
-       if (ret_val)
-               goto out;
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_PAGE_SELECT, 0x0000);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Read the MII Status Register and wait for Link Status bit
-        * to be set.
-        */
-       ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_TIME, 100000, &link);
-       if (ret_val)
-               goto out;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_phy_hw_reset_82543 - PHY hardware reset
- *  @hw: pointer to the HW structure
- *
- *  Sets the PHY_RESET_DIR bit in the extended device control register
- *  to put the PHY into a reset and waits for completion.  Once the reset
- *  has been accomplished, clear the PHY_RESET_DIR bit to take the PHY out
- *  of reset.
- **/
-static s32 e1000_phy_hw_reset_82543(struct e1000_hw *hw)
-{
-       u32 ctrl_ext;
-       s32 ret_val;
-
-       DEBUGFUNC("e1000_phy_hw_reset_82543");
-
-       /*
-        * Read the Extended Device Control Register, assert the PHY_RESET_DIR
-        * bit to put the PHY into reset...
-        */
-       ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
-       ctrl_ext |= E1000_CTRL_EXT_SDP4_DIR;
-       ctrl_ext &= ~E1000_CTRL_EXT_SDP4_DATA;
-       E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
-       E1000_WRITE_FLUSH(hw);
-
-       msec_delay(10);
-
-       /* ...then take it out of reset. */
-       ctrl_ext |= E1000_CTRL_EXT_SDP4_DATA;
-       E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
-       E1000_WRITE_FLUSH(hw);
-
-       usec_delay(150);
-
-       if (!(hw->phy.ops.get_cfg_done))
-               return E1000_SUCCESS;
-
-       ret_val = hw->phy.ops.get_cfg_done(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_reset_hw_82543 - Reset hardware
- *  @hw: pointer to the HW structure
- *
- *  This resets the hardware into a known state.
- **/
-static s32 e1000_reset_hw_82543(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_reset_hw_82543");
-
-       DEBUGOUT("Masking off all interrupts\n");
-       E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff);
-
-       E1000_WRITE_REG(hw, E1000_RCTL, 0);
-       E1000_WRITE_REG(hw, E1000_TCTL, E1000_TCTL_PSP);
-       E1000_WRITE_FLUSH(hw);
-
-       e1000_set_tbi_sbp_82543(hw, false);
-
-       /*
-        * Delay to allow any outstanding PCI transactions to complete before
-        * resetting the device
-        */
-       msec_delay(10);
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       DEBUGOUT("Issuing a global reset to 82543/82544 MAC\n");
-       if (hw->mac.type == e1000_82543) {
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_RST);
-       } else {
-               /*
-                * The 82544 can't ACK the 64-bit write when issuing the
-                * reset, so use IO-mapping as a workaround.
-                */
-               E1000_WRITE_REG_IO(hw, E1000_CTRL, ctrl | E1000_CTRL_RST);
-       }
-
-       /*
-        * After MAC reset, force reload of NVM to restore power-on
-        * settings to device.
-        */
-       hw->nvm.ops.reload(hw);
-       msec_delay(2);
-
-       /* Masking off and clearing any pending interrupts */
-       E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff);
-       E1000_READ_REG(hw, E1000_ICR);
-
-       return ret_val;
-}
-
-/**
- *  e1000_init_hw_82543 - Initialize hardware
- *  @hw: pointer to the HW structure
- *
- *  This inits the hardware readying it for operation.
- **/
-static s32 e1000_init_hw_82543(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_dev_spec_82543 *dev_spec = &hw->dev_spec._82543;
-       u32 ctrl;
-       s32 ret_val;
-       u16 i;
-
-       DEBUGFUNC("e1000_init_hw_82543");
-
-       /* Disabling VLAN filtering */
-       E1000_WRITE_REG(hw, E1000_VET, 0);
-       mac->ops.clear_vfta(hw);
-
-       /* Setup the receive address. */
-       e1000_init_rx_addrs_generic(hw, mac->rar_entry_count);
-
-       /* Zero out the Multicast HASH table */
-       DEBUGOUT("Zeroing the MTA\n");
-       for (i = 0; i < mac->mta_reg_count; i++) {
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
-               E1000_WRITE_FLUSH(hw);
-       }
-
-       /*
-        * Set the PCI priority bit correctly in the CTRL register.  This
-        * determines if the adapter gives priority to receives, or if it
-        * gives equal priority to transmits and receives.
-        */
-       if (hw->mac.type == e1000_82543 && dev_spec->dma_fairness) {
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_PRIOR);
-       }
-
-       e1000_pcix_mmrbc_workaround_generic(hw);
-
-       /* Setup link and flow control */
-       ret_val = mac->ops.setup_link(hw);
-
-       /*
-        * Clear all of the statistics registers (clear on read).  It is
-        * important that we do this after we have tried to establish link
-        * because the symbol error count will increment wildly if there
-        * is no link.
-        */
-       e1000_clear_hw_cntrs_82543(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000_setup_link_82543 - Setup flow control and link settings
- *  @hw: pointer to the HW structure
- *
- *  Read the EEPROM to determine the initial polarity value and write the
- *  extended device control register with the information before calling
- *  the generic setup link function, which does the following:
- *  Determines which flow control settings to use, then configures flow
- *  control.  Calls the appropriate media-specific link configuration
- *  function.  Assuming the adapter has a valid link partner, a valid link
- *  should be established.  Assumes the hardware has previously been reset
- *  and the transmitter and receiver are not enabled.
- **/
-static s32 e1000_setup_link_82543(struct e1000_hw *hw)
-{
-       u32 ctrl_ext;
-       s32  ret_val;
-       u16 data;
-
-       DEBUGFUNC("e1000_setup_link_82543");
-
-       /*
-        * Take the 4 bits from NVM word 0xF that determine the initial
-        * polarity value for the SW controlled pins, and setup the
-        * Extended Device Control reg with that info.
-        * This is needed because one of the SW controlled pins is used for
-        * signal detection.  So this should be done before phy setup.
-        */
-       if (hw->mac.type == e1000_82543) {
-               ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, 1, &data);
-               if (ret_val) {
-                       DEBUGOUT("NVM Read Error\n");
-                       ret_val = -E1000_ERR_NVM;
-                       goto out;
-               }
-               ctrl_ext = ((data & NVM_WORD0F_SWPDIO_EXT_MASK) <<
-                           NVM_SWDPIO_EXT_SHIFT);
-               E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
-       }
-
-       ret_val = e1000_setup_link_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_setup_copper_link_82543 - Configure copper link settings
- *  @hw: pointer to the HW structure
- *
- *  Configures the link for auto-neg or forced speed and duplex.  Then we check
- *  for link, once link is established calls to configure collision distance
- *  and flow control are called.
- **/
-static s32 e1000_setup_copper_link_82543(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val;
-       bool link;
-
-       DEBUGFUNC("e1000_setup_copper_link_82543");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL) | E1000_CTRL_SLU;
-       /*
-        * With 82543, we need to force speed and duplex on the MAC
-        * equal to what the PHY speed and duplex configuration is.
-        * In addition, we need to perform a hardware reset on the
-        * PHY to take it out of reset.
-        */
-       if (hw->mac.type == e1000_82543) {
-               ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-               ret_val = hw->phy.ops.reset(hw);
-               if (ret_val)
-                       goto out;
-               hw->phy.reset_disable = false;
-       } else {
-               ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-       }
-
-       /* Set MDI/MDI-X, Polarity Reversal, and downshift settings */
-       ret_val = e1000_copper_link_setup_m88(hw);
-       if (ret_val)
-               goto out;
-
-       if (hw->mac.autoneg) {
-               /*
-                * Setup autoneg and flow control advertisement and perform
-                * autonegotiation.
-                */
-               ret_val = e1000_copper_link_autoneg(hw);
-               if (ret_val)
-                       goto out;
-       } else {
-               /*
-                * PHY will be set to 10H, 10F, 100H or 100F
-                * depending on user settings.
-                */
-#if 0
-               DEBUGOUT("Forcing Speed and Duplex\n");
-               ret_val = e1000_phy_force_speed_duplex_82543(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error Forcing Speed and Duplex\n");
-                       goto out;
-               }
-#endif
-       }
-
-       /*
-        * Check link status. Wait up to 100 microseconds for link to become
-        * valid.
-        */
-       ret_val = e1000_phy_has_link_generic(hw,
-                                            COPPER_LINK_UP_LIMIT,
-                                            10,
-                                            &link);
-       if (ret_val)
-               goto out;
-
-
-       if (link) {
-               DEBUGOUT("Valid link established!!!\n");
-               /* Config the MAC and PHY after link is up */
-               if (hw->mac.type == e1000_82544) {
-                       e1000_config_collision_dist_generic(hw);
-               } else {
-                       ret_val = e1000_config_mac_to_phy_82543(hw);
-                       if (ret_val)
-                               goto out;
-               }
-               ret_val = e1000_config_fc_after_link_up_generic(hw);
-       } else {
-               DEBUGOUT("Unable to establish link!!!\n");
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_setup_fiber_link_82543 - Setup link for fiber
- *  @hw: pointer to the HW structure
- *
- *  Configures collision distance and flow control for fiber links.  Upon
- *  successful setup, poll for link.
- **/
-static s32 e1000_setup_fiber_link_82543(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val;
-
-       DEBUGFUNC("e1000_setup_fiber_link_82543");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       /* Take the link out of reset */
-       ctrl &= ~E1000_CTRL_LRST;
-
-       e1000_config_collision_dist_generic(hw);
-
-       ret_val = e1000_commit_fc_settings_generic(hw);
-       if (ret_val)
-               goto out;
-
-       DEBUGOUT("Auto-negotiation enabled\n");
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-       E1000_WRITE_FLUSH(hw);
-       msec_delay(1);
-
-       /*
-        * For these adapters, the SW definable pin 1 is cleared when the
-        * optics detect a signal.  If we have a signal, then poll for a
-        * "Link-Up" indication.
-        */
-       if (!(E1000_READ_REG(hw, E1000_CTRL) & E1000_CTRL_SWDPIN1)) {
-               ret_val = e1000_poll_fiber_serdes_link_generic(hw);
-       } else {
-               DEBUGOUT("No signal detected\n");
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_check_for_copper_link_82543 - Check for link (Copper)
- *  @hw: pointer to the HW structure
- *
- *  Checks the phy for link, if link exists, do the following:
- *   - check for downshift
- *   - do polarity workaround (if necessary)
- *   - configure collision distance
- *   - configure flow control after link up
- *   - configure tbi compatibility
- **/
-static s32 e1000_check_for_copper_link_82543(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 icr, rctl;
-       s32 ret_val;
-       u16 speed, duplex;
-       bool link;
-
-       DEBUGFUNC("e1000_check_for_copper_link_82543");
-
-       if (!mac->get_link_status) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link)
-               goto out; /* No link detected */
-
-       mac->get_link_status = false;
-
-       e1000_check_downshift_generic(hw);
-
-       /*
-        * If we are forcing speed/duplex, then we can return since
-        * we have already determined whether we have link or not.
-        */
-       if (!mac->autoneg) {
-               /*
-                * If speed and duplex are forced to 10H or 10F, then we will
-                * implement the polarity reversal workaround.  We disable
-                * interrupts first, and upon returning, place the devices
-                * interrupt state to its previous value except for the link
-                * status change interrupt which will happened due to the
-                * execution of this workaround.
-                */
-               if (mac->forced_speed_duplex & E1000_ALL_10_SPEED) {
-                       E1000_WRITE_REG(hw, E1000_IMC, 0xFFFFFFFF);
-                       ret_val = e1000_polarity_reversal_workaround_82543(hw);
-                       icr = E1000_READ_REG(hw, E1000_ICR);
-                       E1000_WRITE_REG(hw, E1000_ICS, (icr & ~E1000_ICS_LSC));
-                       E1000_WRITE_REG(hw, E1000_IMS, IMS_ENABLE_MASK);
-               }
-
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       /*
-        * We have a M88E1000 PHY and Auto-Neg is enabled.  If we
-        * have Si on board that is 82544 or newer, Auto
-        * Speed Detection takes care of MAC speed/duplex
-        * configuration.  So we only need to configure Collision
-        * Distance in the MAC.  Otherwise, we need to force
-        * speed/duplex on the MAC to the current PHY speed/duplex
-        * settings.
-        */
-       if (mac->type == e1000_82544)
-               e1000_config_collision_dist_generic(hw);
-       else {
-               ret_val = e1000_config_mac_to_phy_82543(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error configuring MAC to PHY settings\n");
-                       goto out;
-               }
-       }
-
-       /*
-        * Configure Flow Control now that Auto-Neg has completed.
-        * First, we need to restore the desired flow control
-        * settings because we may have had to re-autoneg with a
-        * different link partner.
-        */
-       ret_val = e1000_config_fc_after_link_up_generic(hw);
-       if (ret_val) {
-               DEBUGOUT("Error configuring flow control\n");
-       }
-
-       /*
-        * At this point we know that we are on copper and we have
-        * auto-negotiated link.  These are conditions for checking the link
-        * partner capability register.  We use the link speed to determine if
-        * TBI compatibility needs to be turned on or off.  If the link is not
-        * at gigabit speed, then TBI compatibility is not needed.  If we are
-        * at gigabit speed, we turn on TBI compatibility.
-        */
-       if (e1000_tbi_compatibility_enabled_82543(hw)) {
-               ret_val = mac->ops.get_link_up_info(hw, &speed, &duplex);
-               if (ret_val) {
-                       DEBUGOUT("Error getting link speed and duplex\n");
-                       return ret_val;
-               }
-               if (speed != SPEED_1000) {
-                       /*
-                        * If link speed is not set to gigabit speed,
-                        * we do not need to enable TBI compatibility.
-                        */
-                       if (e1000_tbi_sbp_enabled_82543(hw)) {
-                               /*
-                                * If we previously were in the mode,
-                                * turn it off.
-                                */
-                               e1000_set_tbi_sbp_82543(hw, false);
-                               rctl = E1000_READ_REG(hw, E1000_RCTL);
-                               rctl &= ~E1000_RCTL_SBP;
-                               E1000_WRITE_REG(hw, E1000_RCTL, rctl);
-                       }
-               } else {
-                       /*
-                        * If TBI compatibility is was previously off,
-                        * turn it on. For compatibility with a TBI link
-                        * partner, we will store bad packets. Some
-                        * frames have an additional byte on the end and
-                        * will look like CRC errors to to the hardware.
-                        */
-                       if (!e1000_tbi_sbp_enabled_82543(hw)) {
-                               e1000_set_tbi_sbp_82543(hw, true);
-                               rctl = E1000_READ_REG(hw, E1000_RCTL);
-                               rctl |= E1000_RCTL_SBP;
-                               E1000_WRITE_REG(hw, E1000_RCTL, rctl);
-                       }
-               }
-       }
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_check_for_fiber_link_82543 - Check for link (Fiber)
- *  @hw: pointer to the HW structure
- *
- *  Checks for link up on the hardware.  If link is not up and we have
- *  a signal, then we need to force link up.
- **/
-static s32 e1000_check_for_fiber_link_82543(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 rxcw, ctrl, status;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_check_for_fiber_link_82543");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       status = E1000_READ_REG(hw, E1000_STATUS);
-       rxcw = E1000_READ_REG(hw, E1000_RXCW);
-
-       /*
-        * If we don't have link (auto-negotiation failed or link partner
-        * cannot auto-negotiate), the cable is plugged in (we have signal),
-        * and our link partner is not trying to auto-negotiate with us (we
-        * are receiving idles or data), we need to force link up. We also
-        * need to give auto-negotiation time to complete, in case the cable
-        * was just plugged in. The autoneg_failed flag does this.
-        */
-       /* (ctrl & E1000_CTRL_SWDPIN1) == 0 == have signal */
-       if ((!(ctrl & E1000_CTRL_SWDPIN1)) &&
-           (!(status & E1000_STATUS_LU)) &&
-           (!(rxcw & E1000_RXCW_C))) {
-               if (mac->autoneg_failed == 0) {
-                       mac->autoneg_failed = 1;
-                       ret_val = 0;
-                       goto out;
-               }
-               DEBUGOUT("NOT RXing /C/, disable AutoNeg and force link.\n");
-
-               /* Disable auto-negotiation in the TXCW register */
-               E1000_WRITE_REG(hw, E1000_TXCW, (mac->txcw & ~E1000_TXCW_ANE));
-
-               /* Force link-up and also force full-duplex. */
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FD);
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-               /* Configure Flow Control after forcing link up. */
-               ret_val = e1000_config_fc_after_link_up_generic(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error configuring flow control\n");
-                       goto out;
-               }
-       } else if ((ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
-               /*
-                * If we are forcing link and we are receiving /C/ ordered
-                * sets, re-enable auto-negotiation in the TXCW register
-                * and disable forced link in the Device Control register
-                * in an attempt to auto-negotiate with our link partner.
-                */
-               DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\n");
-               E1000_WRITE_REG(hw, E1000_TXCW, mac->txcw);
-               E1000_WRITE_REG(hw, E1000_CTRL, (ctrl & ~E1000_CTRL_SLU));
-
-               mac->serdes_has_link = true;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_config_mac_to_phy_82543 - Configure MAC to PHY settings
- *  @hw: pointer to the HW structure
- *
- *  For the 82543 silicon, we need to set the MAC to match the settings
- *  of the PHY, even if the PHY is auto-negotiating.
- **/
-static s32 e1000_config_mac_to_phy_82543(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_data;
-
-       DEBUGFUNC("e1000_config_mac_to_phy_82543");
-
-       if (!(hw->phy.ops.read_reg))
-               goto out;
-
-       /* Set the bits to force speed and duplex */
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       ctrl &= ~(E1000_CTRL_SPD_SEL | E1000_CTRL_ILOS);
-
-       /*
-        * Set up duplex in the Device Control and Transmit Control
-        * registers depending on negotiated values.
-        */
-       ret_val = hw->phy.ops.read_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-       if (ret_val)
-               goto out;
-
-       ctrl &= ~E1000_CTRL_FD;
-       if (phy_data & M88E1000_PSSR_DPLX)
-               ctrl |= E1000_CTRL_FD;
-
-       e1000_config_collision_dist_generic(hw);
-
-       /*
-        * Set up speed in the Device Control register depending on
-        * negotiated values.
-        */
-       if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS)
-               ctrl |= E1000_CTRL_SPD_1000;
-       else if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_100MBS)
-               ctrl |= E1000_CTRL_SPD_100;
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_write_vfta_82543 - Write value to VLAN filter table
- *  @hw: pointer to the HW structure
- *  @offset: the 32-bit offset in which to write the value to.
- *  @value: the 32-bit value to write at location offset.
- *
- *  This writes a 32-bit value to a 32-bit offset in the VLAN filter
- *  table.
- **/
-static void e1000_write_vfta_82543(struct e1000_hw *hw, u32 offset, u32 value)
-{
-       u32 temp;
-
-       DEBUGFUNC("e1000_write_vfta_82543");
-
-       if ((hw->mac.type == e1000_82544) && (offset & 1)) {
-               temp = E1000_READ_REG_ARRAY(hw, E1000_VFTA, offset - 1);
-               E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, offset, value);
-               E1000_WRITE_FLUSH(hw);
-               E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, offset - 1, temp);
-               E1000_WRITE_FLUSH(hw);
-       } else {
-               e1000_write_vfta_generic(hw, offset, value);
-       }
-}
-
-/**
- *  e1000_mta_set_82543 - Set multicast filter table address
- *  @hw: pointer to the HW structure
- *  @hash_value: determines the MTA register and bit to set
- *
- *  The multicast table address is a register array of 32-bit registers.
- *  The hash_value is used to determine what register the bit is in, the
- *  current value is read, the new bit is OR'd in and the new value is
- *  written back into the register.
- **/
-static void e1000_mta_set_82543(struct e1000_hw *hw, u32 hash_value)
-{
-       u32 hash_bit, hash_reg, mta, temp;
-
-       DEBUGFUNC("e1000_mta_set_82543");
-
-       hash_reg = (hash_value >> 5);
-
-       /*
-        * If we are on an 82544 and we are trying to write an odd offset
-        * in the MTA, save off the previous entry before writing and
-        * restore the old value after writing.
-        */
-       if ((hw->mac.type == e1000_82544) && (hash_reg & 1)) {
-               hash_reg &= (hw->mac.mta_reg_count - 1);
-               hash_bit = hash_value & 0x1F;
-               mta = E1000_READ_REG_ARRAY(hw, E1000_MTA, hash_reg);
-               mta |= (1 << hash_bit);
-               temp = E1000_READ_REG_ARRAY(hw, E1000_MTA, hash_reg - 1);
-
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, hash_reg, mta);
-               E1000_WRITE_FLUSH(hw);
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, hash_reg - 1, temp);
-               E1000_WRITE_FLUSH(hw);
-       } else {
-               e1000_mta_set_generic(hw, hash_value);
-       }
-}
-
-/**
- *  e1000_led_on_82543 - Turn on SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  Turns the SW defined LED on.
- **/
-static s32 e1000_led_on_82543(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       DEBUGFUNC("e1000_led_on_82543");
-
-       if (hw->mac.type == e1000_82544 &&
-           hw->phy.media_type == e1000_media_type_copper) {
-               /* Clear SW-definable Pin 0 to turn on the LED */
-               ctrl &= ~E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-       } else {
-               /* Fiber 82544 and all 82543 use this method */
-               ctrl |= E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-       }
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-       return E1000_SUCCESS;
-#endif
-        return 0;
-}
-
-/**
- *  e1000_led_off_82543 - Turn off SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  Turns the SW defined LED off.
- **/
-static s32 e1000_led_off_82543(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       DEBUGFUNC("e1000_led_off_82543");
-
-       if (hw->mac.type == e1000_82544 &&
-           hw->phy.media_type == e1000_media_type_copper) {
-               /* Set SW-definable Pin 0 to turn off the LED */
-               ctrl |= E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-       } else {
-               ctrl &= ~E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-       }
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-       return E1000_SUCCESS;
-#endif
-        return 0;
-}
-
-/**
- *  e1000_clear_hw_cntrs_82543 - Clear device specific hardware counters
- *  @hw: pointer to the HW structure
- *
- *  Clears the hardware counters by reading the counter registers.
- **/
-static void e1000_clear_hw_cntrs_82543(struct e1000_hw *hw)
-{
-       DEBUGFUNC("e1000_clear_hw_cntrs_82543");
-
-       e1000_clear_hw_cntrs_base_generic(hw);
-
-#if 0
-       E1000_READ_REG(hw, E1000_PRC64);
-       E1000_READ_REG(hw, E1000_PRC127);
-       E1000_READ_REG(hw, E1000_PRC255);
-       E1000_READ_REG(hw, E1000_PRC511);
-       E1000_READ_REG(hw, E1000_PRC1023);
-       E1000_READ_REG(hw, E1000_PRC1522);
-       E1000_READ_REG(hw, E1000_PTC64);
-       E1000_READ_REG(hw, E1000_PTC127);
-       E1000_READ_REG(hw, E1000_PTC255);
-       E1000_READ_REG(hw, E1000_PTC511);
-       E1000_READ_REG(hw, E1000_PTC1023);
-       E1000_READ_REG(hw, E1000_PTC1522);
-
-       E1000_READ_REG(hw, E1000_ALGNERRC);
-       E1000_READ_REG(hw, E1000_RXERRC);
-       E1000_READ_REG(hw, E1000_TNCRS);
-       E1000_READ_REG(hw, E1000_CEXTERR);
-       E1000_READ_REG(hw, E1000_TSCTC);
-       E1000_READ_REG(hw, E1000_TSCTFC);
-#endif
-}
-
-static struct pci_device_id e1000_82543_nics[] = {
-     PCI_ROM(0x8086, 0x1001, "E1000_DEV_ID_82543GC_FIBER", "E1000_DEV_ID_82543GC_FIBER", e1000_82543),
-     PCI_ROM(0x8086, 0x1004, "E1000_DEV_ID_82543GC_COPPER", "E1000_DEV_ID_82543GC_COPPER", e1000_82543),
-     PCI_ROM(0x8086, 0x1008, "E1000_DEV_ID_82544EI_COPPER", "E1000_DEV_ID_82544EI_COPPER", e1000_82544),
-     PCI_ROM(0x8086, 0x1009, "E1000_DEV_ID_82544EI_FIBER", "E1000_DEV_ID_82544EI_FIBER", e1000_82544),
-     PCI_ROM(0x8086, 0x100C, "E1000_DEV_ID_82544GC_COPPER", "E1000_DEV_ID_82544GC_COPPER", e1000_82544),
-     PCI_ROM(0x8086, 0x100D, "E1000_DEV_ID_82544GC_LOM", "E1000_DEV_ID_82544GC_LOM", e1000_82544),
-};
-
-struct pci_driver e1000_82543_driver __pci_driver = {
-       .ids = e1000_82543_nics,
-       .id_count = (sizeof (e1000_82543_nics) / sizeof (e1000_82543_nics[0])),
-       .probe = e1000_probe,
-       .remove = e1000_remove,
-};
diff --git a/src/drivers/net/e1000/e1000_82543.h b/src/drivers/net/e1000/e1000_82543.h
deleted file mode 100644 (file)
index 30073e8..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000_82543_H_
-#define _E1000_82543_H_
-
-#define PHY_PREAMBLE      0xFFFFFFFF
-#define PHY_PREAMBLE_SIZE 32
-#define PHY_SOF           0x1
-#define PHY_OP_READ       0x2
-#define PHY_OP_WRITE      0x1
-#define PHY_TURNAROUND    0x2
-
-#define TBI_COMPAT_ENABLED 0x1 /* Global "knob" for the workaround */
-/* If TBI_COMPAT_ENABLED, then this is the current state (on/off) */
-#define TBI_SBP_ENABLED    0x2
-
-#endif
diff --git a/src/drivers/net/e1000/e1000_api.c b/src/drivers/net/e1000/e1000_api.c
deleted file mode 100644 (file)
index 72aac4c..0000000
+++ /dev/null
@@ -1,1108 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include "e1000_api.h"
-
-/**
- *  e1000_init_mac_params - Initialize MAC function pointers
- *  @hw: pointer to the HW structure
- *
- *  This function initializes the function pointers for the MAC
- *  set of functions.  Called by drivers or by e1000_setup_init_funcs.
- **/
-s32 e1000_init_mac_params(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->mac.ops.init_params) {
-               ret_val = hw->mac.ops.init_params(hw);
-               if (ret_val) {
-                       DEBUGOUT("MAC Initialization Error\n");
-                       goto out;
-               }
-       } else {
-               DEBUGOUT("mac.init_mac_params was NULL\n");
-               ret_val = -E1000_ERR_CONFIG;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_init_nvm_params - Initialize NVM function pointers
- *  @hw: pointer to the HW structure
- *
- *  This function initializes the function pointers for the NVM
- *  set of functions.  Called by drivers or by e1000_setup_init_funcs.
- **/
-s32 e1000_init_nvm_params(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->nvm.ops.init_params) {
-               ret_val = hw->nvm.ops.init_params(hw);
-               if (ret_val) {
-                       DEBUGOUT("NVM Initialization Error\n");
-                       goto out;
-               }
-       } else {
-               DEBUGOUT("nvm.init_nvm_params was NULL\n");
-               ret_val = -E1000_ERR_CONFIG;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_init_phy_params - Initialize PHY function pointers
- *  @hw: pointer to the HW structure
- *
- *  This function initializes the function pointers for the PHY
- *  set of functions.  Called by drivers or by e1000_setup_init_funcs.
- **/
-s32 e1000_init_phy_params(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->phy.ops.init_params) {
-               ret_val = hw->phy.ops.init_params(hw);
-               if (ret_val) {
-                       DEBUGOUT("PHY Initialization Error\n");
-                       goto out;
-               }
-       } else {
-               DEBUGOUT("phy.init_phy_params was NULL\n");
-               ret_val =  -E1000_ERR_CONFIG;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_set_mac_type - Sets MAC type
- *  @hw: pointer to the HW structure
- *
- *  This function sets the mac type of the adapter based on the
- *  device ID stored in the hw structure.
- *  MUST BE FIRST FUNCTION CALLED (explicitly or through
- *  e1000_setup_init_funcs()).
- **/
-s32 e1000_set_mac_type(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_set_mac_type");
-
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82542:
-               mac->type = e1000_82542;
-               break;
-       case E1000_DEV_ID_82543GC_FIBER:
-       case E1000_DEV_ID_82543GC_COPPER:
-               mac->type = e1000_82543;
-               break;
-       case E1000_DEV_ID_82544EI_COPPER:
-       case E1000_DEV_ID_82544EI_FIBER:
-       case E1000_DEV_ID_82544GC_COPPER:
-       case E1000_DEV_ID_82544GC_LOM:
-               mac->type = e1000_82544;
-               break;
-       case E1000_DEV_ID_82540EM:
-       case E1000_DEV_ID_82540EM_LOM:
-       case E1000_DEV_ID_82540EP:
-       case E1000_DEV_ID_82540EP_LOM:
-       case E1000_DEV_ID_82540EP_LP:
-               mac->type = e1000_82540;
-               break;
-       case E1000_DEV_ID_82545EM_COPPER:
-       case E1000_DEV_ID_82545EM_FIBER:
-               mac->type = e1000_82545;
-               break;
-       case E1000_DEV_ID_82545GM_COPPER:
-       case E1000_DEV_ID_82545GM_FIBER:
-       case E1000_DEV_ID_82545GM_SERDES:
-               mac->type = e1000_82545_rev_3;
-               break;
-       case E1000_DEV_ID_82546EB_COPPER:
-       case E1000_DEV_ID_82546EB_FIBER:
-       case E1000_DEV_ID_82546EB_QUAD_COPPER:
-               mac->type = e1000_82546;
-               break;
-       case E1000_DEV_ID_82546GB_COPPER:
-       case E1000_DEV_ID_82546GB_FIBER:
-       case E1000_DEV_ID_82546GB_SERDES:
-       case E1000_DEV_ID_82546GB_PCIE:
-       case E1000_DEV_ID_82546GB_QUAD_COPPER:
-       case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
-               mac->type = e1000_82546_rev_3;
-               break;
-       case E1000_DEV_ID_82541EI:
-       case E1000_DEV_ID_82541EI_MOBILE:
-       case E1000_DEV_ID_82541ER_LOM:
-               mac->type = e1000_82541;
-               break;
-       case E1000_DEV_ID_82541ER:
-       case E1000_DEV_ID_82541GI:
-       case E1000_DEV_ID_82541GI_LF:
-       case E1000_DEV_ID_82541GI_MOBILE:
-               mac->type = e1000_82541_rev_2;
-               break;
-       case E1000_DEV_ID_82547EI:
-       case E1000_DEV_ID_82547EI_MOBILE:
-               mac->type = e1000_82547;
-               break;
-       case E1000_DEV_ID_82547GI:
-               mac->type = e1000_82547_rev_2;
-               break;
-       default:
-               /* Should never have loaded on this device */
-               ret_val = -E1000_ERR_MAC_INIT;
-               break;
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_setup_init_funcs - Initializes function pointers
- *  @hw: pointer to the HW structure
- *  @init_device: true will initialize the rest of the function pointers
- *                 getting the device ready for use.  false will only set
- *                 MAC type and the function pointers for the other init
- *                 functions.  Passing false will not generate any hardware
- *                 reads or writes.
- *
- *  This function must be called by a driver in order to use the rest
- *  of the 'shared' code files. Called by drivers only.
- **/
-s32 e1000_setup_init_funcs(struct e1000_hw *hw, bool init_device)
-{
-       s32 ret_val;
-
-       /* Can't do much good without knowing the MAC type. */
-       ret_val = e1000_set_mac_type(hw);
-       if (ret_val) {
-               DEBUGOUT("ERROR: MAC type could not be set properly.\n");
-               goto out;
-       }
-
-       if (!hw->hw_addr) {
-               DEBUGOUT("ERROR: Registers not mapped\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       /*
-        * Init function pointers to generic implementations. We do this first
-        * allowing a driver module to override it afterward.
-        */
-       e1000_init_mac_ops_generic(hw);
-       e1000_init_phy_ops_generic(hw);
-       e1000_init_nvm_ops_generic(hw);
-
-       /*
-        * Set up the init function pointers. These are functions within the
-        * adapter family file that sets up function pointers for the rest of
-        * the functions in that family.
-        */
-       switch (hw->mac.type) {
-       case e1000_82542:
-               e1000_init_function_pointers_82542(hw);
-               break;
-       case e1000_82543:
-       case e1000_82544:
-               e1000_init_function_pointers_82543(hw);
-               break;
-       case e1000_82540:
-       case e1000_82545:
-       case e1000_82545_rev_3:
-       case e1000_82546:
-       case e1000_82546_rev_3:
-               e1000_init_function_pointers_82540(hw);
-               break;
-       case e1000_82541:
-       case e1000_82541_rev_2:
-       case e1000_82547:
-       case e1000_82547_rev_2:
-               e1000_init_function_pointers_82541(hw);
-               break;
-       default:
-               DEBUGOUT("Hardware not supported\n");
-               ret_val = -E1000_ERR_CONFIG;
-               break;
-       }
-
-       /*
-        * Initialize the rest of the function pointers. These require some
-        * register reads/writes in some cases.
-        */
-       if (!(ret_val) && init_device) {
-               ret_val = e1000_init_mac_params(hw);
-               if (ret_val)
-                       goto out;
-
-               ret_val = e1000_init_nvm_params(hw);
-               if (ret_val)
-                       goto out;
-
-               ret_val = e1000_init_phy_params(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_get_bus_info - Obtain bus information for adapter
- *  @hw: pointer to the HW structure
- *
- *  This will obtain information about the HW bus for which the
- *  adapter is attached and stores it in the hw structure. This is a
- *  function pointer entry point called by drivers.
- **/
-s32 e1000_get_bus_info(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.get_bus_info)
-               return hw->mac.ops.get_bus_info(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_clear_vfta - Clear VLAN filter table
- *  @hw: pointer to the HW structure
- *
- *  This clears the VLAN filter table on the adapter. This is a function
- *  pointer entry point called by drivers.
- **/
-void e1000_clear_vfta(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.clear_vfta)
-               hw->mac.ops.clear_vfta(hw);
-}
-
-/**
- *  e1000_write_vfta - Write value to VLAN filter table
- *  @hw: pointer to the HW structure
- *  @offset: the 32-bit offset in which to write the value to.
- *  @value: the 32-bit value to write at location offset.
- *
- *  This writes a 32-bit value to a 32-bit offset in the VLAN filter
- *  table. This is a function pointer entry point called by drivers.
- **/
-void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value)
-{
-       if (hw->mac.ops.write_vfta)
-               hw->mac.ops.write_vfta(hw, offset, value);
-}
-
-/**
- *  e1000_update_mc_addr_list - Update Multicast addresses
- *  @hw: pointer to the HW structure
- *  @mc_addr_list: array of multicast addresses to program
- *  @mc_addr_count: number of multicast addresses to program
- *
- *  Updates the Multicast Table Array.
- *  The caller must have a packed mc_addr_list of multicast addresses.
- **/
-void e1000_update_mc_addr_list(struct e1000_hw *hw, u8 *mc_addr_list,
-                               u32 mc_addr_count)
-{
-       if (hw->mac.ops.update_mc_addr_list)
-               hw->mac.ops.update_mc_addr_list(hw, mc_addr_list,
-                                               mc_addr_count);
-}
-
-/**
- *  e1000_force_mac_fc - Force MAC flow control
- *  @hw: pointer to the HW structure
- *
- *  Force the MAC's flow control settings. Currently no func pointer exists
- *  and all implementations are handled in the generic version of this
- *  function.
- **/
-s32 e1000_force_mac_fc(struct e1000_hw *hw)
-{
-       return e1000_force_mac_fc_generic(hw);
-}
-
-/**
- *  e1000_check_for_link - Check/Store link connection
- *  @hw: pointer to the HW structure
- *
- *  This checks the link condition of the adapter and stores the
- *  results in the hw->mac structure. This is a function pointer entry
- *  point called by drivers.
- **/
-s32 e1000_check_for_link(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.check_for_link)
-               return hw->mac.ops.check_for_link(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-#if 0
-/**
- *  e1000_check_mng_mode - Check management mode
- *  @hw: pointer to the HW structure
- *
- *  This checks if the adapter has manageability enabled.
- *  This is a function pointer entry point called by drivers.
- **/
-bool e1000_check_mng_mode(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.check_mng_mode)
-               return hw->mac.ops.check_mng_mode(hw);
-
-       return false;
-}
-
-/**
- *  e1000_mng_write_dhcp_info - Writes DHCP info to host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface
- *  @length: size of the buffer
- *
- *  Writes the DHCP information to the host interface.
- **/
-s32 e1000_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length)
-{
-       return e1000_mng_write_dhcp_info_generic(hw, buffer, length);
-}
-#endif
-
-/**
- *  e1000_reset_hw - Reset hardware
- *  @hw: pointer to the HW structure
- *
- *  This resets the hardware into a known state. This is a function pointer
- *  entry point called by drivers.
- **/
-s32 e1000_reset_hw(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.reset_hw)
-               return hw->mac.ops.reset_hw(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  e1000_init_hw - Initialize hardware
- *  @hw: pointer to the HW structure
- *
- *  This inits the hardware readying it for operation. This is a function
- *  pointer entry point called by drivers.
- **/
-s32 e1000_init_hw(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.init_hw)
-               return hw->mac.ops.init_hw(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  e1000_setup_link - Configures link and flow control
- *  @hw: pointer to the HW structure
- *
- *  This configures link and flow control settings for the adapter. This
- *  is a function pointer entry point called by drivers. While modules can
- *  also call this, they probably call their own version of this function.
- **/
-s32 e1000_setup_link(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.setup_link)
-               return hw->mac.ops.setup_link(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  e1000_get_speed_and_duplex - Returns current speed and duplex
- *  @hw: pointer to the HW structure
- *  @speed: pointer to a 16-bit value to store the speed
- *  @duplex: pointer to a 16-bit value to store the duplex.
- *
- *  This returns the speed and duplex of the adapter in the two 'out'
- *  variables passed in. This is a function pointer entry point called
- *  by drivers.
- **/
-s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex)
-{
-       if (hw->mac.ops.get_link_up_info)
-               return hw->mac.ops.get_link_up_info(hw, speed, duplex);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  e1000_setup_led - Configures SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This prepares the SW controllable LED for use and saves the current state
- *  of the LED so it can be later restored. This is a function pointer entry
- *  point called by drivers.
- **/
-s32 e1000_setup_led(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.setup_led)
-               return hw->mac.ops.setup_led(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_cleanup_led - Restores SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This restores the SW controllable LED to the value saved off by
- *  e1000_setup_led. This is a function pointer entry point called by drivers.
- **/
-s32 e1000_cleanup_led(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.cleanup_led)
-               return hw->mac.ops.cleanup_led(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_blink_led - Blink SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This starts the adapter LED blinking. Request the LED to be setup first
- *  and cleaned up after. This is a function pointer entry point called by
- *  drivers.
- **/
-s32 e1000_blink_led(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.blink_led)
-               return hw->mac.ops.blink_led(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_id_led_init - store LED configurations in SW
- *  @hw: pointer to the HW structure
- *
- *  Initializes the LED config in SW. This is a function pointer entry point
- *  called by drivers.
- **/
-s32 e1000_id_led_init(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.id_led_init)
-               return hw->mac.ops.id_led_init(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_led_on - Turn on SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  Turns the SW defined LED on. This is a function pointer entry point
- *  called by drivers.
- **/
-s32 e1000_led_on(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.led_on)
-               return hw->mac.ops.led_on(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_led_off - Turn off SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  Turns the SW defined LED off. This is a function pointer entry point
- *  called by drivers.
- **/
-s32 e1000_led_off(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.led_off)
-               return hw->mac.ops.led_off(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_reset_adaptive - Reset adaptive IFS
- *  @hw: pointer to the HW structure
- *
- *  Resets the adaptive IFS. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-void e1000_reset_adaptive(struct e1000_hw *hw)
-{
-       e1000_reset_adaptive_generic(hw);
-}
-
-/**
- *  e1000_update_adaptive - Update adaptive IFS
- *  @hw: pointer to the HW structure
- *
- *  Updates adapter IFS. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-void e1000_update_adaptive(struct e1000_hw *hw)
-{
-       e1000_update_adaptive_generic(hw);
-}
-
-/**
- *  e1000_disable_pcie_master - Disable PCI-Express master access
- *  @hw: pointer to the HW structure
- *
- *  Disables PCI-Express master access and verifies there are no pending
- *  requests. Currently no func pointer exists and all implementations are
- *  handled in the generic version of this function.
- **/
-s32 e1000_disable_pcie_master(struct e1000_hw *hw)
-{
-       return e1000_disable_pcie_master_generic(hw);
-}
-
-/**
- *  e1000_config_collision_dist - Configure collision distance
- *  @hw: pointer to the HW structure
- *
- *  Configures the collision distance to the default value and is used
- *  during link setup.
- **/
-void e1000_config_collision_dist(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.config_collision_dist)
-               hw->mac.ops.config_collision_dist(hw);
-}
-
-/**
- *  e1000_rar_set - Sets a receive address register
- *  @hw: pointer to the HW structure
- *  @addr: address to set the RAR to
- *  @index: the RAR to set
- *
- *  Sets a Receive Address Register (RAR) to the specified address.
- **/
-void e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
-{
-       if (hw->mac.ops.rar_set)
-               hw->mac.ops.rar_set(hw, addr, index);
-}
-
-/**
- *  e1000_validate_mdi_setting - Ensures valid MDI/MDIX SW state
- *  @hw: pointer to the HW structure
- *
- *  Ensures that the MDI/MDIX SW state is valid.
- **/
-s32 e1000_validate_mdi_setting(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.validate_mdi_setting)
-               return hw->mac.ops.validate_mdi_setting(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_mta_set - Sets multicast table bit
- *  @hw: pointer to the HW structure
- *  @hash_value: Multicast hash value.
- *
- *  This sets the bit in the multicast table corresponding to the
- *  hash value.  This is a function pointer entry point called by drivers.
- **/
-void e1000_mta_set(struct e1000_hw *hw, u32 hash_value)
-{
-       if (hw->mac.ops.mta_set)
-               hw->mac.ops.mta_set(hw, hash_value);
-}
-
-/**
- *  e1000_hash_mc_addr - Determines address location in multicast table
- *  @hw: pointer to the HW structure
- *  @mc_addr: Multicast address to hash.
- *
- *  This hashes an address to determine its location in the multicast
- *  table. Currently no func pointer exists and all implementations
- *  are handled in the generic version of this function.
- **/
-u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
-{
-       return e1000_hash_mc_addr_generic(hw, mc_addr);
-}
-
-#if 0
-/**
- *  e1000_enable_tx_pkt_filtering - Enable packet filtering on TX
- *  @hw: pointer to the HW structure
- *
- *  Enables packet filtering on transmit packets if manageability is enabled
- *  and host interface is enabled.
- *  Currently no func pointer exists and all implementations are handled in the
- *  generic version of this function.
- **/
-bool e1000_enable_tx_pkt_filtering(struct e1000_hw *hw)
-{
-       return e1000_enable_tx_pkt_filtering_generic(hw);
-}
-
-/**
- *  e1000_mng_host_if_write - Writes to the manageability host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface buffer
- *  @length: size of the buffer
- *  @offset: location in the buffer to write to
- *  @sum: sum of the data (not checksum)
- *
- *  This function writes the buffer content at the offset given on the host if.
- *  It also does alignment considerations to do the writes in most efficient
- *  way.  Also fills up the sum of the buffer in *buffer parameter.
- **/
-s32 e1000_mng_host_if_write(struct e1000_hw * hw, u8 *buffer, u16 length,
-                            u16 offset, u8 *sum)
-{
-       if (hw->mac.ops.mng_host_if_write)
-               return hw->mac.ops.mng_host_if_write(hw, buffer, length,
-                                                    offset, sum);
-
-       return E1000_NOT_IMPLEMENTED;
-}
-
-/**
- *  e1000_mng_write_cmd_header - Writes manageability command header
- *  @hw: pointer to the HW structure
- *  @hdr: pointer to the host interface command header
- *
- *  Writes the command header after does the checksum calculation.
- **/
-s32 e1000_mng_write_cmd_header(struct e1000_hw *hw,
-                               struct e1000_host_mng_command_header *hdr)
-{
-       if (hw->mac.ops.mng_write_cmd_header)
-               return hw->mac.ops.mng_write_cmd_header(hw, hdr);
-
-       return E1000_NOT_IMPLEMENTED;
-}
-
-/**
- *  e1000_mng_enable_host_if - Checks host interface is enabled
- *  @hw: pointer to the HW structure
- *
- *  Returns E1000_success upon success, else E1000_ERR_HOST_INTERFACE_COMMAND
- *
- *  This function checks whether the HOST IF is enabled for command operation
- *  and also checks whether the previous command is completed.  It busy waits
- *  in case of previous command is not completed.
- **/
-s32 e1000_mng_enable_host_if(struct e1000_hw * hw)
-{
-       if (hw->mac.ops.mng_enable_host_if)
-               return hw->mac.ops.mng_enable_host_if(hw);
-
-       return E1000_NOT_IMPLEMENTED;
-}
-#endif
-
-/**
- *  e1000_wait_autoneg - Waits for autonegotiation completion
- *  @hw: pointer to the HW structure
- *
- *  Waits for autoneg to complete. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-s32 e1000_wait_autoneg(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.wait_autoneg)
-               return hw->mac.ops.wait_autoneg(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_check_reset_block - Verifies PHY can be reset
- *  @hw: pointer to the HW structure
- *
- *  Checks if the PHY is in a state that can be reset or if manageability
- *  has it tied up. This is a function pointer entry point called by drivers.
- **/
-s32 e1000_check_reset_block(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.check_reset_block)
-               return hw->phy.ops.check_reset_block(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_read_phy_reg - Reads PHY register
- *  @hw: pointer to the HW structure
- *  @offset: the register to read
- *  @data: the buffer to store the 16-bit read.
- *
- *  Reads the PHY register and returns the value in data.
- *  This is a function pointer entry point called by drivers.
- **/
-s32 e1000_read_phy_reg(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       if (hw->phy.ops.read_reg)
-               return hw->phy.ops.read_reg(hw, offset, data);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_write_phy_reg - Writes PHY register
- *  @hw: pointer to the HW structure
- *  @offset: the register to write
- *  @data: the value to write.
- *
- *  Writes the PHY register at offset with the value in data.
- *  This is a function pointer entry point called by drivers.
- **/
-s32 e1000_write_phy_reg(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       if (hw->phy.ops.write_reg)
-               return hw->phy.ops.write_reg(hw, offset, data);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_release_phy - Generic release PHY
- *  @hw: pointer to the HW structure
- *
- *  Return if silicon family does not require a semaphore when accessing the
- *  PHY.
- **/
-void e1000_release_phy(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.release)
-               hw->phy.ops.release(hw);
-}
-
-/**
- *  e1000_acquire_phy - Generic acquire PHY
- *  @hw: pointer to the HW structure
- *
- *  Return success if silicon family does not require a semaphore when
- *  accessing the PHY.
- **/
-s32 e1000_acquire_phy(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.acquire)
-               return hw->phy.ops.acquire(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_read_kmrn_reg - Reads register using Kumeran interface
- *  @hw: pointer to the HW structure
- *  @offset: the register to read
- *  @data: the location to store the 16-bit value read.
- *
- *  Reads a register out of the Kumeran interface. Currently no func pointer
- *  exists and all implementations are handled in the generic version of
- *  this function.
- **/
-s32 e1000_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return e1000_read_kmrn_reg_generic(hw, offset, data);
-}
-
-/**
- *  e1000_write_kmrn_reg - Writes register using Kumeran interface
- *  @hw: pointer to the HW structure
- *  @offset: the register to write
- *  @data: the value to write.
- *
- *  Writes a register to the Kumeran interface. Currently no func pointer
- *  exists and all implementations are handled in the generic version of
- *  this function.
- **/
-s32 e1000_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return e1000_write_kmrn_reg_generic(hw, offset, data);
-}
-
-#if 0
-/**
- *  e1000_get_cable_length - Retrieves cable length estimation
- *  @hw: pointer to the HW structure
- *
- *  This function estimates the cable length and stores them in
- *  hw->phy.min_length and hw->phy.max_length. This is a function pointer
- *  entry point called by drivers.
- **/
-s32 e1000_get_cable_length(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.get_cable_length)
-               return hw->phy.ops.get_cable_length(hw);
-
-       return E1000_SUCCESS;
-}
-#endif
-
-/**
- *  e1000_get_phy_info - Retrieves PHY information from registers
- *  @hw: pointer to the HW structure
- *
- *  This function gets some information from various PHY registers and
- *  populates hw->phy values with it. This is a function pointer entry
- *  point called by drivers.
- **/
-s32 e1000_get_phy_info(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.get_info)
-               return hw->phy.ops.get_info(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_phy_hw_reset - Hard PHY reset
- *  @hw: pointer to the HW structure
- *
- *  Performs a hard PHY reset. This is a function pointer entry point called
- *  by drivers.
- **/
-s32 e1000_phy_hw_reset(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.reset)
-               return hw->phy.ops.reset(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_phy_commit - Soft PHY reset
- *  @hw: pointer to the HW structure
- *
- *  Performs a soft PHY reset on those that apply. This is a function pointer
- *  entry point called by drivers.
- **/
-s32 e1000_phy_commit(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.commit)
-               return hw->phy.ops.commit(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_set_d0_lplu_state - Sets low power link up state for D0
- *  @hw: pointer to the HW structure
- *  @active: boolean used to enable/disable lplu
- *
- *  Success returns 0, Failure returns 1
- *
- *  The low power link up (lplu) state is set to the power management level D0
- *  and SmartSpeed is disabled when active is true, else clear lplu for D0
- *  and enable Smartspeed.  LPLU and Smartspeed are mutually exclusive.  LPLU
- *  is used during Dx states where the power conservation is most important.
- *  During driver activity, SmartSpeed should be enabled so performance is
- *  maintained.  This is a function pointer entry point called by drivers.
- **/
-s32 e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active)
-{
-       if (hw->phy.ops.set_d0_lplu_state)
-               return hw->phy.ops.set_d0_lplu_state(hw, active);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_set_d3_lplu_state - Sets low power link up state for D3
- *  @hw: pointer to the HW structure
- *  @active: boolean used to enable/disable lplu
- *
- *  Success returns 0, Failure returns 1
- *
- *  The low power link up (lplu) state is set to the power management level D3
- *  and SmartSpeed is disabled when active is true, else clear lplu for D3
- *  and enable Smartspeed.  LPLU and Smartspeed are mutually exclusive.  LPLU
- *  is used during Dx states where the power conservation is most important.
- *  During driver activity, SmartSpeed should be enabled so performance is
- *  maintained.  This is a function pointer entry point called by drivers.
- **/
-s32 e1000_set_d3_lplu_state(struct e1000_hw *hw, bool active)
-{
-       if (hw->phy.ops.set_d3_lplu_state)
-               return hw->phy.ops.set_d3_lplu_state(hw, active);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_read_mac_addr - Reads MAC address
- *  @hw: pointer to the HW structure
- *
- *  Reads the MAC address out of the adapter and stores it in the HW structure.
- *  Currently no func pointer exists and all implementations are handled in the
- *  generic version of this function.
- **/
-s32 e1000_read_mac_addr(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.read_mac_addr)
-               return hw->mac.ops.read_mac_addr(hw);
-
-       return e1000_read_mac_addr_generic(hw);
-}
-
-/**
- *  e1000_read_pba_num - Read device part number
- *  @hw: pointer to the HW structure
- *  @pba_num: pointer to device part number
- *
- *  Reads the product board assembly (PBA) number from the EEPROM and stores
- *  the value in pba_num.
- *  Currently no func pointer exists and all implementations are handled in the
- *  generic version of this function.
- **/
-s32 e1000_read_pba_num(struct e1000_hw *hw, u32 *pba_num)
-{
-       return e1000_read_pba_num_generic(hw, pba_num);
-}
-
-/**
- *  e1000_validate_nvm_checksum - Verifies NVM (EEPROM) checksum
- *  @hw: pointer to the HW structure
- *
- *  Validates the NVM checksum is correct. This is a function pointer entry
- *  point called by drivers.
- **/
-s32 e1000_validate_nvm_checksum(struct e1000_hw *hw)
-{
-       if (hw->nvm.ops.validate)
-               return hw->nvm.ops.validate(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  e1000_update_nvm_checksum - Updates NVM (EEPROM) checksum
- *  @hw: pointer to the HW structure
- *
- *  Updates the NVM checksum. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-s32 e1000_update_nvm_checksum(struct e1000_hw *hw)
-{
-       if (hw->nvm.ops.update)
-               return hw->nvm.ops.update(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  e1000_reload_nvm - Reloads EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Reloads the EEPROM by setting the "Reinitialize from EEPROM" bit in the
- *  extended control register.
- **/
-void e1000_reload_nvm(struct e1000_hw *hw)
-{
-       if (hw->nvm.ops.reload)
-               hw->nvm.ops.reload(hw);
-}
-
-/**
- *  e1000_read_nvm - Reads NVM (EEPROM)
- *  @hw: pointer to the HW structure
- *  @offset: the word offset to read
- *  @words: number of 16-bit words to read
- *  @data: pointer to the properly sized buffer for the data.
- *
- *  Reads 16-bit chunks of data from the NVM (EEPROM). This is a function
- *  pointer entry point called by drivers.
- **/
-s32 e1000_read_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       if (hw->nvm.ops.read)
-               return hw->nvm.ops.read(hw, offset, words, data);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  e1000_write_nvm - Writes to NVM (EEPROM)
- *  @hw: pointer to the HW structure
- *  @offset: the word offset to read
- *  @words: number of 16-bit words to write
- *  @data: pointer to the properly sized buffer for the data.
- *
- *  Writes 16-bit chunks of data to the NVM (EEPROM). This is a function
- *  pointer entry point called by drivers.
- **/
-s32 e1000_write_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       if (hw->nvm.ops.write)
-               return hw->nvm.ops.write(hw, offset, words, data);
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000_power_up_phy - Restores link in case of PHY power down
- * @hw: pointer to the HW structure
- *
- * The phy may be powered down to save power, to turn off link when the
- * driver is unloaded, or wake on lan is not enabled (among others).
- **/
-void e1000_power_up_phy(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.power_up)
-               hw->phy.ops.power_up(hw);
-
-       e1000_setup_link(hw);
-}
-
-/**
- * e1000_power_down_phy - Power down PHY
- * @hw: pointer to the HW structure
- *
- * The phy may be powered down to save power, to turn off link when the
- * driver is unloaded, or wake on lan is not enabled (among others).
- **/
-void e1000_power_down_phy(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.power_down)
-               hw->phy.ops.power_down(hw);
-}
diff --git a/src/drivers/net/e1000/e1000_api.h b/src/drivers/net/e1000/e1000_api.h
deleted file mode 100644 (file)
index fc1e533..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000_API_H_
-#define _E1000_API_H_
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <ipxe/io.h>
-#include <errno.h>
-#include <byteswap.h>
-#include <ipxe/pci.h>
-#include <ipxe/malloc.h>
-#include <ipxe/if_ether.h>
-#include <ipxe/ethernet.h>
-#include <ipxe/iobuf.h>
-#include <ipxe/netdevice.h>
-
-#include "e1000_hw.h"
-
-extern void    e1000_init_function_pointers_82542(struct e1000_hw *hw) __attribute__((weak));
-extern void    e1000_init_function_pointers_82543(struct e1000_hw *hw) __attribute__((weak));
-extern void    e1000_init_function_pointers_82540(struct e1000_hw *hw) __attribute__((weak));
-extern void    e1000_init_function_pointers_82541(struct e1000_hw *hw) __attribute__((weak));
-
-s32  e1000_set_mac_type(struct e1000_hw *hw);
-s32  e1000_setup_init_funcs(struct e1000_hw *hw, bool init_device);
-s32  e1000_init_mac_params(struct e1000_hw *hw);
-s32  e1000_init_nvm_params(struct e1000_hw *hw);
-s32  e1000_init_phy_params(struct e1000_hw *hw);
-s32  e1000_get_bus_info(struct e1000_hw *hw);
-void e1000_clear_vfta(struct e1000_hw *hw);
-void e1000_write_vfta(struct e1000_hw *hw, u32 offset, u32 value);
-s32  e1000_force_mac_fc(struct e1000_hw *hw);
-s32  e1000_check_for_link(struct e1000_hw *hw);
-s32  e1000_reset_hw(struct e1000_hw *hw);
-s32  e1000_init_hw(struct e1000_hw *hw);
-s32  e1000_setup_link(struct e1000_hw *hw);
-s32  e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed,
-                                u16 *duplex);
-s32  e1000_disable_pcie_master(struct e1000_hw *hw);
-void e1000_config_collision_dist(struct e1000_hw *hw);
-void e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
-void e1000_mta_set(struct e1000_hw *hw, u32 hash_value);
-u32  e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr);
-void e1000_update_mc_addr_list(struct e1000_hw *hw,
-                               u8 *mc_addr_list, u32 mc_addr_count);
-s32  e1000_setup_led(struct e1000_hw *hw);
-s32  e1000_cleanup_led(struct e1000_hw *hw);
-s32  e1000_check_reset_block(struct e1000_hw *hw);
-s32  e1000_blink_led(struct e1000_hw *hw);
-s32  e1000_led_on(struct e1000_hw *hw);
-s32  e1000_led_off(struct e1000_hw *hw);
-s32 e1000_id_led_init(struct e1000_hw *hw);
-void e1000_reset_adaptive(struct e1000_hw *hw);
-void e1000_update_adaptive(struct e1000_hw *hw);
-#if 0
-s32  e1000_get_cable_length(struct e1000_hw *hw);
-#endif
-s32  e1000_validate_mdi_setting(struct e1000_hw *hw);
-s32  e1000_read_phy_reg(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000_write_phy_reg(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000_get_phy_info(struct e1000_hw *hw);
-void e1000_release_phy(struct e1000_hw *hw);
-s32  e1000_acquire_phy(struct e1000_hw *hw);
-s32  e1000_phy_hw_reset(struct e1000_hw *hw);
-s32  e1000_phy_commit(struct e1000_hw *hw);
-void e1000_power_up_phy(struct e1000_hw *hw);
-void e1000_power_down_phy(struct e1000_hw *hw);
-s32  e1000_read_mac_addr(struct e1000_hw *hw);
-s32  e1000_read_pba_num(struct e1000_hw *hw, u32 *part_num);
-void e1000_reload_nvm(struct e1000_hw *hw);
-s32  e1000_update_nvm_checksum(struct e1000_hw *hw);
-s32  e1000_validate_nvm_checksum(struct e1000_hw *hw);
-s32  e1000_read_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
-s32  e1000_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000_write_nvm(struct e1000_hw *hw, u16 offset, u16 words,
-                     u16 *data);
-s32  e1000_wait_autoneg(struct e1000_hw *hw);
-s32  e1000_set_d3_lplu_state(struct e1000_hw *hw, bool active);
-s32  e1000_set_d0_lplu_state(struct e1000_hw *hw, bool active);
-bool e1000_check_mng_mode(struct e1000_hw *hw);
-bool e1000_enable_tx_pkt_filtering(struct e1000_hw *hw);
-s32  e1000_mng_enable_host_if(struct e1000_hw *hw);
-s32  e1000_mng_host_if_write(struct e1000_hw *hw,
-                             u8 *buffer, u16 length, u16 offset, u8 *sum);
-s32  e1000_mng_write_cmd_header(struct e1000_hw *hw,
-                                struct e1000_host_mng_command_header *hdr);
-s32  e1000_mng_write_dhcp_info(struct e1000_hw * hw,
-                                    u8 *buffer, u16 length);
-u32  e1000_translate_register_82542(u32 reg) __attribute__((weak));
-
-extern int e1000_probe(struct pci_device *pdev);
-extern void e1000_remove(struct pci_device *pdev);
-
-#endif
diff --git a/src/drivers/net/e1000/e1000_defines.h b/src/drivers/net/e1000/e1000_defines.h
deleted file mode 100644 (file)
index c585f09..0000000
+++ /dev/null
@@ -1,1416 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000_DEFINES_H_
-#define _E1000_DEFINES_H_
-
-/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
-#define REQ_TX_DESCRIPTOR_MULTIPLE  8
-#define REQ_RX_DESCRIPTOR_MULTIPLE  8
-
-/* Definitions for power management and wakeup registers */
-/* Wake Up Control */
-#define E1000_WUC_APME       0x00000001 /* APM Enable */
-#define E1000_WUC_PME_EN     0x00000002 /* PME Enable */
-#define E1000_WUC_PME_STATUS 0x00000004 /* PME Status */
-#define E1000_WUC_APMPME     0x00000008 /* Assert PME on APM Wakeup */
-#define E1000_WUC_LSCWE      0x00000010 /* Link Status wake up enable */
-#define E1000_WUC_LSCWO      0x00000020 /* Link Status wake up override */
-#define E1000_WUC_SPM        0x80000000 /* Enable SPM */
-#define E1000_WUC_PHY_WAKE   0x00000100 /* if PHY supports wakeup */
-
-/* Wake Up Filter Control */
-#define E1000_WUFC_LNKC 0x00000001 /* Link Status Change Wakeup Enable */
-#define E1000_WUFC_MAG  0x00000002 /* Magic Packet Wakeup Enable */
-#define E1000_WUFC_EX   0x00000004 /* Directed Exact Wakeup Enable */
-#define E1000_WUFC_MC   0x00000008 /* Directed Multicast Wakeup Enable */
-#define E1000_WUFC_BC   0x00000010 /* Broadcast Wakeup Enable */
-#define E1000_WUFC_ARP  0x00000020 /* ARP Request Packet Wakeup Enable */
-#define E1000_WUFC_IPV4 0x00000040 /* Directed IPv4 Packet Wakeup Enable */
-#define E1000_WUFC_IPV6 0x00000080 /* Directed IPv6 Packet Wakeup Enable */
-#define E1000_WUFC_IGNORE_TCO   0x00008000 /* Ignore WakeOn TCO packets */
-#define E1000_WUFC_FLX0 0x00010000 /* Flexible Filter 0 Enable */
-#define E1000_WUFC_FLX1 0x00020000 /* Flexible Filter 1 Enable */
-#define E1000_WUFC_FLX2 0x00040000 /* Flexible Filter 2 Enable */
-#define E1000_WUFC_FLX3 0x00080000 /* Flexible Filter 3 Enable */
-#define E1000_WUFC_ALL_FILTERS  0x000F00FF /* Mask for all wakeup filters */
-#define E1000_WUFC_FLX_OFFSET   16 /* Offset to the Flexible Filters bits */
-#define E1000_WUFC_FLX_FILTERS  0x000F0000 /*Mask for the 4 flexible filters */
-
-/* Wake Up Status */
-#define E1000_WUS_LNKC         E1000_WUFC_LNKC
-#define E1000_WUS_MAG          E1000_WUFC_MAG
-#define E1000_WUS_EX           E1000_WUFC_EX
-#define E1000_WUS_MC           E1000_WUFC_MC
-#define E1000_WUS_BC           E1000_WUFC_BC
-#define E1000_WUS_ARP          E1000_WUFC_ARP
-#define E1000_WUS_IPV4         E1000_WUFC_IPV4
-#define E1000_WUS_IPV6         E1000_WUFC_IPV6
-#define E1000_WUS_FLX0         E1000_WUFC_FLX0
-#define E1000_WUS_FLX1         E1000_WUFC_FLX1
-#define E1000_WUS_FLX2         E1000_WUFC_FLX2
-#define E1000_WUS_FLX3         E1000_WUFC_FLX3
-#define E1000_WUS_FLX_FILTERS  E1000_WUFC_FLX_FILTERS
-
-/* Wake Up Packet Length */
-#define E1000_WUPL_LENGTH_MASK 0x0FFF   /* Only the lower 12 bits are valid */
-
-/* Four Flexible Filters are supported */
-#define E1000_FLEXIBLE_FILTER_COUNT_MAX 4
-
-/* Each Flexible Filter is at most 128 (0x80) bytes in length */
-#define E1000_FLEXIBLE_FILTER_SIZE_MAX  128
-
-#define E1000_FFLT_SIZE E1000_FLEXIBLE_FILTER_COUNT_MAX
-#define E1000_FFMT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
-#define E1000_FFVT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
-
-/* Extended Device Control */
-#define E1000_CTRL_EXT_GPI0_EN   0x00000001 /* Maps SDP4 to GPI0 */
-#define E1000_CTRL_EXT_GPI1_EN   0x00000002 /* Maps SDP5 to GPI1 */
-#define E1000_CTRL_EXT_PHYINT_EN E1000_CTRL_EXT_GPI1_EN
-#define E1000_CTRL_EXT_GPI2_EN   0x00000004 /* Maps SDP6 to GPI2 */
-#define E1000_CTRL_EXT_GPI3_EN   0x00000008 /* Maps SDP7 to GPI3 */
-/* Reserved (bits 4,5) in >= 82575 */
-#define E1000_CTRL_EXT_SDP4_DATA 0x00000010 /* Value of SW Definable Pin 4 */
-#define E1000_CTRL_EXT_SDP5_DATA 0x00000020 /* Value of SW Definable Pin 5 */
-#define E1000_CTRL_EXT_PHY_INT   E1000_CTRL_EXT_SDP5_DATA
-#define E1000_CTRL_EXT_SDP6_DATA 0x00000040 /* Value of SW Definable Pin 6 */
-#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Definable Pin 7 */
-/* SDP 4/5 (bits 8,9) are reserved in >= 82575 */
-#define E1000_CTRL_EXT_SDP4_DIR  0x00000100 /* Direction of SDP4 0=in 1=out */
-#define E1000_CTRL_EXT_SDP5_DIR  0x00000200 /* Direction of SDP5 0=in 1=out */
-#define E1000_CTRL_EXT_SDP6_DIR  0x00000400 /* Direction of SDP6 0=in 1=out */
-#define E1000_CTRL_EXT_SDP7_DIR  0x00000800 /* Direction of SDP7 0=in 1=out */
-#define E1000_CTRL_EXT_ASDCHK    0x00001000 /* Initiate an ASD sequence */
-#define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
-#define E1000_CTRL_EXT_IPS       0x00004000 /* Invert Power State */
-#define E1000_CTRL_EXT_SPD_BYPS  0x00008000 /* Speed Select Bypass */
-#define E1000_CTRL_EXT_RO_DIS    0x00020000 /* Relaxed Ordering disable */
-#define E1000_CTRL_EXT_DMA_DYN_CLK_EN 0x00080000 /* DMA Dynamic Clock Gating */
-#define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_GMII 0x00000000
-#define E1000_CTRL_EXT_LINK_MODE_TBI  0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_KMRN    0x00000000
-#define E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES  0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_PCIX_SERDES  0x00800000
-#define E1000_CTRL_EXT_LINK_MODE_SGMII   0x00800000
-#define E1000_CTRL_EXT_EIAME          0x01000000
-#define E1000_CTRL_EXT_IRCA           0x00000001
-#define E1000_CTRL_EXT_WR_WMARK_MASK  0x03000000
-#define E1000_CTRL_EXT_WR_WMARK_256   0x00000000
-#define E1000_CTRL_EXT_WR_WMARK_320   0x01000000
-#define E1000_CTRL_EXT_WR_WMARK_384   0x02000000
-#define E1000_CTRL_EXT_WR_WMARK_448   0x03000000
-#define E1000_CTRL_EXT_CANC           0x04000000 /* Int delay cancellation */
-#define E1000_CTRL_EXT_DRV_LOAD       0x10000000 /* Driver loaded bit for FW */
-/* IAME enable bit (27) was removed in >= 82575 */
-#define E1000_CTRL_EXT_IAME          0x08000000 /* Int acknowledge Auto-mask */
-#define E1000_CRTL_EXT_PB_PAREN       0x01000000 /* packet buffer parity error
-                                                  * detection enabled */
-#define E1000_CTRL_EXT_DF_PAREN       0x02000000 /* descriptor FIFO parity
-                                                  * error detection enable */
-#define E1000_CTRL_EXT_GHOST_PAREN    0x40000000
-#define E1000_CTRL_EXT_PBA_CLR        0x80000000 /* PBA Clear */
-#define E1000_I2CCMD_REG_ADDR_SHIFT   16
-#define E1000_I2CCMD_REG_ADDR         0x00FF0000
-#define E1000_I2CCMD_PHY_ADDR_SHIFT   24
-#define E1000_I2CCMD_PHY_ADDR         0x07000000
-#define E1000_I2CCMD_OPCODE_READ      0x08000000
-#define E1000_I2CCMD_OPCODE_WRITE     0x00000000
-#define E1000_I2CCMD_RESET            0x10000000
-#define E1000_I2CCMD_READY            0x20000000
-#define E1000_I2CCMD_INTERRUPT_ENA    0x40000000
-#define E1000_I2CCMD_ERROR            0x80000000
-#define E1000_MAX_SGMII_PHY_REG_ADDR  255
-#define E1000_I2CCMD_PHY_TIMEOUT      200
-
-/* Receive Descriptor bit definitions */
-#define E1000_RXD_STAT_DD       0x01    /* Descriptor Done */
-#define E1000_RXD_STAT_EOP      0x02    /* End of Packet */
-#define E1000_RXD_STAT_IXSM     0x04    /* Ignore checksum */
-#define E1000_RXD_STAT_VP       0x08    /* IEEE VLAN Packet */
-#define E1000_RXD_STAT_UDPCS    0x10    /* UDP xsum calculated */
-#define E1000_RXD_STAT_TCPCS    0x20    /* TCP xsum calculated */
-#define E1000_RXD_STAT_IPCS     0x40    /* IP xsum calculated */
-#define E1000_RXD_STAT_PIF      0x80    /* passed in-exact filter */
-#define E1000_RXD_STAT_CRCV     0x100   /* Speculative CRC Valid */
-#define E1000_RXD_STAT_IPIDV    0x200   /* IP identification valid */
-#define E1000_RXD_STAT_UDPV     0x400   /* Valid UDP checksum */
-#define E1000_RXD_STAT_DYNINT   0x800   /* Pkt caused INT via DYNINT */
-#define E1000_RXD_STAT_ACK      0x8000  /* ACK Packet indication */
-#define E1000_RXD_ERR_CE        0x01    /* CRC Error */
-#define E1000_RXD_ERR_SE        0x02    /* Symbol Error */
-#define E1000_RXD_ERR_SEQ       0x04    /* Sequence Error */
-#define E1000_RXD_ERR_CXE       0x10    /* Carrier Extension Error */
-#define E1000_RXD_ERR_TCPE      0x20    /* TCP/UDP Checksum Error */
-#define E1000_RXD_ERR_IPE       0x40    /* IP Checksum Error */
-#define E1000_RXD_ERR_RXE       0x80    /* Rx Data Error */
-#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */
-#define E1000_RXD_SPC_PRI_MASK  0xE000  /* Priority is in upper 3 bits */
-#define E1000_RXD_SPC_PRI_SHIFT 13
-#define E1000_RXD_SPC_CFI_MASK  0x1000  /* CFI is bit 12 */
-#define E1000_RXD_SPC_CFI_SHIFT 12
-
-#define E1000_RXDEXT_STATERR_CE    0x01000000
-#define E1000_RXDEXT_STATERR_SE    0x02000000
-#define E1000_RXDEXT_STATERR_SEQ   0x04000000
-#define E1000_RXDEXT_STATERR_CXE   0x10000000
-#define E1000_RXDEXT_STATERR_TCPE  0x20000000
-#define E1000_RXDEXT_STATERR_IPE   0x40000000
-#define E1000_RXDEXT_STATERR_RXE   0x80000000
-
-/* mask to determine if packets should be dropped due to frame errors */
-#define E1000_RXD_ERR_FRAME_ERR_MASK ( \
-    E1000_RXD_ERR_CE  |                \
-    E1000_RXD_ERR_SE  |                \
-    E1000_RXD_ERR_SEQ |                \
-    E1000_RXD_ERR_CXE |                \
-    E1000_RXD_ERR_RXE)
-
-/* Same mask, but for extended and packet split descriptors */
-#define E1000_RXDEXT_ERR_FRAME_ERR_MASK ( \
-    E1000_RXDEXT_STATERR_CE  |            \
-    E1000_RXDEXT_STATERR_SE  |            \
-    E1000_RXDEXT_STATERR_SEQ |            \
-    E1000_RXDEXT_STATERR_CXE |            \
-    E1000_RXDEXT_STATERR_RXE)
-
-#define E1000_MRQC_ENABLE_MASK                 0x00000007
-#define E1000_MRQC_ENABLE_RSS_2Q               0x00000001
-#define E1000_MRQC_ENABLE_RSS_INT              0x00000004
-#define E1000_MRQC_RSS_FIELD_MASK              0xFFFF0000
-#define E1000_MRQC_RSS_FIELD_IPV4_TCP          0x00010000
-#define E1000_MRQC_RSS_FIELD_IPV4              0x00020000
-#define E1000_MRQC_RSS_FIELD_IPV6_TCP_EX       0x00040000
-#define E1000_MRQC_RSS_FIELD_IPV6_EX           0x00080000
-#define E1000_MRQC_RSS_FIELD_IPV6              0x00100000
-#define E1000_MRQC_RSS_FIELD_IPV6_TCP          0x00200000
-
-#define E1000_RXDPS_HDRSTAT_HDRSP              0x00008000
-#define E1000_RXDPS_HDRSTAT_HDRLEN_MASK        0x000003FF
-
-/* Management Control */
-#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
-#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
-#define E1000_MANC_R_ON_FORCE    0x00000004 /* Reset on Force TCO - RO */
-#define E1000_MANC_RMCP_EN       0x00000100 /* Enable RCMP 026Fh Filtering */
-#define E1000_MANC_0298_EN       0x00000200 /* Enable RCMP 0298h Filtering */
-#define E1000_MANC_IPV4_EN       0x00000400 /* Enable IPv4 */
-#define E1000_MANC_IPV6_EN       0x00000800 /* Enable IPv6 */
-#define E1000_MANC_SNAP_EN       0x00001000 /* Accept LLC/SNAP */
-#define E1000_MANC_ARP_EN        0x00002000 /* Enable ARP Request Filtering */
-/* Enable Neighbor Discovery Filtering */
-#define E1000_MANC_NEIGHBOR_EN   0x00004000
-#define E1000_MANC_ARP_RES_EN    0x00008000 /* Enable ARP response Filtering */
-#define E1000_MANC_TCO_RESET     0x00010000 /* TCO Reset Occurred */
-#define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets Enabled */
-#define E1000_MANC_REPORT_STATUS 0x00040000 /* Status Reporting Enabled */
-#define E1000_MANC_RCV_ALL       0x00080000 /* Receive All Enabled */
-#define E1000_MANC_BLK_PHY_RST_ON_IDE   0x00040000 /* Block phy resets */
-/* Enable MAC address filtering */
-#define E1000_MANC_EN_MAC_ADDR_FILTER   0x00100000
-/* Enable MNG packets to host memory */
-#define E1000_MANC_EN_MNG2HOST   0x00200000
-/* Enable IP address filtering */
-#define E1000_MANC_EN_IP_ADDR_FILTER    0x00400000
-#define E1000_MANC_EN_XSUM_FILTER   0x00800000 /* Enable checksum filtering */
-#define E1000_MANC_BR_EN            0x01000000 /* Enable broadcast filtering */
-#define E1000_MANC_SMB_REQ       0x01000000 /* SMBus Request */
-#define E1000_MANC_SMB_GNT       0x02000000 /* SMBus Grant */
-#define E1000_MANC_SMB_CLK_IN    0x04000000 /* SMBus Clock In */
-#define E1000_MANC_SMB_DATA_IN   0x08000000 /* SMBus Data In */
-#define E1000_MANC_SMB_DATA_OUT  0x10000000 /* SMBus Data Out */
-#define E1000_MANC_SMB_CLK_OUT   0x20000000 /* SMBus Clock Out */
-
-#define E1000_MANC_SMB_DATA_OUT_SHIFT  28 /* SMBus Data Out Shift */
-#define E1000_MANC_SMB_CLK_OUT_SHIFT   29 /* SMBus Clock Out Shift */
-
-/* Receive Control */
-#define E1000_RCTL_RST            0x00000001    /* Software reset */
-#define E1000_RCTL_EN             0x00000002    /* enable */
-#define E1000_RCTL_SBP            0x00000004    /* store bad packet */
-#define E1000_RCTL_UPE            0x00000008    /* unicast promisc enable */
-#define E1000_RCTL_MPE            0x00000010    /* multicast promisc enable */
-#define E1000_RCTL_LPE            0x00000020    /* long packet enable */
-#define E1000_RCTL_LBM_NO         0x00000000    /* no loopback mode */
-#define E1000_RCTL_LBM_MAC        0x00000040    /* MAC loopback mode */
-#define E1000_RCTL_LBM_SLP        0x00000080    /* serial link loopback mode */
-#define E1000_RCTL_LBM_TCVR       0x000000C0    /* tcvr loopback mode */
-#define E1000_RCTL_DTYP_MASK      0x00000C00    /* Descriptor type mask */
-#define E1000_RCTL_DTYP_PS        0x00000400    /* Packet Split descriptor */
-#define E1000_RCTL_RDMTS_HALF     0x00000000    /* rx desc min thresh size */
-#define E1000_RCTL_RDMTS_QUAT     0x00000100    /* rx desc min thresh size */
-#define E1000_RCTL_RDMTS_EIGTH    0x00000200    /* rx desc min thresh size */
-#define E1000_RCTL_MO_SHIFT       12            /* multicast offset shift */
-#define E1000_RCTL_MO_0           0x00000000    /* multicast offset 11:0 */
-#define E1000_RCTL_MO_1           0x00001000    /* multicast offset 12:1 */
-#define E1000_RCTL_MO_2           0x00002000    /* multicast offset 13:2 */
-#define E1000_RCTL_MO_3           0x00003000    /* multicast offset 15:4 */
-#define E1000_RCTL_MDR            0x00004000    /* multicast desc ring 0 */
-#define E1000_RCTL_BAM            0x00008000    /* broadcast enable */
-/* these buffer sizes are valid if E1000_RCTL_BSEX is 0 */
-#define E1000_RCTL_SZ_2048        0x00000000    /* rx buffer size 2048 */
-#define E1000_RCTL_SZ_1024        0x00010000    /* rx buffer size 1024 */
-#define E1000_RCTL_SZ_512         0x00020000    /* rx buffer size 512 */
-#define E1000_RCTL_SZ_256         0x00030000    /* rx buffer size 256 */
-/* these buffer sizes are valid if E1000_RCTL_BSEX is 1 */
-#define E1000_RCTL_SZ_16384       0x00010000    /* rx buffer size 16384 */
-#define E1000_RCTL_SZ_8192        0x00020000    /* rx buffer size 8192 */
-#define E1000_RCTL_SZ_4096        0x00030000    /* rx buffer size 4096 */
-#define E1000_RCTL_VFE            0x00040000    /* vlan filter enable */
-#define E1000_RCTL_CFIEN          0x00080000    /* canonical form enable */
-#define E1000_RCTL_CFI            0x00100000    /* canonical form indicator */
-#define E1000_RCTL_DPF            0x00400000    /* discard pause frames */
-#define E1000_RCTL_PMCF           0x00800000    /* pass MAC control frames */
-#define E1000_RCTL_BSEX           0x02000000    /* Buffer size extension */
-#define E1000_RCTL_SECRC          0x04000000    /* Strip Ethernet CRC */
-#define E1000_RCTL_FLXBUF_MASK    0x78000000    /* Flexible buffer size */
-#define E1000_RCTL_FLXBUF_SHIFT   27            /* Flexible buffer shift */
-
-/*
- * Use byte values for the following shift parameters
- * Usage:
- *     psrctl |= (((ROUNDUP(value0, 128) >> E1000_PSRCTL_BSIZE0_SHIFT) &
- *                  E1000_PSRCTL_BSIZE0_MASK) |
- *                ((ROUNDUP(value1, 1024) >> E1000_PSRCTL_BSIZE1_SHIFT) &
- *                  E1000_PSRCTL_BSIZE1_MASK) |
- *                ((ROUNDUP(value2, 1024) << E1000_PSRCTL_BSIZE2_SHIFT) &
- *                  E1000_PSRCTL_BSIZE2_MASK) |
- *                ((ROUNDUP(value3, 1024) << E1000_PSRCTL_BSIZE3_SHIFT) |;
- *                  E1000_PSRCTL_BSIZE3_MASK))
- * where value0 = [128..16256],  default=256
- *       value1 = [1024..64512], default=4096
- *       value2 = [0..64512],    default=4096
- *       value3 = [0..64512],    default=0
- */
-
-#define E1000_PSRCTL_BSIZE0_MASK   0x0000007F
-#define E1000_PSRCTL_BSIZE1_MASK   0x00003F00
-#define E1000_PSRCTL_BSIZE2_MASK   0x003F0000
-#define E1000_PSRCTL_BSIZE3_MASK   0x3F000000
-
-#define E1000_PSRCTL_BSIZE0_SHIFT  7            /* Shift _right_ 7 */
-#define E1000_PSRCTL_BSIZE1_SHIFT  2            /* Shift _right_ 2 */
-#define E1000_PSRCTL_BSIZE2_SHIFT  6            /* Shift _left_ 6 */
-#define E1000_PSRCTL_BSIZE3_SHIFT 14            /* Shift _left_ 14 */
-
-/* SWFW_SYNC Definitions */
-#define E1000_SWFW_EEP_SM   0x01
-#define E1000_SWFW_PHY0_SM  0x02
-#define E1000_SWFW_PHY1_SM  0x04
-#define E1000_SWFW_CSR_SM   0x08
-
-/* FACTPS Definitions */
-#define E1000_FACTPS_LFS    0x40000000  /* LAN Function Select */
-/* Device Control */
-#define E1000_CTRL_FD       0x00000001  /* Full duplex.0=half; 1=full */
-#define E1000_CTRL_BEM      0x00000002  /* Endian Mode.0=little,1=big */
-#define E1000_CTRL_PRIOR    0x00000004  /* Priority on PCI. 0=rx,1=fair */
-#define E1000_CTRL_GIO_MASTER_DISABLE 0x00000004 /*Blocks new Master reqs */
-#define E1000_CTRL_LRST     0x00000008  /* Link reset. 0=normal,1=reset */
-#define E1000_CTRL_TME      0x00000010  /* Test mode. 0=normal,1=test */
-#define E1000_CTRL_SLE      0x00000020  /* Serial Link on 0=dis,1=en */
-#define E1000_CTRL_ASDE     0x00000020  /* Auto-speed detect enable */
-#define E1000_CTRL_SLU      0x00000040  /* Set link up (Force Link) */
-#define E1000_CTRL_ILOS     0x00000080  /* Invert Loss-Of Signal */
-#define E1000_CTRL_SPD_SEL  0x00000300  /* Speed Select Mask */
-#define E1000_CTRL_SPD_10   0x00000000  /* Force 10Mb */
-#define E1000_CTRL_SPD_100  0x00000100  /* Force 100Mb */
-#define E1000_CTRL_SPD_1000 0x00000200  /* Force 1Gb */
-#define E1000_CTRL_BEM32    0x00000400  /* Big Endian 32 mode */
-#define E1000_CTRL_FRCSPD   0x00000800  /* Force Speed */
-#define E1000_CTRL_FRCDPX   0x00001000  /* Force Duplex */
-#define E1000_CTRL_D_UD_EN  0x00002000  /* Dock/Undock enable */
-#define E1000_CTRL_D_UD_POLARITY 0x00004000 /* Defined polarity of Dock/Undock
-                                             * indication in SDP[0] */
-#define E1000_CTRL_FORCE_PHY_RESET 0x00008000 /* Reset both PHY ports, through
-                                               * PHYRST_N pin */
-#define E1000_CTRL_EXT_LINK_EN 0x00010000 /* enable link status from external
-                                           * LINK_0 and LINK_1 pins */
-#define E1000_CTRL_SWDPIN0  0x00040000  /* SWDPIN 0 value */
-#define E1000_CTRL_SWDPIN1  0x00080000  /* SWDPIN 1 value */
-#define E1000_CTRL_SWDPIN2  0x00100000  /* SWDPIN 2 value */
-#define E1000_CTRL_SWDPIN3  0x00200000  /* SWDPIN 3 value */
-#define E1000_CTRL_SWDPIO0  0x00400000  /* SWDPIN 0 Input or output */
-#define E1000_CTRL_SWDPIO1  0x00800000  /* SWDPIN 1 input or output */
-#define E1000_CTRL_SWDPIO2  0x01000000  /* SWDPIN 2 input or output */
-#define E1000_CTRL_SWDPIO3  0x02000000  /* SWDPIN 3 input or output */
-#define E1000_CTRL_RST      0x04000000  /* Global reset */
-#define E1000_CTRL_RFCE     0x08000000  /* Receive Flow Control enable */
-#define E1000_CTRL_TFCE     0x10000000  /* Transmit flow control enable */
-#define E1000_CTRL_RTE      0x20000000  /* Routing tag enable */
-#define E1000_CTRL_VME      0x40000000  /* IEEE VLAN mode enable */
-#define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */
-#define E1000_CTRL_SW2FW_INT 0x02000000 /* Initiate an interrupt to ME */
-#define E1000_CTRL_I2C_ENA  0x02000000  /* I2C enable */
-
-/*
- * Bit definitions for the Management Data IO (MDIO) and Management Data
- * Clock (MDC) pins in the Device Control Register.
- */
-#define E1000_CTRL_PHY_RESET_DIR  E1000_CTRL_SWDPIO0
-#define E1000_CTRL_PHY_RESET      E1000_CTRL_SWDPIN0
-#define E1000_CTRL_MDIO_DIR       E1000_CTRL_SWDPIO2
-#define E1000_CTRL_MDIO           E1000_CTRL_SWDPIN2
-#define E1000_CTRL_MDC_DIR        E1000_CTRL_SWDPIO3
-#define E1000_CTRL_MDC            E1000_CTRL_SWDPIN3
-#define E1000_CTRL_PHY_RESET_DIR4 E1000_CTRL_EXT_SDP4_DIR
-#define E1000_CTRL_PHY_RESET4     E1000_CTRL_EXT_SDP4_DATA
-
-#define E1000_CONNSW_ENRGSRC             0x4
-#define E1000_PCS_CFG_PCS_EN             8
-#define E1000_PCS_LCTL_FLV_LINK_UP       1
-#define E1000_PCS_LCTL_FSV_10            0
-#define E1000_PCS_LCTL_FSV_100           2
-#define E1000_PCS_LCTL_FSV_1000          4
-#define E1000_PCS_LCTL_FDV_FULL          8
-#define E1000_PCS_LCTL_FSD               0x10
-#define E1000_PCS_LCTL_FORCE_LINK        0x20
-#define E1000_PCS_LCTL_LOW_LINK_LATCH    0x40
-#define E1000_PCS_LCTL_FORCE_FCTRL       0x80
-#define E1000_PCS_LCTL_AN_ENABLE         0x10000
-#define E1000_PCS_LCTL_AN_RESTART        0x20000
-#define E1000_PCS_LCTL_AN_TIMEOUT        0x40000
-#define E1000_PCS_LCTL_AN_SGMII_BYPASS   0x80000
-#define E1000_PCS_LCTL_AN_SGMII_TRIGGER  0x100000
-#define E1000_PCS_LCTL_FAST_LINK_TIMER   0x1000000
-#define E1000_PCS_LCTL_LINK_OK_FIX       0x2000000
-#define E1000_PCS_LCTL_CRS_ON_NI         0x4000000
-#define E1000_ENABLE_SERDES_LOOPBACK     0x0410
-
-#define E1000_PCS_LSTS_LINK_OK           1
-#define E1000_PCS_LSTS_SPEED_10          0
-#define E1000_PCS_LSTS_SPEED_100         2
-#define E1000_PCS_LSTS_SPEED_1000        4
-#define E1000_PCS_LSTS_DUPLEX_FULL       8
-#define E1000_PCS_LSTS_SYNK_OK           0x10
-#define E1000_PCS_LSTS_AN_COMPLETE       0x10000
-#define E1000_PCS_LSTS_AN_PAGE_RX        0x20000
-#define E1000_PCS_LSTS_AN_TIMED_OUT      0x40000
-#define E1000_PCS_LSTS_AN_REMOTE_FAULT   0x80000
-#define E1000_PCS_LSTS_AN_ERROR_RWS      0x100000
-
-/* Device Status */
-#define E1000_STATUS_FD         0x00000001      /* Full duplex.0=half,1=full */
-#define E1000_STATUS_LU         0x00000002      /* Link up.0=no,1=link */
-#define E1000_STATUS_FUNC_MASK  0x0000000C      /* PCI Function Mask */
-#define E1000_STATUS_FUNC_SHIFT 2
-#define E1000_STATUS_FUNC_0     0x00000000      /* Function 0 */
-#define E1000_STATUS_FUNC_1     0x00000004      /* Function 1 */
-#define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
-#define E1000_STATUS_TBIMODE    0x00000020      /* TBI mode */
-#define E1000_STATUS_SPEED_MASK 0x000000C0
-#define E1000_STATUS_SPEED_10   0x00000000      /* Speed 10Mb/s */
-#define E1000_STATUS_SPEED_100  0x00000040      /* Speed 100Mb/s */
-#define E1000_STATUS_SPEED_1000 0x00000080      /* Speed 1000Mb/s */
-#define E1000_STATUS_LAN_INIT_DONE 0x00000200  /* Lan Init Completion by NVM */
-#define E1000_STATUS_ASDV       0x00000300      /* Auto speed detect value */
-#define E1000_STATUS_PHYRA      0x00000400      /* PHY Reset Asserted */
-#define E1000_STATUS_DOCK_CI    0x00000800      /* Change in Dock/Undock state.
-                                                 * Clear on write '0'. */
-#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Master request status */
-#define E1000_STATUS_MTXCKOK    0x00000400      /* MTX clock running OK */
-#define E1000_STATUS_PCI66      0x00000800      /* In 66Mhz slot */
-#define E1000_STATUS_BUS64      0x00001000      /* In 64 bit slot */
-#define E1000_STATUS_PCIX_MODE  0x00002000      /* PCI-X mode */
-#define E1000_STATUS_PCIX_SPEED 0x0000C000      /* PCI-X bus speed */
-#define E1000_STATUS_BMC_SKU_0  0x00100000 /* BMC USB redirect disabled */
-#define E1000_STATUS_BMC_SKU_1  0x00200000 /* BMC SRAM disabled */
-#define E1000_STATUS_BMC_SKU_2  0x00400000 /* BMC SDRAM disabled */
-#define E1000_STATUS_BMC_CRYPTO 0x00800000 /* BMC crypto disabled */
-#define E1000_STATUS_BMC_LITE   0x01000000 /* BMC external code execution
-                                            * disabled */
-#define E1000_STATUS_RGMII_ENABLE 0x02000000 /* RGMII disabled */
-#define E1000_STATUS_FUSE_8       0x04000000
-#define E1000_STATUS_FUSE_9       0x08000000
-#define E1000_STATUS_SERDES0_DIS  0x10000000 /* SERDES disabled on port 0 */
-#define E1000_STATUS_SERDES1_DIS  0x20000000 /* SERDES disabled on port 1 */
-
-/* Constants used to interpret the masked PCI-X bus speed. */
-#define E1000_STATUS_PCIX_SPEED_66  0x00000000 /* PCI-X bus speed 50-66 MHz */
-#define E1000_STATUS_PCIX_SPEED_100 0x00004000 /* PCI-X bus speed 66-100 MHz */
-#define E1000_STATUS_PCIX_SPEED_133 0x00008000 /*PCI-X bus speed 100-133 MHz*/
-
-#define SPEED_10    10
-#define SPEED_100   100
-#define SPEED_1000  1000
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
-
-#define PHY_FORCE_TIME   20
-
-#define ADVERTISE_10_HALF                 0x0001
-#define ADVERTISE_10_FULL                 0x0002
-#define ADVERTISE_100_HALF                0x0004
-#define ADVERTISE_100_FULL                0x0008
-#define ADVERTISE_1000_HALF               0x0010 /* Not used, just FYI */
-#define ADVERTISE_1000_FULL               0x0020
-
-/* 1000/H is not supported, nor spec-compliant. */
-#define E1000_ALL_SPEED_DUPLEX  (ADVERTISE_10_HALF |   ADVERTISE_10_FULL | \
-                                ADVERTISE_100_HALF |  ADVERTISE_100_FULL | \
-                                                     ADVERTISE_1000_FULL)
-#define E1000_ALL_NOT_GIG       (ADVERTISE_10_HALF |   ADVERTISE_10_FULL | \
-                                ADVERTISE_100_HALF |  ADVERTISE_100_FULL)
-#define E1000_ALL_100_SPEED    (ADVERTISE_100_HALF |  ADVERTISE_100_FULL)
-#define E1000_ALL_10_SPEED      (ADVERTISE_10_HALF |   ADVERTISE_10_FULL)
-#define E1000_ALL_FULL_DUPLEX   (ADVERTISE_10_FULL |  ADVERTISE_100_FULL | \
-                                                     ADVERTISE_1000_FULL)
-#define E1000_ALL_HALF_DUPLEX   (ADVERTISE_10_HALF |  ADVERTISE_100_HALF)
-
-#define AUTONEG_ADVERTISE_SPEED_DEFAULT   E1000_ALL_SPEED_DUPLEX
-
-/* LED Control */
-#define E1000_LEDCTL_LED0_MODE_MASK       0x0000000F
-#define E1000_LEDCTL_LED0_MODE_SHIFT      0
-#define E1000_LEDCTL_LED0_BLINK_RATE      0x00000020
-#define E1000_LEDCTL_LED0_IVRT            0x00000040
-#define E1000_LEDCTL_LED0_BLINK           0x00000080
-#define E1000_LEDCTL_LED1_MODE_MASK       0x00000F00
-#define E1000_LEDCTL_LED1_MODE_SHIFT      8
-#define E1000_LEDCTL_LED1_BLINK_RATE      0x00002000
-#define E1000_LEDCTL_LED1_IVRT            0x00004000
-#define E1000_LEDCTL_LED1_BLINK           0x00008000
-#define E1000_LEDCTL_LED2_MODE_MASK       0x000F0000
-#define E1000_LEDCTL_LED2_MODE_SHIFT      16
-#define E1000_LEDCTL_LED2_BLINK_RATE      0x00200000
-#define E1000_LEDCTL_LED2_IVRT            0x00400000
-#define E1000_LEDCTL_LED2_BLINK           0x00800000
-#define E1000_LEDCTL_LED3_MODE_MASK       0x0F000000
-#define E1000_LEDCTL_LED3_MODE_SHIFT      24
-#define E1000_LEDCTL_LED3_BLINK_RATE      0x20000000
-#define E1000_LEDCTL_LED3_IVRT            0x40000000
-#define E1000_LEDCTL_LED3_BLINK           0x80000000
-
-#define E1000_LEDCTL_MODE_LINK_10_1000  0x0
-#define E1000_LEDCTL_MODE_LINK_100_1000 0x1
-#define E1000_LEDCTL_MODE_LINK_UP       0x2
-#define E1000_LEDCTL_MODE_ACTIVITY      0x3
-#define E1000_LEDCTL_MODE_LINK_ACTIVITY 0x4
-#define E1000_LEDCTL_MODE_LINK_10       0x5
-#define E1000_LEDCTL_MODE_LINK_100      0x6
-#define E1000_LEDCTL_MODE_LINK_1000     0x7
-#define E1000_LEDCTL_MODE_PCIX_MODE     0x8
-#define E1000_LEDCTL_MODE_FULL_DUPLEX   0x9
-#define E1000_LEDCTL_MODE_COLLISION     0xA
-#define E1000_LEDCTL_MODE_BUS_SPEED     0xB
-#define E1000_LEDCTL_MODE_BUS_SIZE      0xC
-#define E1000_LEDCTL_MODE_PAUSED        0xD
-#define E1000_LEDCTL_MODE_LED_ON        0xE
-#define E1000_LEDCTL_MODE_LED_OFF       0xF
-
-/* Transmit Descriptor bit definitions */
-#define E1000_TXD_DTYP_D     0x00100000 /* Data Descriptor */
-#define E1000_TXD_DTYP_C     0x00000000 /* Context Descriptor */
-#define E1000_TXD_POPTS_SHIFT 8         /* POPTS shift */
-#define E1000_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
-#define E1000_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
-#define E1000_TXD_CMD_EOP    0x01000000 /* End of Packet */
-#define E1000_TXD_CMD_IFCS   0x02000000 /* Insert FCS (Ethernet CRC) */
-#define E1000_TXD_CMD_IC     0x04000000 /* Insert Checksum */
-#define E1000_TXD_CMD_RS     0x08000000 /* Report Status */
-#define E1000_TXD_CMD_RPS    0x10000000 /* Report Packet Sent */
-#define E1000_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
-#define E1000_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
-#define E1000_TXD_CMD_IDE    0x80000000 /* Enable Tidv register */
-#define E1000_TXD_STAT_DD    0x00000001 /* Descriptor Done */
-#define E1000_TXD_STAT_EC    0x00000002 /* Excess Collisions */
-#define E1000_TXD_STAT_LC    0x00000004 /* Late Collisions */
-#define E1000_TXD_STAT_TU    0x00000008 /* Transmit underrun */
-#define E1000_TXD_CMD_TCP    0x01000000 /* TCP packet */
-#define E1000_TXD_CMD_IP     0x02000000 /* IP packet */
-#define E1000_TXD_CMD_TSE    0x04000000 /* TCP Seg enable */
-#define E1000_TXD_STAT_TC    0x00000004 /* Tx Underrun */
-/* Extended desc bits for Linksec and timesync */
-
-/* Transmit Control */
-#define E1000_TCTL_RST    0x00000001    /* software reset */
-#define E1000_TCTL_EN     0x00000002    /* enable tx */
-#define E1000_TCTL_BCE    0x00000004    /* busy check enable */
-#define E1000_TCTL_PSP    0x00000008    /* pad short packets */
-#define E1000_TCTL_CT     0x00000ff0    /* collision threshold */
-#define E1000_TCTL_COLD   0x003ff000    /* collision distance */
-#define E1000_TCTL_SWXOFF 0x00400000    /* SW Xoff transmission */
-#define E1000_TCTL_PBE    0x00800000    /* Packet Burst Enable */
-#define E1000_TCTL_RTLC   0x01000000    /* Re-transmit on late collision */
-#define E1000_TCTL_NRTU   0x02000000    /* No Re-transmit on underrun */
-#define E1000_TCTL_MULR   0x10000000    /* Multiple request support */
-
-/* Transmit Arbitration Count */
-#define E1000_TARC0_ENABLE     0x00000400   /* Enable Tx Queue 0 */
-
-/* SerDes Control */
-#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400
-
-/* Receive Checksum Control */
-#define E1000_RXCSUM_PCSS_MASK 0x000000FF   /* Packet Checksum Start */
-#define E1000_RXCSUM_IPOFL     0x00000100   /* IPv4 checksum offload */
-#define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
-#define E1000_RXCSUM_IPV6OFL   0x00000400   /* IPv6 checksum offload */
-#define E1000_RXCSUM_CRCOFL    0x00000800   /* CRC32 offload enable */
-#define E1000_RXCSUM_IPPCSE    0x00001000   /* IP payload checksum enable */
-#define E1000_RXCSUM_PCSD      0x00002000   /* packet checksum disabled */
-
-/* Header split receive */
-#define E1000_RFCTL_ISCSI_DIS           0x00000001
-#define E1000_RFCTL_ISCSI_DWC_MASK      0x0000003E
-#define E1000_RFCTL_ISCSI_DWC_SHIFT     1
-#define E1000_RFCTL_NFSW_DIS            0x00000040
-#define E1000_RFCTL_NFSR_DIS            0x00000080
-#define E1000_RFCTL_NFS_VER_MASK        0x00000300
-#define E1000_RFCTL_NFS_VER_SHIFT       8
-#define E1000_RFCTL_IPV6_DIS            0x00000400
-#define E1000_RFCTL_IPV6_XSUM_DIS       0x00000800
-#define E1000_RFCTL_ACK_DIS             0x00001000
-#define E1000_RFCTL_ACKD_DIS            0x00002000
-#define E1000_RFCTL_IPFRSP_DIS          0x00004000
-#define E1000_RFCTL_EXTEN               0x00008000
-#define E1000_RFCTL_IPV6_EX_DIS         0x00010000
-#define E1000_RFCTL_NEW_IPV6_EXT_DIS    0x00020000
-#define E1000_RFCTL_LEF                 0x00040000
-
-/* Collision related configuration parameters */
-#define E1000_COLLISION_THRESHOLD       15
-#define E1000_CT_SHIFT                  4
-#define E1000_COLLISION_DISTANCE        63
-#define E1000_COLD_SHIFT                12
-
-/* Default values for the transmit IPG register */
-#define DEFAULT_82542_TIPG_IPGT        10
-#define DEFAULT_82543_TIPG_IPGT_FIBER  9
-#define DEFAULT_82543_TIPG_IPGT_COPPER 8
-
-#define E1000_TIPG_IPGT_MASK  0x000003FF
-#define E1000_TIPG_IPGR1_MASK 0x000FFC00
-#define E1000_TIPG_IPGR2_MASK 0x3FF00000
-
-#define DEFAULT_82542_TIPG_IPGR1 2
-#define DEFAULT_82543_TIPG_IPGR1 8
-#define E1000_TIPG_IPGR1_SHIFT  10
-
-#define DEFAULT_82542_TIPG_IPGR2 10
-#define DEFAULT_82543_TIPG_IPGR2 6
-#define DEFAULT_80003ES2LAN_TIPG_IPGR2 7
-#define E1000_TIPG_IPGR2_SHIFT  20
-
-/* Ethertype field values */
-#define ETHERNET_IEEE_VLAN_TYPE 0x8100  /* 802.3ac packet */
-
-#define ETHERNET_FCS_SIZE       4
-#define MAX_JUMBO_FRAME_SIZE    0x3F00
-
-/* Extended Configuration Control and Size */
-#define E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP      0x00000020
-#define E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE       0x00000001
-#define E1000_EXTCNF_CTRL_SWFLAG                 0x00000020
-#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK   0x00FF0000
-#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_SHIFT          16
-#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK   0x0FFF0000
-#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT          16
-
-#define E1000_PHY_CTRL_SPD_EN             0x00000001
-#define E1000_PHY_CTRL_D0A_LPLU           0x00000002
-#define E1000_PHY_CTRL_NOND0A_LPLU        0x00000004
-#define E1000_PHY_CTRL_NOND0A_GBE_DISABLE 0x00000008
-#define E1000_PHY_CTRL_GBE_DISABLE        0x00000040
-
-#define E1000_KABGTXD_BGSQLBIAS           0x00050000
-
-/* PBA constants */
-#define E1000_PBA_6K  0x0006    /* 6KB */
-#define E1000_PBA_8K  0x0008    /* 8KB */
-#define E1000_PBA_10K 0x000A    /* 10KB */
-#define E1000_PBA_12K 0x000C    /* 12KB */
-#define E1000_PBA_14K 0x000E    /* 14KB */
-#define E1000_PBA_16K 0x0010    /* 16KB */
-#define E1000_PBA_18K 0x0012
-#define E1000_PBA_20K 0x0014
-#define E1000_PBA_22K 0x0016
-#define E1000_PBA_24K 0x0018
-#define E1000_PBA_26K 0x001A
-#define E1000_PBA_30K 0x001E
-#define E1000_PBA_32K 0x0020
-#define E1000_PBA_34K 0x0022
-#define E1000_PBA_35K 0x0023
-#define E1000_PBA_38K 0x0026
-#define E1000_PBA_40K 0x0028
-#define E1000_PBA_48K 0x0030    /* 48KB */
-#define E1000_PBA_64K 0x0040    /* 64KB */
-
-#define E1000_PBS_16K E1000_PBA_16K
-#define E1000_PBS_24K E1000_PBA_24K
-
-#define IFS_MAX       80
-#define IFS_MIN       40
-#define IFS_RATIO     4
-#define IFS_STEP      10
-#define MIN_NUM_XMITS 1000
-
-/* SW Semaphore Register */
-#define E1000_SWSM_SMBI         0x00000001 /* Driver Semaphore bit */
-#define E1000_SWSM_SWESMBI      0x00000002 /* FW Semaphore bit */
-#define E1000_SWSM_WMNG         0x00000004 /* Wake MNG Clock */
-#define E1000_SWSM_DRV_LOAD     0x00000008 /* Driver Loaded Bit */
-
-#define E1000_SWSM2_LOCK        0x00000002 /* Secondary driver semaphore bit */
-
-/* Interrupt Cause Read */
-#define E1000_ICR_TXDW          0x00000001 /* Transmit desc written back */
-#define E1000_ICR_TXQE          0x00000002 /* Transmit Queue empty */
-#define E1000_ICR_LSC           0x00000004 /* Link Status Change */
-#define E1000_ICR_RXSEQ         0x00000008 /* rx sequence error */
-#define E1000_ICR_RXDMT0        0x00000010 /* rx desc min. threshold (0) */
-#define E1000_ICR_RXO           0x00000040 /* rx overrun */
-#define E1000_ICR_RXT0          0x00000080 /* rx timer intr (ring 0) */
-#define E1000_ICR_VMMB          0x00000100 /* VM MB event */
-#define E1000_ICR_MDAC          0x00000200 /* MDIO access complete */
-#define E1000_ICR_RXCFG         0x00000400 /* Rx /c/ ordered set */
-#define E1000_ICR_GPI_EN0       0x00000800 /* GP Int 0 */
-#define E1000_ICR_GPI_EN1       0x00001000 /* GP Int 1 */
-#define E1000_ICR_GPI_EN2       0x00002000 /* GP Int 2 */
-#define E1000_ICR_GPI_EN3       0x00004000 /* GP Int 3 */
-#define E1000_ICR_TXD_LOW       0x00008000
-#define E1000_ICR_SRPD          0x00010000
-#define E1000_ICR_ACK           0x00020000 /* Receive Ack frame */
-#define E1000_ICR_MNG           0x00040000 /* Manageability event */
-#define E1000_ICR_DOCK          0x00080000 /* Dock/Undock */
-#define E1000_ICR_INT_ASSERTED  0x80000000 /* If this bit asserted, the driver
-                                            * should claim the interrupt */
-#define E1000_ICR_RXD_FIFO_PAR0 0x00100000 /* Q0 Rx desc FIFO parity error */
-#define E1000_ICR_TXD_FIFO_PAR0 0x00200000 /* Q0 Tx desc FIFO parity error */
-#define E1000_ICR_HOST_ARB_PAR 0x00400000 /* host arb read buffer parity err */
-#define E1000_ICR_PB_PAR        0x00800000 /* packet buffer parity error */
-#define E1000_ICR_RXD_FIFO_PAR1 0x01000000 /* Q1 Rx desc FIFO parity error */
-#define E1000_ICR_TXD_FIFO_PAR1 0x02000000 /* Q1 Tx desc FIFO parity error */
-#define E1000_ICR_ALL_PARITY    0x03F00000 /* all parity error bits */
-#define E1000_ICR_DSW           0x00000020 /* FW changed the status of DISSW
-                                            * bit in the FWSM */
-#define E1000_ICR_PHYINT        0x00001000 /* LAN connected device generates
-                                            * an interrupt */
-#define E1000_ICR_DOUTSYNC      0x10000000 /* NIC DMA out of sync */
-#define E1000_ICR_EPRST         0x00100000 /* ME hardware reset occurs */
-
-
-/*
- * This defines the bits that are set in the Interrupt Mask
- * Set/Read Register.  Each bit is documented below:
- *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
- *   o RXSEQ  = Receive Sequence Error
- */
-#define POLL_IMS_ENABLE_MASK ( \
-    E1000_IMS_RXDMT0 |    \
-    E1000_IMS_RXSEQ)
-
-/*
- * This defines the bits that are set in the Interrupt Mask
- * Set/Read Register.  Each bit is documented below:
- *   o RXT0   = Receiver Timer Interrupt (ring 0)
- *   o TXDW   = Transmit Descriptor Written Back
- *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
- *   o RXSEQ  = Receive Sequence Error
- *   o LSC    = Link Status Change
- */
-#define IMS_ENABLE_MASK ( \
-    E1000_IMS_RXT0   |    \
-    E1000_IMS_TXDW   |    \
-    E1000_IMS_RXDMT0 |    \
-    E1000_IMS_RXSEQ  |    \
-    E1000_IMS_LSC)
-
-/* Interrupt Mask Set */
-#define E1000_IMS_TXDW      E1000_ICR_TXDW      /* Tx desc written back */
-#define E1000_IMS_TXQE      E1000_ICR_TXQE      /* Transmit Queue empty */
-#define E1000_IMS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_IMS_VMMB      E1000_ICR_VMMB      /* Mail box activity */
-#define E1000_IMS_RXSEQ     E1000_ICR_RXSEQ     /* rx sequence error */
-#define E1000_IMS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
-#define E1000_IMS_RXO       E1000_ICR_RXO       /* rx overrun */
-#define E1000_IMS_RXT0      E1000_ICR_RXT0      /* rx timer intr */
-#define E1000_IMS_MDAC      E1000_ICR_MDAC      /* MDIO access complete */
-#define E1000_IMS_RXCFG     E1000_ICR_RXCFG     /* Rx /c/ ordered set */
-#define E1000_IMS_GPI_EN0   E1000_ICR_GPI_EN0   /* GP Int 0 */
-#define E1000_IMS_GPI_EN1   E1000_ICR_GPI_EN1   /* GP Int 1 */
-#define E1000_IMS_GPI_EN2   E1000_ICR_GPI_EN2   /* GP Int 2 */
-#define E1000_IMS_GPI_EN3   E1000_ICR_GPI_EN3   /* GP Int 3 */
-#define E1000_IMS_TXD_LOW   E1000_ICR_TXD_LOW
-#define E1000_IMS_SRPD      E1000_ICR_SRPD
-#define E1000_IMS_ACK       E1000_ICR_ACK       /* Receive Ack frame */
-#define E1000_IMS_MNG       E1000_ICR_MNG       /* Manageability event */
-#define E1000_IMS_DOCK      E1000_ICR_DOCK      /* Dock/Undock */
-#define E1000_IMS_RXD_FIFO_PAR0 E1000_ICR_RXD_FIFO_PAR0 /* Q0 Rx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0 /* Q0 Tx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_HOST_ARB_PAR  E1000_ICR_HOST_ARB_PAR  /* host arb read buffer
-                                                         * parity error */
-#define E1000_IMS_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer parity
-                                                         * error */
-#define E1000_IMS_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* Q1 Rx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* Q1 Tx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_DSW       E1000_ICR_DSW
-#define E1000_IMS_PHYINT    E1000_ICR_PHYINT
-#define E1000_IMS_DOUTSYNC  E1000_ICR_DOUTSYNC /* NIC DMA out of sync */
-#define E1000_IMS_EPRST     E1000_ICR_EPRST
-
-/* Interrupt Cause Set */
-#define E1000_ICS_TXDW      E1000_ICR_TXDW      /* Tx desc written back */
-#define E1000_ICS_TXQE      E1000_ICR_TXQE      /* Transmit Queue empty */
-#define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_ICS_RXSEQ     E1000_ICR_RXSEQ     /* rx sequence error */
-#define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
-#define E1000_ICS_RXO       E1000_ICR_RXO       /* rx overrun */
-#define E1000_ICS_RXT0      E1000_ICR_RXT0      /* rx timer intr */
-#define E1000_ICS_MDAC      E1000_ICR_MDAC      /* MDIO access complete */
-#define E1000_ICS_RXCFG     E1000_ICR_RXCFG     /* Rx /c/ ordered set */
-#define E1000_ICS_GPI_EN0   E1000_ICR_GPI_EN0   /* GP Int 0 */
-#define E1000_ICS_GPI_EN1   E1000_ICR_GPI_EN1   /* GP Int 1 */
-#define E1000_ICS_GPI_EN2   E1000_ICR_GPI_EN2   /* GP Int 2 */
-#define E1000_ICS_GPI_EN3   E1000_ICR_GPI_EN3   /* GP Int 3 */
-#define E1000_ICS_TXD_LOW   E1000_ICR_TXD_LOW
-#define E1000_ICS_SRPD      E1000_ICR_SRPD
-#define E1000_ICS_ACK       E1000_ICR_ACK       /* Receive Ack frame */
-#define E1000_ICS_MNG       E1000_ICR_MNG       /* Manageability event */
-#define E1000_ICS_DOCK      E1000_ICR_DOCK      /* Dock/Undock */
-#define E1000_ICS_RXD_FIFO_PAR0 E1000_ICR_RXD_FIFO_PAR0 /* Q0 Rx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0 /* Q0 Tx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_HOST_ARB_PAR  E1000_ICR_HOST_ARB_PAR  /* host arb read buffer
-                                                         * parity error */
-#define E1000_ICS_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer parity
-                                                         * error */
-#define E1000_ICS_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* Q1 Rx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* Q1 Tx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_DSW       E1000_ICR_DSW
-#define E1000_ICS_DOUTSYNC  E1000_ICR_DOUTSYNC /* NIC DMA out of sync */
-#define E1000_ICS_PHYINT    E1000_ICR_PHYINT
-#define E1000_ICS_EPRST     E1000_ICR_EPRST
-
-/* Transmit Descriptor Control */
-#define E1000_TXDCTL_PTHRESH 0x0000003F /* TXDCTL Prefetch Threshold */
-#define E1000_TXDCTL_HTHRESH 0x00003F00 /* TXDCTL Host Threshold */
-#define E1000_TXDCTL_WTHRESH 0x003F0000 /* TXDCTL Writeback Threshold */
-#define E1000_TXDCTL_GRAN    0x01000000 /* TXDCTL Granularity */
-#define E1000_TXDCTL_LWTHRESH 0xFE000000 /* TXDCTL Low Threshold */
-#define E1000_TXDCTL_FULL_TX_DESC_WB 0x01010000 /* GRAN=1, WTHRESH=1 */
-#define E1000_TXDCTL_MAX_TX_DESC_PREFETCH 0x0100001F /* GRAN=1, PTHRESH=31 */
-/* Enable the counting of descriptors still to be processed. */
-#define E1000_TXDCTL_COUNT_DESC 0x00400000
-
-/* Flow Control Constants */
-#define FLOW_CONTROL_ADDRESS_LOW  0x00C28001
-#define FLOW_CONTROL_ADDRESS_HIGH 0x00000100
-#define FLOW_CONTROL_TYPE         0x8808
-
-/* 802.1q VLAN Packet Size */
-#define VLAN_TAG_SIZE              4    /* 802.3ac tag (not DMA'd) */
-#define E1000_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */
-
-/* Receive Address */
-/*
- * Number of high/low register pairs in the RAR. The RAR (Receive Address
- * Registers) holds the directed and multicast addresses that we monitor.
- * Technically, we have 16 spots.  However, we reserve one of these spots
- * (RAR[15]) for our directed address used by controllers with
- * manageability enabled, allowing us room for 15 multicast addresses.
- */
-#define E1000_RAR_ENTRIES     15
-#define E1000_RAH_AV  0x80000000        /* Receive descriptor valid */
-#define E1000_RAL_MAC_ADDR_LEN 4
-#define E1000_RAH_MAC_ADDR_LEN 2
-#define E1000_RAH_POOL_MASK 0x03FC0000
-#define E1000_RAH_POOL_1 0x00040000
-
-/* Error Codes */
-#define E1000_SUCCESS      0
-#define E1000_ERR_NVM      1
-#define E1000_ERR_PHY      2
-#define E1000_ERR_CONFIG   3
-#define E1000_ERR_PARAM    4
-#define E1000_ERR_MAC_INIT 5
-#define E1000_ERR_PHY_TYPE 6
-#define E1000_ERR_RESET   9
-#define E1000_ERR_MASTER_REQUESTS_PENDING 10
-#define E1000_ERR_HOST_INTERFACE_COMMAND 11
-#define E1000_BLK_PHY_RESET   12
-#define E1000_ERR_SWFW_SYNC 13
-#define E1000_NOT_IMPLEMENTED 14
-#define E1000_ERR_MBX      15
-
-/* Loop limit on how long we wait for auto-negotiation to complete */
-#define FIBER_LINK_UP_LIMIT               50
-#define COPPER_LINK_UP_LIMIT              10
-#define PHY_AUTO_NEG_LIMIT                45
-#define PHY_FORCE_LIMIT                   20
-/* Number of 100 microseconds we wait for PCI Express master disable */
-#define MASTER_DISABLE_TIMEOUT      800
-/* Number of milliseconds we wait for PHY configuration done after MAC reset */
-#define PHY_CFG_TIMEOUT             100
-/* Number of 2 milliseconds we wait for acquiring MDIO ownership. */
-#define MDIO_OWNERSHIP_TIMEOUT      10
-/* Number of milliseconds for NVM auto read done after MAC reset. */
-#define AUTO_READ_DONE_TIMEOUT      10
-
-/* Flow Control */
-#define E1000_FCRTH_RTH  0x0000FFF8     /* Mask Bits[15:3] for RTH */
-#define E1000_FCRTH_XFCE 0x80000000     /* External Flow Control Enable */
-#define E1000_FCRTL_RTL  0x0000FFF8     /* Mask Bits[15:3] for RTL */
-#define E1000_FCRTL_XONE 0x80000000     /* Enable XON frame transmission */
-
-/* Transmit Configuration Word */
-#define E1000_TXCW_FD         0x00000020        /* TXCW full duplex */
-#define E1000_TXCW_HD         0x00000040        /* TXCW half duplex */
-#define E1000_TXCW_PAUSE      0x00000080        /* TXCW sym pause request */
-#define E1000_TXCW_ASM_DIR    0x00000100        /* TXCW astm pause direction */
-#define E1000_TXCW_PAUSE_MASK 0x00000180        /* TXCW pause request mask */
-#define E1000_TXCW_RF         0x00003000        /* TXCW remote fault */
-#define E1000_TXCW_NP         0x00008000        /* TXCW next page */
-#define E1000_TXCW_CW         0x0000ffff        /* TxConfigWord mask */
-#define E1000_TXCW_TXC        0x40000000        /* Transmit Config control */
-#define E1000_TXCW_ANE        0x80000000        /* Auto-neg enable */
-
-/* Receive Configuration Word */
-#define E1000_RXCW_CW         0x0000ffff        /* RxConfigWord mask */
-#define E1000_RXCW_NC         0x04000000        /* Receive config no carrier */
-#define E1000_RXCW_IV         0x08000000        /* Receive config invalid */
-#define E1000_RXCW_CC         0x10000000        /* Receive config change */
-#define E1000_RXCW_C          0x20000000        /* Receive config */
-#define E1000_RXCW_SYNCH      0x40000000        /* Receive config synch */
-#define E1000_RXCW_ANC        0x80000000        /* Auto-neg complete */
-
-
-/* PCI Express Control */
-#define E1000_GCR_RXD_NO_SNOOP          0x00000001
-#define E1000_GCR_RXDSCW_NO_SNOOP       0x00000002
-#define E1000_GCR_RXDSCR_NO_SNOOP       0x00000004
-#define E1000_GCR_TXD_NO_SNOOP          0x00000008
-#define E1000_GCR_TXDSCW_NO_SNOOP       0x00000010
-#define E1000_GCR_TXDSCR_NO_SNOOP       0x00000020
-#define E1000_GCR_CMPL_TMOUT_MASK       0x0000F000
-#define E1000_GCR_CMPL_TMOUT_10ms       0x00001000
-#define E1000_GCR_CMPL_TMOUT_RESEND     0x00010000
-#define E1000_GCR_CAP_VER2              0x00040000
-
-#define PCIE_NO_SNOOP_ALL (E1000_GCR_RXD_NO_SNOOP         | \
-                           E1000_GCR_RXDSCW_NO_SNOOP      | \
-                           E1000_GCR_RXDSCR_NO_SNOOP      | \
-                           E1000_GCR_TXD_NO_SNOOP         | \
-                           E1000_GCR_TXDSCW_NO_SNOOP      | \
-                           E1000_GCR_TXDSCR_NO_SNOOP)
-
-/* PHY Control Register */
-#define MII_CR_SPEED_SELECT_MSB 0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_COLL_TEST_ENABLE 0x0080  /* Collision test enable */
-#define MII_CR_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */
-#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */
-#define MII_CR_ISOLATE          0x0400  /* Isolate PHY from MII */
-#define MII_CR_POWER_DOWN       0x0800  /* Power down */
-#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */
-#define MII_CR_SPEED_SELECT_LSB 0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_LOOPBACK         0x4000  /* 0 = normal, 1 = loopback */
-#define MII_CR_RESET            0x8000  /* 0 = normal, 1 = PHY reset */
-#define MII_CR_SPEED_1000       0x0040
-#define MII_CR_SPEED_100        0x2000
-#define MII_CR_SPEED_10         0x0000
-
-/* PHY Status Register */
-#define MII_SR_EXTENDED_CAPS     0x0001 /* Extended register capabilities */
-#define MII_SR_JABBER_DETECT     0x0002 /* Jabber Detected */
-#define MII_SR_LINK_STATUS       0x0004 /* Link Status 1 = link */
-#define MII_SR_AUTONEG_CAPS      0x0008 /* Auto Neg Capable */
-#define MII_SR_REMOTE_FAULT      0x0010 /* Remote Fault Detect */
-#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
-#define MII_SR_PREAMBLE_SUPPRESS 0x0040 /* Preamble may be suppressed */
-#define MII_SR_EXTENDED_STATUS   0x0100 /* Ext. status info in Reg 0x0F */
-#define MII_SR_100T2_HD_CAPS     0x0200 /* 100T2 Half Duplex Capable */
-#define MII_SR_100T2_FD_CAPS     0x0400 /* 100T2 Full Duplex Capable */
-#define MII_SR_10T_HD_CAPS       0x0800 /* 10T   Half Duplex Capable */
-#define MII_SR_10T_FD_CAPS       0x1000 /* 10T   Full Duplex Capable */
-#define MII_SR_100X_HD_CAPS      0x2000 /* 100X  Half Duplex Capable */
-#define MII_SR_100X_FD_CAPS      0x4000 /* 100X  Full Duplex Capable */
-#define MII_SR_100T4_CAPS        0x8000 /* 100T4 Capable */
-
-/* Autoneg Advertisement Register */
-#define NWAY_AR_SELECTOR_FIELD   0x0001   /* indicates IEEE 802.3 CSMA/CD */
-#define NWAY_AR_10T_HD_CAPS      0x0020   /* 10T   Half Duplex Capable */
-#define NWAY_AR_10T_FD_CAPS      0x0040   /* 10T   Full Duplex Capable */
-#define NWAY_AR_100TX_HD_CAPS    0x0080   /* 100TX Half Duplex Capable */
-#define NWAY_AR_100TX_FD_CAPS    0x0100   /* 100TX Full Duplex Capable */
-#define NWAY_AR_100T4_CAPS       0x0200   /* 100T4 Capable */
-#define NWAY_AR_PAUSE            0x0400   /* Pause operation desired */
-#define NWAY_AR_ASM_DIR          0x0800   /* Asymmetric Pause Direction bit */
-#define NWAY_AR_REMOTE_FAULT     0x2000   /* Remote Fault detected */
-#define NWAY_AR_NEXT_PAGE        0x8000   /* Next Page ability supported */
-
-/* Link Partner Ability Register (Base Page) */
-#define NWAY_LPAR_SELECTOR_FIELD 0x0000 /* LP protocol selector field */
-#define NWAY_LPAR_10T_HD_CAPS    0x0020 /* LP is 10T   Half Duplex Capable */
-#define NWAY_LPAR_10T_FD_CAPS    0x0040 /* LP is 10T   Full Duplex Capable */
-#define NWAY_LPAR_100TX_HD_CAPS  0x0080 /* LP is 100TX Half Duplex Capable */
-#define NWAY_LPAR_100TX_FD_CAPS  0x0100 /* LP is 100TX Full Duplex Capable */
-#define NWAY_LPAR_100T4_CAPS     0x0200 /* LP is 100T4 Capable */
-#define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
-#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
-#define NWAY_LPAR_REMOTE_FAULT   0x2000 /* LP has detected Remote Fault */
-#define NWAY_LPAR_ACKNOWLEDGE    0x4000 /* LP has rx'd link code word */
-#define NWAY_LPAR_NEXT_PAGE      0x8000 /* Next Page ability supported */
-
-/* Autoneg Expansion Register */
-#define NWAY_ER_LP_NWAY_CAPS      0x0001 /* LP has Auto Neg Capability */
-#define NWAY_ER_PAGE_RXD          0x0002 /* LP is 10T   Half Duplex Capable */
-#define NWAY_ER_NEXT_PAGE_CAPS    0x0004 /* LP is 10T   Full Duplex Capable */
-#define NWAY_ER_LP_NEXT_PAGE_CAPS 0x0008 /* LP is 100TX Half Duplex Capable */
-#define NWAY_ER_PAR_DETECT_FAULT  0x0010 /* LP is 100TX Full Duplex Capable */
-
-/* 1000BASE-T Control Register */
-#define CR_1000T_ASYM_PAUSE      0x0080 /* Advertise asymmetric pause bit */
-#define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
-#define CR_1000T_FD_CAPS         0x0200 /* Advertise 1000T FD capability  */
-#define CR_1000T_REPEATER_DTE    0x0400 /* 1=Repeater/switch device port */
-                                        /* 0=DTE device */
-#define CR_1000T_MS_VALUE        0x0800 /* 1=Configure PHY as Master */
-                                        /* 0=Configure PHY as Slave */
-#define CR_1000T_MS_ENABLE      0x1000 /* 1=Master/Slave manual config value */
-                                        /* 0=Automatic Master/Slave config */
-#define CR_1000T_TEST_MODE_NORMAL 0x0000 /* Normal Operation */
-#define CR_1000T_TEST_MODE_1     0x2000 /* Transmit Waveform test */
-#define CR_1000T_TEST_MODE_2     0x4000 /* Master Transmit Jitter test */
-#define CR_1000T_TEST_MODE_3     0x6000 /* Slave Transmit Jitter test */
-#define CR_1000T_TEST_MODE_4     0x8000 /* Transmitter Distortion test */
-
-/* 1000BASE-T Status Register */
-#define SR_1000T_IDLE_ERROR_CNT   0x00FF /* Num idle errors since last read */
-#define SR_1000T_ASYM_PAUSE_DIR  0x0100 /* LP asymmetric pause direction bit */
-#define SR_1000T_LP_HD_CAPS       0x0400 /* LP is 1000T HD capable */
-#define SR_1000T_LP_FD_CAPS       0x0800 /* LP is 1000T FD capable */
-#define SR_1000T_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
-#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
-#define SR_1000T_MS_CONFIG_RES    0x4000 /* 1=Local Tx is Master, 0=Slave */
-#define SR_1000T_MS_CONFIG_FAULT  0x8000 /* Master/Slave config fault */
-
-#define SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT 5
-
-/* PHY 1000 MII Register/Bit Definitions */
-/* PHY Registers defined by IEEE */
-#define PHY_CONTROL      0x00 /* Control Register */
-#define PHY_STATUS       0x01 /* Status Register */
-#define PHY_ID1          0x02 /* Phy Id Reg (word 1) */
-#define PHY_ID2          0x03 /* Phy Id Reg (word 2) */
-#define PHY_AUTONEG_ADV  0x04 /* Autoneg Advertisement */
-#define PHY_LP_ABILITY   0x05 /* Link Partner Ability (Base Page) */
-#define PHY_AUTONEG_EXP  0x06 /* Autoneg Expansion Reg */
-#define PHY_NEXT_PAGE_TX 0x07 /* Next Page Tx */
-#define PHY_LP_NEXT_PAGE 0x08 /* Link Partner Next Page */
-#define PHY_1000T_CTRL   0x09 /* 1000Base-T Control Reg */
-#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */
-#define PHY_EXT_STATUS   0x0F /* Extended Status Reg */
-
-#define PHY_CONTROL_LB   0x4000 /* PHY Loopback bit */
-
-/* NVM Control */
-#define E1000_EECD_SK        0x00000001 /* NVM Clock */
-#define E1000_EECD_CS        0x00000002 /* NVM Chip Select */
-#define E1000_EECD_DI        0x00000004 /* NVM Data In */
-#define E1000_EECD_DO        0x00000008 /* NVM Data Out */
-#define E1000_EECD_FWE_MASK  0x00000030
-#define E1000_EECD_FWE_DIS   0x00000010 /* Disable FLASH writes */
-#define E1000_EECD_FWE_EN    0x00000020 /* Enable FLASH writes */
-#define E1000_EECD_FWE_SHIFT 4
-#define E1000_EECD_REQ       0x00000040 /* NVM Access Request */
-#define E1000_EECD_GNT       0x00000080 /* NVM Access Grant */
-#define E1000_EECD_PRES      0x00000100 /* NVM Present */
-#define E1000_EECD_SIZE      0x00000200 /* NVM Size (0=64 word 1=256 word) */
-/* NVM Addressing bits based on type 0=small, 1=large */
-#define E1000_EECD_ADDR_BITS 0x00000400
-#define E1000_EECD_TYPE      0x00002000 /* NVM Type (1-SPI, 0-Microwire) */
-#define E1000_NVM_GRANT_ATTEMPTS   1000 /* NVM # attempts to gain grant */
-#define E1000_EECD_AUTO_RD          0x00000200  /* NVM Auto Read done */
-#define E1000_EECD_SIZE_EX_MASK     0x00007800  /* NVM Size */
-#define E1000_EECD_SIZE_EX_SHIFT     11
-#define E1000_EECD_NVADDS    0x00018000 /* NVM Address Size */
-#define E1000_EECD_SELSHAD   0x00020000 /* Select Shadow RAM */
-#define E1000_EECD_INITSRAM  0x00040000 /* Initialize Shadow RAM */
-#define E1000_EECD_FLUPD     0x00080000 /* Update FLASH */
-#define E1000_EECD_AUPDEN    0x00100000 /* Enable Autonomous FLASH update */
-#define E1000_EECD_SHADV     0x00200000 /* Shadow RAM Data Valid */
-#define E1000_EECD_SEC1VAL   0x00400000 /* Sector One Valid */
-#define E1000_EECD_SECVAL_SHIFT      22
-#define E1000_EECD_SEC1VAL_VALID_MASK (E1000_EECD_AUTO_RD | E1000_EECD_PRES)
-
-#define E1000_NVM_SWDPIN0   0x0001   /* SWDPIN 0 NVM Value */
-#define E1000_NVM_LED_LOGIC 0x0020   /* Led Logic Word */
-#define E1000_NVM_RW_REG_DATA   16  /* Offset to data in NVM read/write regs */
-#define E1000_NVM_RW_REG_DONE   2    /* Offset to READ/WRITE done bit */
-#define E1000_NVM_RW_REG_START  1    /* Start operation */
-#define E1000_NVM_RW_ADDR_SHIFT 2    /* Shift to the address bits */
-#define E1000_NVM_POLL_WRITE    1    /* Flag for polling for write complete */
-#define E1000_NVM_POLL_READ     0    /* Flag for polling for read complete */
-#define E1000_FLASH_UPDATES  2000
-
-/* NVM Word Offsets */
-#define NVM_COMPAT                 0x0003
-#define NVM_ID_LED_SETTINGS        0x0004
-#define NVM_VERSION                0x0005
-#define NVM_SERDES_AMPLITUDE       0x0006 /* SERDES output amplitude */
-#define NVM_PHY_CLASS_WORD         0x0007
-#define NVM_INIT_CONTROL1_REG      0x000A
-#define NVM_INIT_CONTROL2_REG      0x000F
-#define NVM_SWDEF_PINS_CTRL_PORT_1 0x0010
-#define NVM_INIT_CONTROL3_PORT_B   0x0014
-#define NVM_INIT_3GIO_3            0x001A
-#define NVM_SWDEF_PINS_CTRL_PORT_0 0x0020
-#define NVM_INIT_CONTROL3_PORT_A   0x0024
-#define NVM_CFG                    0x0012
-#define NVM_FLASH_VERSION          0x0032
-#define NVM_ALT_MAC_ADDR_PTR       0x0037
-#define NVM_CHECKSUM_REG           0x003F
-
-#define E1000_NVM_CFG_DONE_PORT_0  0x040000 /* MNG config cycle done */
-#define E1000_NVM_CFG_DONE_PORT_1  0x080000 /* ...for second port */
-
-/* Mask bits for fields in Word 0x0f of the NVM */
-#define NVM_WORD0F_PAUSE_MASK       0x3000
-#define NVM_WORD0F_PAUSE            0x1000
-#define NVM_WORD0F_ASM_DIR          0x2000
-#define NVM_WORD0F_ANE              0x0800
-#define NVM_WORD0F_SWPDIO_EXT_MASK  0x00F0
-#define NVM_WORD0F_LPLU             0x0001
-
-/* Mask bits for fields in Word 0x1a of the NVM */
-#define NVM_WORD1A_ASPM_MASK  0x000C
-
-/* For checksumming, the sum of all words in the NVM should equal 0xBABA. */
-#define NVM_SUM                    0xBABA
-
-#define NVM_MAC_ADDR_OFFSET        0
-#define NVM_PBA_OFFSET_0           8
-#define NVM_PBA_OFFSET_1           9
-#define NVM_RESERVED_WORD          0xFFFF
-#define NVM_PHY_CLASS_A            0x8000
-#define NVM_SERDES_AMPLITUDE_MASK  0x000F
-#define NVM_SIZE_MASK              0x1C00
-#define NVM_SIZE_SHIFT             10
-#define NVM_WORD_SIZE_BASE_SHIFT   6
-#define NVM_SWDPIO_EXT_SHIFT       4
-
-/* NVM Commands - Microwire */
-#define NVM_READ_OPCODE_MICROWIRE  0x6  /* NVM read opcode */
-#define NVM_WRITE_OPCODE_MICROWIRE 0x5  /* NVM write opcode */
-#define NVM_ERASE_OPCODE_MICROWIRE 0x7  /* NVM erase opcode */
-#define NVM_EWEN_OPCODE_MICROWIRE  0x13 /* NVM erase/write enable */
-#define NVM_EWDS_OPCODE_MICROWIRE  0x10 /* NVM erase/write disable */
-
-/* NVM Commands - SPI */
-#define NVM_MAX_RETRY_SPI          5000 /* Max wait of 5ms, for RDY signal */
-#define NVM_READ_OPCODE_SPI        0x03 /* NVM read opcode */
-#define NVM_WRITE_OPCODE_SPI       0x02 /* NVM write opcode */
-#define NVM_A8_OPCODE_SPI          0x08 /* opcode bit-3 = address bit-8 */
-#define NVM_WREN_OPCODE_SPI        0x06 /* NVM set Write Enable latch */
-#define NVM_WRDI_OPCODE_SPI        0x04 /* NVM reset Write Enable latch */
-#define NVM_RDSR_OPCODE_SPI        0x05 /* NVM read Status register */
-#define NVM_WRSR_OPCODE_SPI        0x01 /* NVM write Status register */
-
-/* SPI NVM Status Register */
-#define NVM_STATUS_RDY_SPI         0x01
-#define NVM_STATUS_WEN_SPI         0x02
-#define NVM_STATUS_BP0_SPI         0x04
-#define NVM_STATUS_BP1_SPI         0x08
-#define NVM_STATUS_WPEN_SPI        0x80
-
-/* Word definitions for ID LED Settings */
-#define ID_LED_RESERVED_0000 0x0000
-#define ID_LED_RESERVED_FFFF 0xFFFF
-#define ID_LED_DEFAULT       ((ID_LED_OFF1_ON2  << 12) | \
-                              (ID_LED_OFF1_OFF2 <<  8) | \
-                              (ID_LED_DEF1_DEF2 <<  4) | \
-                              (ID_LED_DEF1_DEF2))
-#define ID_LED_DEF1_DEF2     0x1
-#define ID_LED_DEF1_ON2      0x2
-#define ID_LED_DEF1_OFF2     0x3
-#define ID_LED_ON1_DEF2      0x4
-#define ID_LED_ON1_ON2       0x5
-#define ID_LED_ON1_OFF2      0x6
-#define ID_LED_OFF1_DEF2     0x7
-#define ID_LED_OFF1_ON2      0x8
-#define ID_LED_OFF1_OFF2     0x9
-
-#define IGP_ACTIVITY_LED_MASK   0xFFFFF0FF
-#define IGP_ACTIVITY_LED_ENABLE 0x0300
-#define IGP_LED3_MODE           0x07000000
-
-/* PCI/PCI-X/PCI-EX Config space */
-#define PCIX_COMMAND_REGISTER        0xE6
-#define PCIX_STATUS_REGISTER_LO      0xE8
-#define PCIX_STATUS_REGISTER_HI      0xEA
-#define PCI_HEADER_TYPE_REGISTER     0x0E
-#define PCIE_LINK_STATUS             0x12
-#define PCIE_DEVICE_CONTROL2         0x28
-
-#define PCIX_COMMAND_MMRBC_MASK      0x000C
-#define PCIX_COMMAND_MMRBC_SHIFT     0x2
-#define PCIX_STATUS_HI_MMRBC_MASK    0x0060
-#define PCIX_STATUS_HI_MMRBC_SHIFT   0x5
-#define PCIX_STATUS_HI_MMRBC_4K      0x3
-#define PCIX_STATUS_HI_MMRBC_2K      0x2
-#define PCIX_STATUS_LO_FUNC_MASK     0x7
-#define PCI_HEADER_TYPE_MULTIFUNC    0x80
-#define PCIE_LINK_WIDTH_MASK         0x3F0
-#define PCIE_LINK_WIDTH_SHIFT        4
-#define PCIE_DEVICE_CONTROL2_16ms    0x0005
-
-#ifndef ETH_ADDR_LEN
-#define ETH_ADDR_LEN                 6
-#endif
-
-#define PHY_REVISION_MASK      0xFFFFFFF0
-#define MAX_PHY_REG_ADDRESS    0x1F  /* 5 bit address bus (0-0x1F) */
-#define MAX_PHY_MULTI_PAGE_REG 0xF
-
-/* Bit definitions for valid PHY IDs. */
-/*
- * I = Integrated
- * E = External
- */
-#define M88E1000_E_PHY_ID    0x01410C50
-#define M88E1000_I_PHY_ID    0x01410C30
-#define M88E1011_I_PHY_ID    0x01410C20
-#define IGP01E1000_I_PHY_ID  0x02A80380
-#define M88E1011_I_REV_4     0x04
-#define M88E1111_I_PHY_ID    0x01410CC0
-#define GG82563_E_PHY_ID     0x01410CA0
-#define IGP03E1000_E_PHY_ID  0x02A80390
-#define IFE_E_PHY_ID         0x02A80330
-#define IFE_PLUS_E_PHY_ID    0x02A80320
-#define IFE_C_E_PHY_ID       0x02A80310
-#define M88_VENDOR           0x0141
-
-/* M88E1000 Specific Registers */
-#define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */
-#define M88E1000_PHY_SPEC_STATUS   0x11  /* PHY Specific Status Register */
-#define M88E1000_INT_ENABLE        0x12  /* Interrupt Enable Register */
-#define M88E1000_INT_STATUS        0x13  /* Interrupt Status Register */
-#define M88E1000_EXT_PHY_SPEC_CTRL 0x14  /* Extended PHY Specific Control */
-#define M88E1000_RX_ERR_CNTR       0x15  /* Receive Error Counter */
-
-#define M88E1000_PHY_EXT_CTRL      0x1A  /* PHY extend control register */
-#define M88E1000_PHY_PAGE_SELECT   0x1D  /* Reg 29 for page number setting */
-#define M88E1000_PHY_GEN_CONTROL   0x1E  /* Its meaning depends on reg 29 */
-#define M88E1000_PHY_VCO_REG_BIT8  0x100 /* Bits 8 & 11 are adjusted for */
-#define M88E1000_PHY_VCO_REG_BIT11 0x800    /* improved BER performance */
-
-/* M88E1000 PHY Specific Control Register */
-#define M88E1000_PSCR_JABBER_DISABLE    0x0001 /* 1=Jabber Function disabled */
-#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reverse enabled */
-#define M88E1000_PSCR_SQE_TEST          0x0004 /* 1=SQE Test enabled */
-/* 1=CLK125 low, 0=CLK125 toggling */
-#define M88E1000_PSCR_CLK125_DISABLE    0x0010
-#define M88E1000_PSCR_MDI_MANUAL_MODE  0x0000 /* MDI Crossover Mode bits 6:5 */
-                                               /* Manual MDI configuration */
-#define M88E1000_PSCR_MDIX_MANUAL_MODE 0x0020  /* Manual MDIX configuration */
-/* 1000BASE-T: Auto crossover, 100BASE-TX/10BASE-T: MDI Mode */
-#define M88E1000_PSCR_AUTO_X_1000T     0x0040
-/* Auto crossover enabled all speeds */
-#define M88E1000_PSCR_AUTO_X_MODE      0x0060
-/*
- * 1=Enable Extended 10BASE-T distance (Lower 10BASE-T Rx Threshold
- * 0=Normal 10BASE-T Rx Threshold
- */
-#define M88E1000_PSCR_EN_10BT_EXT_DIST 0x0080
-/* 1=5-bit interface in 100BASE-TX, 0=MII interface in 100BASE-TX */
-#define M88E1000_PSCR_MII_5BIT_ENABLE      0x0100
-#define M88E1000_PSCR_SCRAMBLER_DISABLE    0x0200 /* 1=Scrambler disable */
-#define M88E1000_PSCR_FORCE_LINK_GOOD      0x0400 /* 1=Force link good */
-#define M88E1000_PSCR_ASSERT_CRS_ON_TX     0x0800 /* 1=Assert CRS on Tx */
-
-/* M88E1000 PHY Specific Status Register */
-#define M88E1000_PSSR_JABBER             0x0001 /* 1=Jabber */
-#define M88E1000_PSSR_REV_POLARITY       0x0002 /* 1=Polarity reversed */
-#define M88E1000_PSSR_DOWNSHIFT          0x0020 /* 1=Downshifted */
-#define M88E1000_PSSR_MDIX               0x0040 /* 1=MDIX; 0=MDI */
-/*
- * 0 = <50M
- * 1 = 50-80M
- * 2 = 80-110M
- * 3 = 110-140M
- * 4 = >140M
- */
-#define M88E1000_PSSR_CABLE_LENGTH       0x0380
-#define M88E1000_PSSR_LINK               0x0400 /* 1=Link up, 0=Link down */
-#define M88E1000_PSSR_SPD_DPLX_RESOLVED  0x0800 /* 1=Speed & Duplex resolved */
-#define M88E1000_PSSR_PAGE_RCVD          0x1000 /* 1=Page received */
-#define M88E1000_PSSR_DPLX               0x2000 /* 1=Duplex 0=Half Duplex */
-#define M88E1000_PSSR_SPEED              0xC000 /* Speed, bits 14:15 */
-#define M88E1000_PSSR_10MBS              0x0000 /* 00=10Mbs */
-#define M88E1000_PSSR_100MBS             0x4000 /* 01=100Mbs */
-#define M88E1000_PSSR_1000MBS            0x8000 /* 10=1000Mbs */
-
-#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
-
-/* M88E1000 Extended PHY Specific Control Register */
-#define M88E1000_EPSCR_FIBER_LOOPBACK 0x4000 /* 1=Fiber loopback */
-/*
- * 1 = Lost lock detect enabled.
- * Will assert lost lock and bring
- * link down if idle not seen
- * within 1ms in 1000BASE-T
- */
-#define M88E1000_EPSCR_DOWN_NO_IDLE   0x8000
-/*
- * Number of times we will attempt to autonegotiate before downshifting if we
- * are the master
- */
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK 0x0C00
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_1X   0x0000
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_2X   0x0400
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_3X   0x0800
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_4X   0x0C00
-/*
- * Number of times we will attempt to autonegotiate before downshifting if we
- * are the slave
- */
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK  0x0300
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_DIS   0x0000
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X    0x0100
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_2X    0x0200
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_3X    0x0300
-#define M88E1000_EPSCR_TX_CLK_2_5     0x0060 /* 2.5 MHz TX_CLK */
-#define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
-#define M88E1000_EPSCR_TX_CLK_0       0x0000 /* NO  TX_CLK */
-
-/* M88EC018 Rev 2 specific DownShift settings */
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK  0x0E00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_1X    0x0000
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_2X    0x0200
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_3X    0x0400
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_4X    0x0600
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_6X    0x0A00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_7X    0x0C00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_8X    0x0E00
-
-/*
- * Bits...
- * 15-5: page
- * 4-0: register offset
- */
-#define GG82563_PAGE_SHIFT        5
-#define GG82563_REG(page, reg)    \
-        (((page) << GG82563_PAGE_SHIFT) | ((reg) & MAX_PHY_REG_ADDRESS))
-#define GG82563_MIN_ALT_REG       30
-
-/* GG82563 Specific Registers */
-#define GG82563_PHY_SPEC_CTRL           \
-        GG82563_REG(0, 16) /* PHY Specific Control */
-#define GG82563_PHY_SPEC_STATUS         \
-        GG82563_REG(0, 17) /* PHY Specific Status */
-#define GG82563_PHY_INT_ENABLE          \
-        GG82563_REG(0, 18) /* Interrupt Enable */
-#define GG82563_PHY_SPEC_STATUS_2       \
-        GG82563_REG(0, 19) /* PHY Specific Status 2 */
-#define GG82563_PHY_RX_ERR_CNTR         \
-        GG82563_REG(0, 21) /* Receive Error Counter */
-#define GG82563_PHY_PAGE_SELECT         \
-        GG82563_REG(0, 22) /* Page Select */
-#define GG82563_PHY_SPEC_CTRL_2         \
-        GG82563_REG(0, 26) /* PHY Specific Control 2 */
-#define GG82563_PHY_PAGE_SELECT_ALT     \
-        GG82563_REG(0, 29) /* Alternate Page Select */
-#define GG82563_PHY_TEST_CLK_CTRL       \
-        GG82563_REG(0, 30) /* Test Clock Control (use reg. 29 to select) */
-
-#define GG82563_PHY_MAC_SPEC_CTRL       \
-        GG82563_REG(2, 21) /* MAC Specific Control Register */
-#define GG82563_PHY_MAC_SPEC_CTRL_2     \
-        GG82563_REG(2, 26) /* MAC Specific Control 2 */
-
-#define GG82563_PHY_DSP_DISTANCE    \
-        GG82563_REG(5, 26) /* DSP Distance */
-
-/* Page 193 - Port Control Registers */
-#define GG82563_PHY_KMRN_MODE_CTRL   \
-        GG82563_REG(193, 16) /* Kumeran Mode Control */
-#define GG82563_PHY_PORT_RESET          \
-        GG82563_REG(193, 17) /* Port Reset */
-#define GG82563_PHY_REVISION_ID         \
-        GG82563_REG(193, 18) /* Revision ID */
-#define GG82563_PHY_DEVICE_ID           \
-        GG82563_REG(193, 19) /* Device ID */
-#define GG82563_PHY_PWR_MGMT_CTRL       \
-        GG82563_REG(193, 20) /* Power Management Control */
-#define GG82563_PHY_RATE_ADAPT_CTRL     \
-        GG82563_REG(193, 25) /* Rate Adaptation Control */
-
-/* Page 194 - KMRN Registers */
-#define GG82563_PHY_KMRN_FIFO_CTRL_STAT \
-        GG82563_REG(194, 16) /* FIFO's Control/Status */
-#define GG82563_PHY_KMRN_CTRL           \
-        GG82563_REG(194, 17) /* Control */
-#define GG82563_PHY_INBAND_CTRL         \
-        GG82563_REG(194, 18) /* Inband Control */
-#define GG82563_PHY_KMRN_DIAGNOSTIC     \
-        GG82563_REG(194, 19) /* Diagnostic */
-#define GG82563_PHY_ACK_TIMEOUTS        \
-        GG82563_REG(194, 20) /* Acknowledge Timeouts */
-#define GG82563_PHY_ADV_ABILITY         \
-        GG82563_REG(194, 21) /* Advertised Ability */
-#define GG82563_PHY_LINK_PARTNER_ADV_ABILITY \
-        GG82563_REG(194, 23) /* Link Partner Advertised Ability */
-#define GG82563_PHY_ADV_NEXT_PAGE       \
-        GG82563_REG(194, 24) /* Advertised Next Page */
-#define GG82563_PHY_LINK_PARTNER_ADV_NEXT_PAGE \
-        GG82563_REG(194, 25) /* Link Partner Advertised Next page */
-#define GG82563_PHY_KMRN_MISC           \
-        GG82563_REG(194, 26) /* Misc. */
-
-/* MDI Control */
-#define E1000_MDIC_DATA_MASK 0x0000FFFF
-#define E1000_MDIC_REG_MASK  0x001F0000
-#define E1000_MDIC_REG_SHIFT 16
-#define E1000_MDIC_PHY_MASK  0x03E00000
-#define E1000_MDIC_PHY_SHIFT 21
-#define E1000_MDIC_OP_WRITE  0x04000000
-#define E1000_MDIC_OP_READ   0x08000000
-#define E1000_MDIC_READY     0x10000000
-#define E1000_MDIC_INT_EN    0x20000000
-#define E1000_MDIC_ERROR     0x40000000
-
-/* SerDes Control */
-#define E1000_GEN_CTL_READY             0x80000000
-#define E1000_GEN_CTL_ADDRESS_SHIFT     8
-#define E1000_GEN_POLL_TIMEOUT          640
-
-
-
-#endif /* _E1000_DEFINES_H_ */
diff --git a/src/drivers/net/e1000/e1000_hw.h b/src/drivers/net/e1000/e1000_hw.h
deleted file mode 100644 (file)
index 753f75e..0000000
+++ /dev/null
@@ -1,728 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000_HW_H_
-#define _E1000_HW_H_
-
-#include "e1000_osdep.h"
-#include "e1000_regs.h"
-#include "e1000_defines.h"
-
-struct e1000_hw;
-
-#define E1000_DEV_ID_82542                    0x1000
-#define E1000_DEV_ID_82543GC_FIBER            0x1001
-#define E1000_DEV_ID_82543GC_COPPER           0x1004
-#define E1000_DEV_ID_82544EI_COPPER           0x1008
-#define E1000_DEV_ID_82544EI_FIBER            0x1009
-#define E1000_DEV_ID_82544GC_COPPER           0x100C
-#define E1000_DEV_ID_82544GC_LOM              0x100D
-#define E1000_DEV_ID_82540EM                  0x100E
-#define E1000_DEV_ID_82540EM_LOM              0x1015
-#define E1000_DEV_ID_82540EP_LOM              0x1016
-#define E1000_DEV_ID_82540EP                  0x1017
-#define E1000_DEV_ID_82540EP_LP               0x101E
-#define E1000_DEV_ID_82545EM_COPPER           0x100F
-#define E1000_DEV_ID_82545EM_FIBER            0x1011
-#define E1000_DEV_ID_82545GM_COPPER           0x1026
-#define E1000_DEV_ID_82545GM_FIBER            0x1027
-#define E1000_DEV_ID_82545GM_SERDES           0x1028
-#define E1000_DEV_ID_82546EB_COPPER           0x1010
-#define E1000_DEV_ID_82546EB_FIBER            0x1012
-#define E1000_DEV_ID_82546EB_QUAD_COPPER      0x101D
-#define E1000_DEV_ID_82546GB_COPPER           0x1079
-#define E1000_DEV_ID_82546GB_FIBER            0x107A
-#define E1000_DEV_ID_82546GB_SERDES           0x107B
-#define E1000_DEV_ID_82546GB_PCIE             0x108A
-#define E1000_DEV_ID_82546GB_QUAD_COPPER      0x1099
-#define E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 0x10B5
-#define E1000_DEV_ID_82541EI                  0x1013
-#define E1000_DEV_ID_82541EI_MOBILE           0x1018
-#define E1000_DEV_ID_82541ER_LOM              0x1014
-#define E1000_DEV_ID_82541ER                  0x1078
-#define E1000_DEV_ID_82541GI                  0x1076
-#define E1000_DEV_ID_82541GI_LF               0x107C
-#define E1000_DEV_ID_82541GI_MOBILE           0x1077
-#define E1000_DEV_ID_82547EI                  0x1019
-#define E1000_DEV_ID_82547EI_MOBILE           0x101A
-#define E1000_DEV_ID_82547GI                  0x1075
-#define E1000_REVISION_0 0
-#define E1000_REVISION_1 1
-#define E1000_REVISION_2 2
-#define E1000_REVISION_3 3
-#define E1000_REVISION_4 4
-
-#define E1000_FUNC_0     0
-#define E1000_FUNC_1     1
-
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN0   0
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1   3
-
-enum e1000_mac_type {
-       e1000_undefined = 0,
-       e1000_82542,
-       e1000_82543,
-       e1000_82544,
-       e1000_82540,
-       e1000_82545,
-       e1000_82545_rev_3,
-       e1000_82546,
-       e1000_82546_rev_3,
-       e1000_82541,
-       e1000_82541_rev_2,
-       e1000_82547,
-       e1000_82547_rev_2,
-       e1000_num_macs  /* List is 1-based, so subtract 1 for true count. */
-};
-
-enum e1000_media_type {
-       e1000_media_type_unknown = 0,
-       e1000_media_type_copper = 1,
-       e1000_media_type_fiber = 2,
-       e1000_media_type_internal_serdes = 3,
-       e1000_num_media_types
-};
-
-enum e1000_nvm_type {
-       e1000_nvm_unknown = 0,
-       e1000_nvm_none,
-       e1000_nvm_eeprom_spi,
-       e1000_nvm_eeprom_microwire,
-       e1000_nvm_flash_hw,
-       e1000_nvm_flash_sw
-};
-
-enum e1000_nvm_override {
-       e1000_nvm_override_none = 0,
-       e1000_nvm_override_spi_small,
-       e1000_nvm_override_spi_large,
-       e1000_nvm_override_microwire_small,
-       e1000_nvm_override_microwire_large
-};
-
-enum e1000_phy_type {
-       e1000_phy_unknown = 0,
-       e1000_phy_none,
-       e1000_phy_m88,
-       e1000_phy_igp,
-       e1000_phy_igp_2,
-       e1000_phy_gg82563,
-       e1000_phy_igp_3,
-       e1000_phy_ife,
-};
-
-enum e1000_bus_type {
-       e1000_bus_type_unknown = 0,
-       e1000_bus_type_pci,
-       e1000_bus_type_pcix,
-       e1000_bus_type_pci_express,
-       e1000_bus_type_reserved
-};
-
-enum e1000_bus_speed {
-       e1000_bus_speed_unknown = 0,
-       e1000_bus_speed_33,
-       e1000_bus_speed_66,
-       e1000_bus_speed_100,
-       e1000_bus_speed_120,
-       e1000_bus_speed_133,
-       e1000_bus_speed_2500,
-       e1000_bus_speed_5000,
-       e1000_bus_speed_reserved
-};
-
-enum e1000_bus_width {
-       e1000_bus_width_unknown = 0,
-       e1000_bus_width_pcie_x1,
-       e1000_bus_width_pcie_x2,
-       e1000_bus_width_pcie_x4 = 4,
-       e1000_bus_width_pcie_x8 = 8,
-       e1000_bus_width_32,
-       e1000_bus_width_64,
-       e1000_bus_width_reserved
-};
-
-enum e1000_1000t_rx_status {
-       e1000_1000t_rx_status_not_ok = 0,
-       e1000_1000t_rx_status_ok,
-       e1000_1000t_rx_status_undefined = 0xFF
-};
-
-enum e1000_rev_polarity {
-       e1000_rev_polarity_normal = 0,
-       e1000_rev_polarity_reversed,
-       e1000_rev_polarity_undefined = 0xFF
-};
-
-enum e1000_fc_mode {
-       e1000_fc_none = 0,
-       e1000_fc_rx_pause,
-       e1000_fc_tx_pause,
-       e1000_fc_full,
-       e1000_fc_default = 0xFF
-};
-
-enum e1000_ffe_config {
-       e1000_ffe_config_enabled = 0,
-       e1000_ffe_config_active,
-       e1000_ffe_config_blocked
-};
-
-enum e1000_dsp_config {
-       e1000_dsp_config_disabled = 0,
-       e1000_dsp_config_enabled,
-       e1000_dsp_config_activated,
-       e1000_dsp_config_undefined = 0xFF
-};
-
-enum e1000_ms_type {
-       e1000_ms_hw_default = 0,
-       e1000_ms_force_master,
-       e1000_ms_force_slave,
-       e1000_ms_auto
-};
-
-enum e1000_smart_speed {
-       e1000_smart_speed_default = 0,
-       e1000_smart_speed_on,
-       e1000_smart_speed_off
-};
-
-enum e1000_serdes_link_state {
-       e1000_serdes_link_down = 0,
-       e1000_serdes_link_autoneg_progress,
-       e1000_serdes_link_autoneg_complete,
-       e1000_serdes_link_forced_up
-};
-
-/* Receive Descriptor */
-struct e1000_rx_desc {
-       __le64 buffer_addr; /* Address of the descriptor's data buffer */
-       __le16 length;      /* Length of data DMAed into data buffer */
-       __le16 csum;        /* Packet checksum */
-       u8  status;         /* Descriptor status */
-       u8  errors;         /* Descriptor Errors */
-       __le16 special;
-};
-
-/* Receive Descriptor - Extended */
-union e1000_rx_desc_extended {
-       struct {
-               __le64 buffer_addr;
-               __le64 reserved;
-       } read;
-       struct {
-               struct {
-                       __le32 mrq;           /* Multiple Rx Queues */
-                       union {
-                               __le32 rss;         /* RSS Hash */
-                               struct {
-                                       __le16 ip_id;  /* IP id */
-                                       __le16 csum;   /* Packet Checksum */
-                               } csum_ip;
-                       } hi_dword;
-               } lower;
-               struct {
-                       __le32 status_error;  /* ext status/error */
-                       __le16 length;
-                       __le16 vlan;          /* VLAN tag */
-               } upper;
-       } wb;  /* writeback */
-};
-
-#define MAX_PS_BUFFERS 4
-/* Receive Descriptor - Packet Split */
-union e1000_rx_desc_packet_split {
-       struct {
-               /* one buffer for protocol header(s), three data buffers */
-               __le64 buffer_addr[MAX_PS_BUFFERS];
-       } read;
-       struct {
-               struct {
-                       __le32 mrq;           /* Multiple Rx Queues */
-                       union {
-                               __le32 rss;           /* RSS Hash */
-                               struct {
-                                       __le16 ip_id;    /* IP id */
-                                       __le16 csum;     /* Packet Checksum */
-                               } csum_ip;
-                       } hi_dword;
-               } lower;
-               struct {
-                       __le32 status_error;  /* ext status/error */
-                       __le16 length0;       /* length of buffer 0 */
-                       __le16 vlan;          /* VLAN tag */
-               } middle;
-               struct {
-                       __le16 header_status;
-                       __le16 length[3];     /* length of buffers 1-3 */
-               } upper;
-               __le64 reserved;
-       } wb; /* writeback */
-};
-
-/* Transmit Descriptor */
-struct e1000_tx_desc {
-       __le64 buffer_addr;   /* Address of the descriptor's data buffer */
-       union {
-               __le32 data;
-               struct {
-                       __le16 length;    /* Data buffer length */
-                       u8 cso;           /* Checksum offset */
-                       u8 cmd;           /* Descriptor control */
-               } flags;
-       } lower;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;        /* Descriptor status */
-                       u8 css;           /* Checksum start */
-                       __le16 special;
-               } fields;
-       } upper;
-};
-
-/* Offload Context Descriptor */
-struct e1000_context_desc {
-       union {
-               __le32 ip_config;
-               struct {
-                       u8 ipcss;         /* IP checksum start */
-                       u8 ipcso;         /* IP checksum offset */
-                       __le16 ipcse;     /* IP checksum end */
-               } ip_fields;
-       } lower_setup;
-       union {
-               __le32 tcp_config;
-               struct {
-                       u8 tucss;         /* TCP checksum start */
-                       u8 tucso;         /* TCP checksum offset */
-                       __le16 tucse;     /* TCP checksum end */
-               } tcp_fields;
-       } upper_setup;
-       __le32 cmd_and_length;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;        /* Descriptor status */
-                       u8 hdr_len;       /* Header length */
-                       __le16 mss;       /* Maximum segment size */
-               } fields;
-       } tcp_seg_setup;
-};
-
-/* Offload data descriptor */
-struct e1000_data_desc {
-       __le64 buffer_addr;   /* Address of the descriptor's buffer address */
-       union {
-               __le32 data;
-               struct {
-                       __le16 length;    /* Data buffer length */
-                       u8 typ_len_ext;
-                       u8 cmd;
-               } flags;
-       } lower;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;        /* Descriptor status */
-                       u8 popts;         /* Packet Options */
-                       __le16 special;
-               } fields;
-       } upper;
-};
-
-/* Statistics counters collected by the MAC */
-struct e1000_hw_stats {
-       u64 crcerrs;
-       u64 algnerrc;
-       u64 symerrs;
-       u64 rxerrc;
-       u64 mpc;
-       u64 scc;
-       u64 ecol;
-       u64 mcc;
-       u64 latecol;
-       u64 colc;
-       u64 dc;
-       u64 tncrs;
-       u64 sec;
-       u64 cexterr;
-       u64 rlec;
-       u64 xonrxc;
-       u64 xontxc;
-       u64 xoffrxc;
-       u64 xofftxc;
-       u64 fcruc;
-       u64 prc64;
-       u64 prc127;
-       u64 prc255;
-       u64 prc511;
-       u64 prc1023;
-       u64 prc1522;
-       u64 gprc;
-       u64 bprc;
-       u64 mprc;
-       u64 gptc;
-       u64 gorc;
-       u64 gotc;
-       u64 rnbc;
-       u64 ruc;
-       u64 rfc;
-       u64 roc;
-       u64 rjc;
-       u64 mgprc;
-       u64 mgpdc;
-       u64 mgptc;
-       u64 tor;
-       u64 tot;
-       u64 tpr;
-       u64 tpt;
-       u64 ptc64;
-       u64 ptc127;
-       u64 ptc255;
-       u64 ptc511;
-       u64 ptc1023;
-       u64 ptc1522;
-       u64 mptc;
-       u64 bptc;
-       u64 tsctc;
-       u64 tsctfc;
-       u64 iac;
-       u64 icrxptc;
-       u64 icrxatc;
-       u64 ictxptc;
-       u64 ictxatc;
-       u64 ictxqec;
-       u64 ictxqmtc;
-       u64 icrxdmtc;
-       u64 icrxoc;
-       u64 cbtmpc;
-       u64 htdpmc;
-       u64 cbrdpc;
-       u64 cbrmpc;
-       u64 rpthc;
-       u64 hgptc;
-       u64 htcbdpc;
-       u64 hgorc;
-       u64 hgotc;
-       u64 lenerrs;
-       u64 scvpc;
-       u64 hrmpc;
-       u64 doosync;
-};
-
-
-struct e1000_phy_stats {
-       u32 idle_errors;
-       u32 receive_errors;
-};
-
-struct e1000_host_mng_dhcp_cookie {
-       u32 signature;
-       u8  status;
-       u8  reserved0;
-       u16 vlan_id;
-       u32 reserved1;
-       u16 reserved2;
-       u8  reserved3;
-       u8  checksum;
-};
-
-/* Host Interface "Rev 1" */
-struct e1000_host_command_header {
-       u8 command_id;
-       u8 command_length;
-       u8 command_options;
-       u8 checksum;
-};
-
-#define E1000_HI_MAX_DATA_LENGTH     252
-struct e1000_host_command_info {
-       struct e1000_host_command_header command_header;
-       u8 command_data[E1000_HI_MAX_DATA_LENGTH];
-};
-
-/* Host Interface "Rev 2" */
-struct e1000_host_mng_command_header {
-       u8  command_id;
-       u8  checksum;
-       u16 reserved1;
-       u16 reserved2;
-       u16 command_length;
-};
-
-#define E1000_HI_MAX_MNG_DATA_LENGTH 0x6F8
-struct e1000_host_mng_command_info {
-       struct e1000_host_mng_command_header command_header;
-       u8 command_data[E1000_HI_MAX_MNG_DATA_LENGTH];
-};
-
-#include "e1000_mac.h"
-#include "e1000_phy.h"
-#include "e1000_nvm.h"
-#include "e1000_manage.h"
-
-struct e1000_mac_operations {
-       /* Function pointers for the MAC. */
-       s32  (*init_params)(struct e1000_hw *);
-       s32  (*id_led_init)(struct e1000_hw *);
-       s32  (*blink_led)(struct e1000_hw *);
-       s32  (*check_for_link)(struct e1000_hw *);
-       bool (*check_mng_mode)(struct e1000_hw *hw);
-       s32  (*cleanup_led)(struct e1000_hw *);
-       void (*clear_hw_cntrs)(struct e1000_hw *);
-       void (*clear_vfta)(struct e1000_hw *);
-       s32  (*get_bus_info)(struct e1000_hw *);
-       void (*set_lan_id)(struct e1000_hw *);
-       s32  (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *);
-       s32  (*led_on)(struct e1000_hw *);
-       s32  (*led_off)(struct e1000_hw *);
-       void (*update_mc_addr_list)(struct e1000_hw *, u8 *, u32);
-       s32  (*reset_hw)(struct e1000_hw *);
-       s32  (*init_hw)(struct e1000_hw *);
-       s32  (*setup_link)(struct e1000_hw *);
-       s32  (*setup_physical_interface)(struct e1000_hw *);
-       s32  (*setup_led)(struct e1000_hw *);
-       void (*write_vfta)(struct e1000_hw *, u32, u32);
-       void (*mta_set)(struct e1000_hw *, u32);
-       void (*config_collision_dist)(struct e1000_hw *);
-       void (*rar_set)(struct e1000_hw *, u8*, u32);
-       s32  (*read_mac_addr)(struct e1000_hw *);
-       s32  (*validate_mdi_setting)(struct e1000_hw *);
-       s32  (*mng_host_if_write)(struct e1000_hw *, u8*, u16, u16, u8*);
-       s32  (*mng_write_cmd_header)(struct e1000_hw *hw,
-                      struct e1000_host_mng_command_header*);
-       s32  (*mng_enable_host_if)(struct e1000_hw *);
-       s32  (*wait_autoneg)(struct e1000_hw *);
-};
-
-struct e1000_phy_operations {
-       s32  (*init_params)(struct e1000_hw *);
-       s32  (*acquire)(struct e1000_hw *);
-       s32  (*check_polarity)(struct e1000_hw *);
-       s32  (*check_reset_block)(struct e1000_hw *);
-       s32  (*commit)(struct e1000_hw *);
-#if 0
-       s32  (*force_speed_duplex)(struct e1000_hw *);
-#endif
-       s32  (*get_cfg_done)(struct e1000_hw *hw);
-#if 0
-       s32  (*get_cable_length)(struct e1000_hw *);
-#endif
-       s32  (*get_info)(struct e1000_hw *);
-       s32  (*read_reg)(struct e1000_hw *, u32, u16 *);
-       void (*release)(struct e1000_hw *);
-       s32  (*reset)(struct e1000_hw *);
-       s32  (*set_d0_lplu_state)(struct e1000_hw *, bool);
-       s32  (*set_d3_lplu_state)(struct e1000_hw *, bool);
-       s32  (*write_reg)(struct e1000_hw *, u32, u16);
-       void (*power_up)(struct e1000_hw *);
-       void (*power_down)(struct e1000_hw *);
-};
-
-struct e1000_nvm_operations {
-       s32  (*init_params)(struct e1000_hw *);
-       s32  (*acquire)(struct e1000_hw *);
-       s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
-       void (*release)(struct e1000_hw *);
-       void (*reload)(struct e1000_hw *);
-       s32  (*update)(struct e1000_hw *);
-       s32  (*valid_led_default)(struct e1000_hw *, u16 *);
-       s32  (*validate)(struct e1000_hw *);
-       s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
-};
-
-struct e1000_mac_info {
-       struct e1000_mac_operations ops;
-       u8 addr[6];
-       u8 perm_addr[6];
-
-       enum e1000_mac_type type;
-
-       u32 collision_delta;
-       u32 ledctl_default;
-       u32 ledctl_mode1;
-       u32 ledctl_mode2;
-       u32 mc_filter_type;
-       u32 tx_packet_delta;
-       u32 txcw;
-
-       u16 current_ifs_val;
-       u16 ifs_max_val;
-       u16 ifs_min_val;
-       u16 ifs_ratio;
-       u16 ifs_step_size;
-       u16 mta_reg_count;
-
-       /* Maximum size of the MTA register table in all supported adapters */
-       #define MAX_MTA_REG 128
-       u32 mta_shadow[MAX_MTA_REG];
-       u16 rar_entry_count;
-
-       u8  forced_speed_duplex;
-
-       bool adaptive_ifs;
-       bool arc_subsystem_valid;
-       bool asf_firmware_present;
-       bool autoneg;
-       bool autoneg_failed;
-       bool get_link_status;
-       bool in_ifs_mode;
-       bool report_tx_early;
-       enum e1000_serdes_link_state serdes_link_state;
-       bool serdes_has_link;
-       bool tx_pkt_filtering;
-};
-
-struct e1000_phy_info {
-       struct e1000_phy_operations ops;
-       enum e1000_phy_type type;
-
-       enum e1000_1000t_rx_status local_rx;
-       enum e1000_1000t_rx_status remote_rx;
-       enum e1000_ms_type ms_type;
-       enum e1000_ms_type original_ms_type;
-       enum e1000_rev_polarity cable_polarity;
-       enum e1000_smart_speed smart_speed;
-
-       u32 addr;
-       u32 id;
-       u32 reset_delay_us; /* in usec */
-       u32 revision;
-
-       enum e1000_media_type media_type;
-
-       u16 autoneg_advertised;
-       u16 autoneg_mask;
-       u16 cable_length;
-       u16 max_cable_length;
-       u16 min_cable_length;
-
-       u8 mdix;
-
-       bool disable_polarity_correction;
-       bool is_mdix;
-       bool polarity_correction;
-       bool reset_disable;
-       bool speed_downgraded;
-       bool autoneg_wait_to_complete;
-};
-
-struct e1000_nvm_info {
-       struct e1000_nvm_operations ops;
-       enum e1000_nvm_type type;
-       enum e1000_nvm_override override;
-
-       u32 flash_bank_size;
-       u32 flash_base_addr;
-
-       u16 word_size;
-       u16 delay_usec;
-       u16 address_bits;
-       u16 opcode_bits;
-       u16 page_size;
-};
-
-struct e1000_bus_info {
-       enum e1000_bus_type type;
-       enum e1000_bus_speed speed;
-       enum e1000_bus_width width;
-
-       u16 func;
-       u16 pci_cmd_word;
-};
-
-struct e1000_fc_info {
-       u32 high_water;          /* Flow control high-water mark */
-       u32 low_water;           /* Flow control low-water mark */
-       u16 pause_time;          /* Flow control pause timer */
-       bool send_xon;           /* Flow control send XON */
-       bool strict_ieee;        /* Strict IEEE mode */
-       enum e1000_fc_mode current_mode; /* FC mode in effect */
-       enum e1000_fc_mode requested_mode; /* FC mode requested by caller */
-};
-
-struct e1000_dev_spec_82541 {
-       enum e1000_dsp_config dsp_config;
-       enum e1000_ffe_config ffe_config;
-       u16 spd_default;
-       bool phy_init_script;
-};
-
-struct e1000_dev_spec_82542 {
-       bool dma_fairness;
-};
-
-struct e1000_dev_spec_82543 {
-       u32  tbi_compatibility;
-       bool dma_fairness;
-       bool init_phy_disabled;
-};
-
-struct e1000_hw {
-       void *back;
-
-       u8 __iomem *hw_addr;
-       u8 __iomem *flash_address;
-       unsigned long io_base;
-
-       struct e1000_mac_info  mac;
-       struct e1000_fc_info   fc;
-       struct e1000_phy_info  phy;
-       struct e1000_nvm_info  nvm;
-       struct e1000_bus_info  bus;
-       struct e1000_host_mng_dhcp_cookie mng_cookie;
-
-       union {
-               struct e1000_dev_spec_82541     _82541;
-               struct e1000_dev_spec_82542     _82542;
-               struct e1000_dev_spec_82543     _82543;
-       } dev_spec;
-
-       u16 device_id;
-       u16 subsystem_vendor_id;
-       u16 subsystem_device_id;
-       u16 vendor_id;
-
-       u8  revision_id;
-};
-
-#include "e1000_82541.h"
-#include "e1000_82543.h"
-
-/* These functions must be implemented by drivers */
-void e1000_pci_clear_mwi(struct e1000_hw *hw);
-void e1000_pci_set_mwi(struct e1000_hw *hw);
-s32  e1000_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
-void e1000_read_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
-void e1000_write_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
-
-#endif
diff --git a/src/drivers/net/e1000/e1000_mac.c b/src/drivers/net/e1000/e1000_mac.c
deleted file mode 100644 (file)
index 2351387..0000000
+++ /dev/null
@@ -1,2196 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include "e1000_api.h"
-
-static s32 e1000_validate_mdi_setting_generic(struct e1000_hw *hw);
-static void e1000_set_lan_id_multi_port_pcie(struct e1000_hw *hw);
-
-/**
- *  e1000_init_mac_ops_generic - Initialize MAC function pointers
- *  @hw: pointer to the HW structure
- *
- *  Setups up the function pointers to no-op functions
- **/
-void e1000_init_mac_ops_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       DEBUGFUNC("e1000_init_mac_ops_generic");
-
-       /* General Setup */
-       mac->ops.init_params = e1000_null_ops_generic;
-       mac->ops.init_hw = e1000_null_ops_generic;
-       mac->ops.reset_hw = e1000_null_ops_generic;
-       mac->ops.setup_physical_interface = e1000_null_ops_generic;
-       mac->ops.get_bus_info = e1000_null_ops_generic;
-       mac->ops.set_lan_id = e1000_set_lan_id_multi_port_pcie;
-       mac->ops.read_mac_addr = e1000_read_mac_addr_generic;
-       mac->ops.config_collision_dist = e1000_config_collision_dist_generic;
-       mac->ops.clear_hw_cntrs = e1000_null_mac_generic;
-       /* LED */
-       mac->ops.cleanup_led = e1000_null_ops_generic;
-       mac->ops.setup_led = e1000_null_ops_generic;
-       mac->ops.blink_led = e1000_null_ops_generic;
-       mac->ops.led_on = e1000_null_ops_generic;
-       mac->ops.led_off = e1000_null_ops_generic;
-       /* LINK */
-       mac->ops.setup_link = e1000_null_ops_generic;
-       mac->ops.get_link_up_info = e1000_null_link_info;
-       mac->ops.check_for_link = e1000_null_ops_generic;
-       mac->ops.wait_autoneg = e1000_wait_autoneg_generic;
-#if 0
-       /* Management */
-       mac->ops.check_mng_mode = e1000_null_mng_mode;
-       mac->ops.mng_host_if_write = e1000_mng_host_if_write_generic;
-       mac->ops.mng_write_cmd_header = e1000_mng_write_cmd_header_generic;
-       mac->ops.mng_enable_host_if = e1000_mng_enable_host_if_generic;
-#endif
-       /* VLAN, MC, etc. */
-       mac->ops.update_mc_addr_list = e1000_null_update_mc;
-       mac->ops.clear_vfta = e1000_null_mac_generic;
-       mac->ops.write_vfta = e1000_null_write_vfta;
-       mac->ops.mta_set = e1000_null_mta_set;
-       mac->ops.rar_set = e1000_rar_set_generic;
-       mac->ops.validate_mdi_setting = e1000_validate_mdi_setting_generic;
-}
-
-/**
- *  e1000_null_ops_generic - No-op function, returns 0
- *  @hw: pointer to the HW structure
- **/
-s32 e1000_null_ops_generic(struct e1000_hw *hw __unused)
-{
-       DEBUGFUNC("e1000_null_ops_generic");
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_null_mac_generic - No-op function, return void
- *  @hw: pointer to the HW structure
- **/
-void e1000_null_mac_generic(struct e1000_hw *hw __unused)
-{
-       DEBUGFUNC("e1000_null_mac_generic");
-       return;
-}
-
-/**
- *  e1000_null_link_info - No-op function, return 0
- *  @hw: pointer to the HW structure
- **/
-s32 e1000_null_link_info(struct e1000_hw *hw __unused,
-                         u16 *s __unused, u16 *d __unused)
-{
-       DEBUGFUNC("e1000_null_link_info");
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_null_mng_mode - No-op function, return false
- *  @hw: pointer to the HW structure
- **/
-bool e1000_null_mng_mode(struct e1000_hw *hw __unused)
-{
-       DEBUGFUNC("e1000_null_mng_mode");
-       return false;
-}
-
-/**
- *  e1000_null_update_mc - No-op function, return void
- *  @hw: pointer to the HW structure
- **/
-void e1000_null_update_mc(struct e1000_hw *hw __unused,
-                          u8 *h __unused, u32 a __unused)
-{
-       DEBUGFUNC("e1000_null_update_mc");
-       return;
-}
-
-/**
- *  e1000_null_write_vfta - No-op function, return void
- *  @hw: pointer to the HW structure
- **/
-void e1000_null_write_vfta(struct e1000_hw *hw __unused,
-                           u32 a __unused, u32 b __unused)
-{
-       DEBUGFUNC("e1000_null_write_vfta");
-       return;
-}
-
-/**
- *  e1000_null_set_mta - No-op function, return void
- *  @hw: pointer to the HW structure
- **/
-void e1000_null_mta_set(struct e1000_hw *hw __unused, u32 a __unused)
-{
-       DEBUGFUNC("e1000_null_mta_set");
-       return;
-}
-
-/**
- *  e1000_null_rar_set - No-op function, return void
- *  @hw: pointer to the HW structure
- **/
-void e1000_null_rar_set(struct e1000_hw *hw __unused, u8 *h __unused,
-                        u32 a __unused)
-{
-       DEBUGFUNC("e1000_null_rar_set");
-       return;
-}
-
-/**
- *  e1000_get_bus_info_pci_generic - Get PCI(x) bus information
- *  @hw: pointer to the HW structure
- *
- *  Determines and stores the system bus information for a particular
- *  network interface.  The following bus information is determined and stored:
- *  bus speed, bus width, type (PCI/PCIx), and PCI(-x) function.
- **/
-s32 e1000_get_bus_info_pci_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_bus_info *bus = &hw->bus;
-       u32 status = E1000_READ_REG(hw, E1000_STATUS);
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_get_bus_info_pci_generic");
-
-       /* PCI or PCI-X? */
-       bus->type = (status & E1000_STATUS_PCIX_MODE)
-                       ? e1000_bus_type_pcix
-                       : e1000_bus_type_pci;
-
-       /* Bus speed */
-       if (bus->type == e1000_bus_type_pci) {
-               bus->speed = (status & E1000_STATUS_PCI66)
-                            ? e1000_bus_speed_66
-                            : e1000_bus_speed_33;
-       } else {
-               switch (status & E1000_STATUS_PCIX_SPEED) {
-               case E1000_STATUS_PCIX_SPEED_66:
-                       bus->speed = e1000_bus_speed_66;
-                       break;
-               case E1000_STATUS_PCIX_SPEED_100:
-                       bus->speed = e1000_bus_speed_100;
-                       break;
-               case E1000_STATUS_PCIX_SPEED_133:
-                       bus->speed = e1000_bus_speed_133;
-                       break;
-               default:
-                       bus->speed = e1000_bus_speed_reserved;
-                       break;
-               }
-       }
-
-       /* Bus width */
-       bus->width = (status & E1000_STATUS_BUS64)
-                    ? e1000_bus_width_64
-                    : e1000_bus_width_32;
-
-       /* Which PCI(-X) function? */
-       mac->ops.set_lan_id(hw);
-
-       return ret_val;
-#endif
-       return 0;
-}
-
-/**
- *  e1000_get_bus_info_pcie_generic - Get PCIe bus information
- *  @hw: pointer to the HW structure
- *
- *  Determines and stores the system bus information for a particular
- *  network interface.  The following bus information is determined and stored:
- *  bus speed, bus width, type (PCIe), and PCIe function.
- **/
-s32 e1000_get_bus_info_pcie_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_bus_info *bus = &hw->bus;
-
-       s32 ret_val;
-       u16 pcie_link_status;
-
-       DEBUGFUNC("e1000_get_bus_info_pcie_generic");
-
-       bus->type = e1000_bus_type_pci_express;
-       bus->speed = e1000_bus_speed_2500;
-
-       ret_val = e1000_read_pcie_cap_reg(hw,
-                                         PCIE_LINK_STATUS,
-                                         &pcie_link_status);
-       if (ret_val)
-               bus->width = e1000_bus_width_unknown;
-       else
-               bus->width = (enum e1000_bus_width)((pcie_link_status &
-                                               PCIE_LINK_WIDTH_MASK) >>
-                                              PCIE_LINK_WIDTH_SHIFT);
-
-       mac->ops.set_lan_id(hw);
-
-       return E1000_SUCCESS;
-#endif
-       return 0;
-}
-
-/**
- *  e1000_set_lan_id_multi_port_pcie - Set LAN id for PCIe multiple port devices
- *
- *  @hw: pointer to the HW structure
- *
- *  Determines the LAN function id by reading memory-mapped registers
- *  and swaps the port value if requested.
- **/
-static void e1000_set_lan_id_multi_port_pcie(struct e1000_hw *hw)
-{
-       struct e1000_bus_info *bus = &hw->bus;
-       u32 reg;
-
-       /*
-        * The status register reports the correct function number
-        * for the device regardless of function swap state.
-        */
-       reg = E1000_READ_REG(hw, E1000_STATUS);
-       bus->func = (reg & E1000_STATUS_FUNC_MASK) >> E1000_STATUS_FUNC_SHIFT;
-}
-
-/**
- *  e1000_set_lan_id_multi_port_pci - Set LAN id for PCI multiple port devices
- *  @hw: pointer to the HW structure
- *
- *  Determines the LAN function id by reading PCI config space.
- **/
-void e1000_set_lan_id_multi_port_pci(struct e1000_hw *hw)
-{
-       struct e1000_bus_info *bus = &hw->bus;
-       u16 pci_header_type;
-       u32 status;
-
-       e1000_read_pci_cfg(hw, PCI_HEADER_TYPE_REGISTER, &pci_header_type);
-       if (pci_header_type & PCI_HEADER_TYPE_MULTIFUNC) {
-               status = E1000_READ_REG(hw, E1000_STATUS);
-               bus->func = (status & E1000_STATUS_FUNC_MASK)
-                           >> E1000_STATUS_FUNC_SHIFT;
-       } else {
-               bus->func = 0;
-       }
-}
-
-/**
- *  e1000_set_lan_id_single_port - Set LAN id for a single port device
- *  @hw: pointer to the HW structure
- *
- *  Sets the LAN function id to zero for a single port device.
- **/
-void e1000_set_lan_id_single_port(struct e1000_hw *hw)
-{
-       struct e1000_bus_info *bus = &hw->bus;
-
-       bus->func = 0;
-}
-
-/**
- *  e1000_clear_vfta_generic - Clear VLAN filter table
- *  @hw: pointer to the HW structure
- *
- *  Clears the register array which contains the VLAN filter table by
- *  setting all the values to 0.
- **/
-void e1000_clear_vfta_generic(struct e1000_hw *hw)
-{
-       u32 offset;
-
-       DEBUGFUNC("e1000_clear_vfta_generic");
-
-       for (offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++) {
-               E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, offset, 0);
-               E1000_WRITE_FLUSH(hw);
-       }
-}
-
-/**
- *  e1000_write_vfta_generic - Write value to VLAN filter table
- *  @hw: pointer to the HW structure
- *  @offset: register offset in VLAN filter table
- *  @value: register value written to VLAN filter table
- *
- *  Writes value at the given offset in the register array which stores
- *  the VLAN filter table.
- **/
-void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value)
-{
-       DEBUGFUNC("e1000_write_vfta_generic");
-
-       E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, offset, value);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- *  e1000_init_rx_addrs_generic - Initialize receive address's
- *  @hw: pointer to the HW structure
- *  @rar_count: receive address registers
- *
- *  Setups the receive address registers by setting the base receive address
- *  register to the devices MAC address and clearing all the other receive
- *  address registers to 0.
- **/
-void e1000_init_rx_addrs_generic(struct e1000_hw *hw, u16 rar_count)
-{
-       u32 i;
-       u8 mac_addr[ETH_ADDR_LEN] = {0};
-
-       DEBUGFUNC("e1000_init_rx_addrs_generic");
-
-       /* Setup the receive address */
-       DEBUGOUT("Programming MAC Address into RAR[0]\n");
-
-       hw->mac.ops.rar_set(hw, hw->mac.addr, 0);
-
-       /* Zero out the other (rar_entry_count - 1) receive addresses */
-       DEBUGOUT1("Clearing RAR[1-%u]\n", rar_count-1);
-       for (i = 1; i < rar_count; i++)
-               hw->mac.ops.rar_set(hw, mac_addr, i);
-}
-
-/**
- *  e1000_check_alt_mac_addr_generic - Check for alternate MAC addr
- *  @hw: pointer to the HW structure
- *
- *  Checks the nvm for an alternate MAC address.  An alternate MAC address
- *  can be setup by pre-boot software and must be treated like a permanent
- *  address and must override the actual permanent MAC address. If an
- *  alternate MAC address is found it is programmed into RAR0, replacing
- *  the permanent address that was installed into RAR0 by the Si on reset.
- *  This function will return SUCCESS unless it encounters an error while
- *  reading the EEPROM.
- **/
-s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
-{
-       u32 i;
-       s32 ret_val = E1000_SUCCESS;
-       u16 offset, nvm_alt_mac_addr_offset, nvm_data;
-       u8 alt_mac_addr[ETH_ADDR_LEN];
-
-       DEBUGFUNC("e1000_check_alt_mac_addr_generic");
-
-       ret_val = hw->nvm.ops.read(hw, NVM_ALT_MAC_ADDR_PTR, 1,
-                                &nvm_alt_mac_addr_offset);
-       if (ret_val) {
-               DEBUGOUT("NVM Read Error\n");
-               goto out;
-       }
-
-       if (nvm_alt_mac_addr_offset == 0xFFFF) {
-               /* There is no Alternate MAC Address */
-               goto out;
-       }
-
-       if (hw->bus.func == E1000_FUNC_1)
-               nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN1;
-       for (i = 0; i < ETH_ADDR_LEN; i += 2) {
-               offset = nvm_alt_mac_addr_offset + (i >> 1);
-               ret_val = hw->nvm.ops.read(hw, offset, 1, &nvm_data);
-               if (ret_val) {
-                       DEBUGOUT("NVM Read Error\n");
-                       goto out;
-               }
-
-               alt_mac_addr[i] = (u8)(nvm_data & 0xFF);
-               alt_mac_addr[i + 1] = (u8)(nvm_data >> 8);
-       }
-
-       /* if multicast bit is set, the alternate address will not be used */
-       if (alt_mac_addr[0] & 0x01) {
-               DEBUGOUT("Ignoring Alternate Mac Address with MC bit set\n");
-               goto out;
-       }
-
-       /*
-        * We have a valid alternate MAC address, and we want to treat it the
-        * same as the normal permanent MAC address stored by the HW into the
-        * RAR. Do this by mapping this address into RAR0.
-        */
-       hw->mac.ops.rar_set(hw, alt_mac_addr, 0);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_rar_set_generic - Set receive address register
- *  @hw: pointer to the HW structure
- *  @addr: pointer to the receive address
- *  @index: receive address array register
- *
- *  Sets the receive address array register at index to the address passed
- *  in by addr.
- **/
-void e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index)
-{
-       u32 rar_low, rar_high;
-
-       DEBUGFUNC("e1000_rar_set_generic");
-
-       /*
-        * HW expects these in little endian so we reverse the byte order
-        * from network order (big endian) to little endian
-        */
-       rar_low = ((u32) addr[0] |
-                  ((u32) addr[1] << 8) |
-                  ((u32) addr[2] << 16) | ((u32) addr[3] << 24));
-
-       rar_high = ((u32) addr[4] | ((u32) addr[5] << 8));
-
-       /* If MAC address zero, no need to set the AV bit */
-       if (rar_low || rar_high)
-               rar_high |= E1000_RAH_AV;
-
-       /*
-        * Some bridges will combine consecutive 32-bit writes into
-        * a single burst write, which will malfunction on some parts.
-        * The flushes avoid this.
-        */
-       E1000_WRITE_REG(hw, E1000_RAL(index), rar_low);
-       E1000_WRITE_FLUSH(hw);
-       E1000_WRITE_REG(hw, E1000_RAH(index), rar_high);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- *  e1000_mta_set_generic - Set multicast filter table address
- *  @hw: pointer to the HW structure
- *  @hash_value: determines the MTA register and bit to set
- *
- *  The multicast table address is a register array of 32-bit registers.
- *  The hash_value is used to determine what register the bit is in, the
- *  current value is read, the new bit is OR'd in and the new value is
- *  written back into the register.
- **/
-void e1000_mta_set_generic(struct e1000_hw *hw, u32 hash_value)
-{
-       u32 hash_bit, hash_reg, mta;
-
-       DEBUGFUNC("e1000_mta_set_generic");
-       /*
-        * The MTA is a register array of 32-bit registers. It is
-        * treated like an array of (32*mta_reg_count) bits.  We want to
-        * set bit BitArray[hash_value]. So we figure out what register
-        * the bit is in, read it, OR in the new bit, then write
-        * back the new value.  The (hw->mac.mta_reg_count - 1) serves as a
-        * mask to bits 31:5 of the hash value which gives us the
-        * register we're modifying.  The hash bit within that register
-        * is determined by the lower 5 bits of the hash value.
-        */
-       hash_reg = (hash_value >> 5) & (hw->mac.mta_reg_count - 1);
-       hash_bit = hash_value & 0x1F;
-
-       mta = E1000_READ_REG_ARRAY(hw, E1000_MTA, hash_reg);
-
-       mta |= (1 << hash_bit);
-
-       E1000_WRITE_REG_ARRAY(hw, E1000_MTA, hash_reg, mta);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- *  e1000_update_mc_addr_list_generic - Update Multicast addresses
- *  @hw: pointer to the HW structure
- *  @mc_addr_list: array of multicast addresses to program
- *  @mc_addr_count: number of multicast addresses to program
- *
- *  Updates entire Multicast Table Array.
- *  The caller must have a packed mc_addr_list of multicast addresses.
- **/
-void e1000_update_mc_addr_list_generic(struct e1000_hw *hw,
-                                       u8 *mc_addr_list, u32 mc_addr_count)
-{
-       u32 hash_value, hash_bit, hash_reg;
-       int i;
-
-       DEBUGFUNC("e1000_update_mc_addr_list_generic");
-
-       /* clear mta_shadow */
-       memset(&hw->mac.mta_shadow, 0, sizeof(hw->mac.mta_shadow));
-
-       /* update mta_shadow from mc_addr_list */
-       for (i = 0; (u32) i < mc_addr_count; i++) {
-               hash_value = e1000_hash_mc_addr_generic(hw, mc_addr_list);
-
-               hash_reg = (hash_value >> 5) & (hw->mac.mta_reg_count - 1);
-               hash_bit = hash_value & 0x1F;
-
-               hw->mac.mta_shadow[hash_reg] |= (1 << hash_bit);
-               mc_addr_list += (ETH_ADDR_LEN);
-       }
-
-       /* replace the entire MTA table */
-       for (i = hw->mac.mta_reg_count - 1; i >= 0; i--)
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, hw->mac.mta_shadow[i]);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- *  e1000_hash_mc_addr_generic - Generate a multicast hash value
- *  @hw: pointer to the HW structure
- *  @mc_addr: pointer to a multicast address
- *
- *  Generates a multicast address hash value which is used to determine
- *  the multicast filter table array address and new table value.  See
- *  e1000_mta_set_generic()
- **/
-u32 e1000_hash_mc_addr_generic(struct e1000_hw *hw, u8 *mc_addr)
-{
-       u32 hash_value, hash_mask;
-       u8 bit_shift = 0;
-
-       DEBUGFUNC("e1000_hash_mc_addr_generic");
-
-       /* Register count multiplied by bits per register */
-       hash_mask = (hw->mac.mta_reg_count * 32) - 1;
-
-       /*
-        * For a mc_filter_type of 0, bit_shift is the number of left-shifts
-        * where 0xFF would still fall within the hash mask.
-        */
-       while (hash_mask >> bit_shift != 0xFF)
-               bit_shift++;
-
-       /*
-        * The portion of the address that is used for the hash table
-        * is determined by the mc_filter_type setting.
-        * The algorithm is such that there is a total of 8 bits of shifting.
-        * The bit_shift for a mc_filter_type of 0 represents the number of
-        * left-shifts where the MSB of mc_addr[5] would still fall within
-        * the hash_mask.  Case 0 does this exactly.  Since there are a total
-        * of 8 bits of shifting, then mc_addr[4] will shift right the
-        * remaining number of bits. Thus 8 - bit_shift.  The rest of the
-        * cases are a variation of this algorithm...essentially raising the
-        * number of bits to shift mc_addr[5] left, while still keeping the
-        * 8-bit shifting total.
-        *
-        * For example, given the following Destination MAC Address and an
-        * mta register count of 128 (thus a 4096-bit vector and 0xFFF mask),
-        * we can see that the bit_shift for case 0 is 4.  These are the hash
-        * values resulting from each mc_filter_type...
-        * [0] [1] [2] [3] [4] [5]
-        * 01  AA  00  12  34  56
-        * LSB                 MSB
-        *
-        * case 0: hash_value = ((0x34 >> 4) | (0x56 << 4)) & 0xFFF = 0x563
-        * case 1: hash_value = ((0x34 >> 3) | (0x56 << 5)) & 0xFFF = 0xAC6
-        * case 2: hash_value = ((0x34 >> 2) | (0x56 << 6)) & 0xFFF = 0x163
-        * case 3: hash_value = ((0x34 >> 0) | (0x56 << 8)) & 0xFFF = 0x634
-        */
-       switch (hw->mac.mc_filter_type) {
-       default:
-       case 0:
-               break;
-       case 1:
-               bit_shift += 1;
-               break;
-       case 2:
-               bit_shift += 2;
-               break;
-       case 3:
-               bit_shift += 4;
-               break;
-       }
-
-       hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) |
-                                 (((u16) mc_addr[5]) << bit_shift)));
-
-       return hash_value;
-}
-
-/**
- *  e1000_pcix_mmrbc_workaround_generic - Fix incorrect MMRBC value
- *  @hw: pointer to the HW structure
- *
- *  In certain situations, a system BIOS may report that the PCIx maximum
- *  memory read byte count (MMRBC) value is higher than than the actual
- *  value. We check the PCIx command register with the current PCIx status
- *  register.
- **/
-void e1000_pcix_mmrbc_workaround_generic(struct e1000_hw *hw)
-{
-       u16 cmd_mmrbc;
-       u16 pcix_cmd;
-       u16 pcix_stat_hi_word;
-       u16 stat_mmrbc;
-
-       DEBUGFUNC("e1000_pcix_mmrbc_workaround_generic");
-
-       /* Workaround for PCI-X issue when BIOS sets MMRBC incorrectly */
-       if (hw->bus.type != e1000_bus_type_pcix)
-               return;
-
-       e1000_read_pci_cfg(hw, PCIX_COMMAND_REGISTER, &pcix_cmd);
-       e1000_read_pci_cfg(hw, PCIX_STATUS_REGISTER_HI, &pcix_stat_hi_word);
-       cmd_mmrbc = (pcix_cmd & PCIX_COMMAND_MMRBC_MASK) >>
-                    PCIX_COMMAND_MMRBC_SHIFT;
-       stat_mmrbc = (pcix_stat_hi_word & PCIX_STATUS_HI_MMRBC_MASK) >>
-                     PCIX_STATUS_HI_MMRBC_SHIFT;
-       if (stat_mmrbc == PCIX_STATUS_HI_MMRBC_4K)
-               stat_mmrbc = PCIX_STATUS_HI_MMRBC_2K;
-       if (cmd_mmrbc > stat_mmrbc) {
-               pcix_cmd &= ~PCIX_COMMAND_MMRBC_MASK;
-               pcix_cmd |= stat_mmrbc << PCIX_COMMAND_MMRBC_SHIFT;
-               e1000_write_pci_cfg(hw, PCIX_COMMAND_REGISTER, &pcix_cmd);
-       }
-}
-
-/**
- *  e1000_clear_hw_cntrs_base_generic - Clear base hardware counters
- *  @hw: pointer to the HW structure
- *
- *  Clears the base hardware counters by reading the counter registers.
- **/
-void e1000_clear_hw_cntrs_base_generic(struct e1000_hw *hw __unused)
-{
-       DEBUGFUNC("e1000_clear_hw_cntrs_base_generic");
-
-#if 0
-       E1000_READ_REG(hw, E1000_CRCERRS);
-       E1000_READ_REG(hw, E1000_SYMERRS);
-       E1000_READ_REG(hw, E1000_MPC);
-       E1000_READ_REG(hw, E1000_SCC);
-       E1000_READ_REG(hw, E1000_ECOL);
-       E1000_READ_REG(hw, E1000_MCC);
-       E1000_READ_REG(hw, E1000_LATECOL);
-       E1000_READ_REG(hw, E1000_COLC);
-       E1000_READ_REG(hw, E1000_DC);
-       E1000_READ_REG(hw, E1000_SEC);
-       E1000_READ_REG(hw, E1000_RLEC);
-       E1000_READ_REG(hw, E1000_XONRXC);
-       E1000_READ_REG(hw, E1000_XONTXC);
-       E1000_READ_REG(hw, E1000_XOFFRXC);
-       E1000_READ_REG(hw, E1000_XOFFTXC);
-       E1000_READ_REG(hw, E1000_FCRUC);
-       E1000_READ_REG(hw, E1000_GPRC);
-       E1000_READ_REG(hw, E1000_BPRC);
-       E1000_READ_REG(hw, E1000_MPRC);
-       E1000_READ_REG(hw, E1000_GPTC);
-       E1000_READ_REG(hw, E1000_GORCL);
-       E1000_READ_REG(hw, E1000_GORCH);
-       E1000_READ_REG(hw, E1000_GOTCL);
-       E1000_READ_REG(hw, E1000_GOTCH);
-       E1000_READ_REG(hw, E1000_RNBC);
-       E1000_READ_REG(hw, E1000_RUC);
-       E1000_READ_REG(hw, E1000_RFC);
-       E1000_READ_REG(hw, E1000_ROC);
-       E1000_READ_REG(hw, E1000_RJC);
-       E1000_READ_REG(hw, E1000_TORL);
-       E1000_READ_REG(hw, E1000_TORH);
-       E1000_READ_REG(hw, E1000_TOTL);
-       E1000_READ_REG(hw, E1000_TOTH);
-       E1000_READ_REG(hw, E1000_TPR);
-       E1000_READ_REG(hw, E1000_TPT);
-       E1000_READ_REG(hw, E1000_MPTC);
-       E1000_READ_REG(hw, E1000_BPTC);
-#endif
-}
-
-/**
- *  e1000_check_for_copper_link_generic - Check for link (Copper)
- *  @hw: pointer to the HW structure
- *
- *  Checks to see of the link status of the hardware has changed.  If a
- *  change in link status has been detected, then we read the PHY registers
- *  to get the current speed/duplex if link exists.
- **/
-s32 e1000_check_for_copper_link_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val;
-       bool link;
-
-       DEBUGFUNC("e1000_check_for_copper_link");
-
-       /*
-        * We only want to go out to the PHY registers to see if Auto-Neg
-        * has completed and/or if our link status has changed.  The
-        * get_link_status flag is set upon receiving a Link Status
-        * Change or Rx Sequence Error interrupt.
-        */
-       if (!mac->get_link_status) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       /*
-        * First we want to see if the MII Status Register reports
-        * link.  If so, then we want to get the current speed/duplex
-        * of the PHY.
-        */
-       ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link)
-               goto out; /* No link detected */
-
-       mac->get_link_status = false;
-
-       /*
-        * Check if there was DownShift, must be checked
-        * immediately after link-up
-        */
-       e1000_check_downshift_generic(hw);
-
-       /*
-        * If we are forcing speed/duplex, then we simply return since
-        * we have already determined whether we have link or not.
-        */
-       if (!mac->autoneg) {
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       /*
-        * Auto-Neg is enabled.  Auto Speed Detection takes care
-        * of MAC speed/duplex configuration.  So we only need to
-        * configure Collision Distance in the MAC.
-        */
-       e1000_config_collision_dist_generic(hw);
-
-       /*
-        * Configure Flow Control now that Auto-Neg has completed.
-        * First, we need to restore the desired flow control
-        * settings because we may have had to re-autoneg with a
-        * different link partner.
-        */
-       ret_val = e1000_config_fc_after_link_up_generic(hw);
-       if (ret_val)
-               DEBUGOUT("Error configuring flow control\n");
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_check_for_fiber_link_generic - Check for link (Fiber)
- *  @hw: pointer to the HW structure
- *
- *  Checks for link up on the hardware.  If link is not up and we have
- *  a signal, then we need to force link up.
- **/
-s32 e1000_check_for_fiber_link_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 rxcw;
-       u32 ctrl;
-       u32 status;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_check_for_fiber_link_generic");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       status = E1000_READ_REG(hw, E1000_STATUS);
-       rxcw = E1000_READ_REG(hw, E1000_RXCW);
-
-       /*
-        * If we don't have link (auto-negotiation failed or link partner
-        * cannot auto-negotiate), the cable is plugged in (we have signal),
-        * and our link partner is not trying to auto-negotiate with us (we
-        * are receiving idles or data), we need to force link up. We also
-        * need to give auto-negotiation time to complete, in case the cable
-        * was just plugged in. The autoneg_failed flag does this.
-        */
-       /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
-       if ((ctrl & E1000_CTRL_SWDPIN1) && (!(status & E1000_STATUS_LU)) &&
-           (!(rxcw & E1000_RXCW_C))) {
-               if (mac->autoneg_failed == 0) {
-                       mac->autoneg_failed = 1;
-                       goto out;
-               }
-               DEBUGOUT("NOT RXing /C/, disable AutoNeg and force link.\n");
-
-               /* Disable auto-negotiation in the TXCW register */
-               E1000_WRITE_REG(hw, E1000_TXCW, (mac->txcw & ~E1000_TXCW_ANE));
-
-               /* Force link-up and also force full-duplex. */
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FD);
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-               /* Configure Flow Control after forcing link up. */
-               ret_val = e1000_config_fc_after_link_up_generic(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error configuring flow control\n");
-                       goto out;
-               }
-       } else if ((ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
-               /*
-                * If we are forcing link and we are receiving /C/ ordered
-                * sets, re-enable auto-negotiation in the TXCW register
-                * and disable forced link in the Device Control register
-                * in an attempt to auto-negotiate with our link partner.
-                */
-               DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\n");
-               E1000_WRITE_REG(hw, E1000_TXCW, mac->txcw);
-               E1000_WRITE_REG(hw, E1000_CTRL, (ctrl & ~E1000_CTRL_SLU));
-
-               mac->serdes_has_link = true;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_check_for_serdes_link_generic - Check for link (Serdes)
- *  @hw: pointer to the HW structure
- *
- *  Checks for link up on the hardware.  If link is not up and we have
- *  a signal, then we need to force link up.
- **/
-s32 e1000_check_for_serdes_link_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 rxcw;
-       u32 ctrl;
-       u32 status;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_check_for_serdes_link_generic");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       status = E1000_READ_REG(hw, E1000_STATUS);
-       rxcw = E1000_READ_REG(hw, E1000_RXCW);
-
-       /*
-        * If we don't have link (auto-negotiation failed or link partner
-        * cannot auto-negotiate), and our link partner is not trying to
-        * auto-negotiate with us (we are receiving idles or data),
-        * we need to force link up. We also need to give auto-negotiation
-        * time to complete.
-        */
-       /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
-       if ((!(status & E1000_STATUS_LU)) && (!(rxcw & E1000_RXCW_C))) {
-               if (mac->autoneg_failed == 0) {
-                       mac->autoneg_failed = 1;
-                       goto out;
-               }
-               DEBUGOUT("NOT RXing /C/, disable AutoNeg and force link.\n");
-
-               /* Disable auto-negotiation in the TXCW register */
-               E1000_WRITE_REG(hw, E1000_TXCW, (mac->txcw & ~E1000_TXCW_ANE));
-
-               /* Force link-up and also force full-duplex. */
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FD);
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-               /* Configure Flow Control after forcing link up. */
-               ret_val = e1000_config_fc_after_link_up_generic(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error configuring flow control\n");
-                       goto out;
-               }
-       } else if ((ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
-               /*
-                * If we are forcing link and we are receiving /C/ ordered
-                * sets, re-enable auto-negotiation in the TXCW register
-                * and disable forced link in the Device Control register
-                * in an attempt to auto-negotiate with our link partner.
-                */
-               DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\n");
-               E1000_WRITE_REG(hw, E1000_TXCW, mac->txcw);
-               E1000_WRITE_REG(hw, E1000_CTRL, (ctrl & ~E1000_CTRL_SLU));
-
-               mac->serdes_has_link = true;
-       } else if (!(E1000_TXCW_ANE & E1000_READ_REG(hw, E1000_TXCW))) {
-               /*
-                * If we force link for non-auto-negotiation switch, check
-                * link status based on MAC synchronization for internal
-                * serdes media type.
-                */
-               /* SYNCH bit and IV bit are sticky. */
-               usec_delay(10);
-               rxcw = E1000_READ_REG(hw, E1000_RXCW);
-               if (rxcw & E1000_RXCW_SYNCH) {
-                       if (!(rxcw & E1000_RXCW_IV)) {
-                               mac->serdes_has_link = true;
-                               DEBUGOUT("SERDES: Link up - forced.\n");
-                       }
-               } else {
-                       mac->serdes_has_link = false;
-                       DEBUGOUT("SERDES: Link down - force failed.\n");
-               }
-       }
-
-       if (E1000_TXCW_ANE & E1000_READ_REG(hw, E1000_TXCW)) {
-               status = E1000_READ_REG(hw, E1000_STATUS);
-               if (status & E1000_STATUS_LU) {
-                       /* SYNCH bit and IV bit are sticky, so reread rxcw. */
-                       usec_delay(10);
-                       rxcw = E1000_READ_REG(hw, E1000_RXCW);
-                       if (rxcw & E1000_RXCW_SYNCH) {
-                               if (!(rxcw & E1000_RXCW_IV)) {
-                                       mac->serdes_has_link = true;
-                                       DEBUGOUT("SERDES: Link up - autoneg "
-                                          "completed sucessfully.\n");
-                               } else {
-                                       mac->serdes_has_link = false;
-                                       DEBUGOUT("SERDES: Link down - invalid"
-                                          "codewords detected in autoneg.\n");
-                               }
-                       } else {
-                               mac->serdes_has_link = false;
-                               DEBUGOUT("SERDES: Link down - no sync.\n");
-                       }
-               } else {
-                       mac->serdes_has_link = false;
-                       DEBUGOUT("SERDES: Link down - autoneg failed\n");
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_setup_link_generic - Setup flow control and link settings
- *  @hw: pointer to the HW structure
- *
- *  Determines which flow control settings to use, then configures flow
- *  control.  Calls the appropriate media-specific link configuration
- *  function.  Assuming the adapter has a valid link partner, a valid link
- *  should be established.  Assumes the hardware has previously been reset
- *  and the transmitter and receiver are not enabled.
- **/
-s32 e1000_setup_link_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_setup_link_generic");
-
-       /*
-        * In the case of the phy reset being blocked, we already have a link.
-        * We do not need to set it up again.
-        */
-       if (hw->phy.ops.check_reset_block)
-               if (hw->phy.ops.check_reset_block(hw))
-                       goto out;
-
-       /*
-        * If requested flow control is set to default, set flow control
-        * based on the EEPROM flow control settings.
-        */
-       if (hw->fc.requested_mode == e1000_fc_default) {
-               ret_val = e1000_set_default_fc_generic(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       /*
-        * Save off the requested flow control mode for use later.  Depending
-        * on the link partner's capabilities, we may or may not use this mode.
-        */
-       hw->fc.current_mode = hw->fc.requested_mode;
-
-       DEBUGOUT1("After fix-ups FlowControl is now = %x\n",
-               hw->fc.current_mode);
-
-       /* Call the necessary media_type subroutine to configure the link. */
-       ret_val = hw->mac.ops.setup_physical_interface(hw);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Initialize the flow control address, type, and PAUSE timer
-        * registers to their default values.  This is done even if flow
-        * control is disabled, because it does not hurt anything to
-        * initialize these registers.
-        */
-       DEBUGOUT("Initializing the Flow Control address, type and timer regs\n");
-       E1000_WRITE_REG(hw, E1000_FCT, FLOW_CONTROL_TYPE);
-       E1000_WRITE_REG(hw, E1000_FCAH, FLOW_CONTROL_ADDRESS_HIGH);
-       E1000_WRITE_REG(hw, E1000_FCAL, FLOW_CONTROL_ADDRESS_LOW);
-
-       E1000_WRITE_REG(hw, E1000_FCTTV, hw->fc.pause_time);
-
-       ret_val = e1000_set_fc_watermarks_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_setup_fiber_serdes_link_generic - Setup link for fiber/serdes
- *  @hw: pointer to the HW structure
- *
- *  Configures collision distance and flow control for fiber and serdes
- *  links.  Upon successful setup, poll for link.
- **/
-s32 e1000_setup_fiber_serdes_link_generic(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_setup_fiber_serdes_link_generic");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       /* Take the link out of reset */
-       ctrl &= ~E1000_CTRL_LRST;
-
-       e1000_config_collision_dist_generic(hw);
-
-       ret_val = e1000_commit_fc_settings_generic(hw);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Since auto-negotiation is enabled, take the link out of reset (the
-        * link will be in reset, because we previously reset the chip). This
-        * will restart auto-negotiation.  If auto-negotiation is successful
-        * then the link-up status bit will be set and the flow control enable
-        * bits (RFCE and TFCE) will be set according to their negotiated value.
-        */
-       DEBUGOUT("Auto-negotiation enabled\n");
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-       E1000_WRITE_FLUSH(hw);
-       msec_delay(1);
-
-       /*
-        * For these adapters, the SW definable pin 1 is set when the optics
-        * detect a signal.  If we have a signal, then poll for a "Link-Up"
-        * indication.
-        */
-       if (hw->phy.media_type == e1000_media_type_internal_serdes ||
-           (E1000_READ_REG(hw, E1000_CTRL) & E1000_CTRL_SWDPIN1)) {
-               ret_val = e1000_poll_fiber_serdes_link_generic(hw);
-       } else {
-               DEBUGOUT("No signal detected\n");
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_config_collision_dist_generic - Configure collision distance
- *  @hw: pointer to the HW structure
- *
- *  Configures the collision distance to the default value and is used
- *  during link setup. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-void e1000_config_collision_dist_generic(struct e1000_hw *hw)
-{
-       u32 tctl;
-
-       DEBUGFUNC("e1000_config_collision_dist_generic");
-
-       tctl = E1000_READ_REG(hw, E1000_TCTL);
-
-       tctl &= ~E1000_TCTL_COLD;
-       tctl |= E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT;
-
-       E1000_WRITE_REG(hw, E1000_TCTL, tctl);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- *  e1000_poll_fiber_serdes_link_generic - Poll for link up
- *  @hw: pointer to the HW structure
- *
- *  Polls for link up by reading the status register, if link fails to come
- *  up with auto-negotiation, then the link is forced if a signal is detected.
- **/
-s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 i, status;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_poll_fiber_serdes_link_generic");
-
-       /*
-        * If we have a signal (the cable is plugged in, or assumed true for
-        * serdes media) then poll for a "Link-Up" indication in the Device
-        * Status Register.  Time-out if a link isn't seen in 500 milliseconds
-        * seconds (Auto-negotiation should complete in less than 500
-        * milliseconds even if the other end is doing it in SW).
-        */
-       for (i = 0; i < FIBER_LINK_UP_LIMIT; i++) {
-               msec_delay(10);
-               status = E1000_READ_REG(hw, E1000_STATUS);
-               if (status & E1000_STATUS_LU)
-                       break;
-       }
-       if (i == FIBER_LINK_UP_LIMIT) {
-               DEBUGOUT("Never got a valid link from auto-neg!!!\n");
-               mac->autoneg_failed = 1;
-               /*
-                * AutoNeg failed to achieve a link, so we'll call
-                * mac->check_for_link. This routine will force the
-                * link up if we detect a signal. This will allow us to
-                * communicate with non-autonegotiating link partners.
-                */
-               ret_val = hw->mac.ops.check_for_link(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error while checking for link\n");
-                       goto out;
-               }
-               mac->autoneg_failed = 0;
-       } else {
-               mac->autoneg_failed = 0;
-               DEBUGOUT("Valid Link Found\n");
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_commit_fc_settings_generic - Configure flow control
- *  @hw: pointer to the HW structure
- *
- *  Write the flow control settings to the Transmit Config Word Register (TXCW)
- *  base on the flow control settings in e1000_mac_info.
- **/
-s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 txcw;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_commit_fc_settings_generic");
-
-       /*
-        * Check for a software override of the flow control settings, and
-        * setup the device accordingly.  If auto-negotiation is enabled, then
-        * software will have to set the "PAUSE" bits to the correct value in
-        * the Transmit Config Word Register (TXCW) and re-start auto-
-        * negotiation.  However, if auto-negotiation is disabled, then
-        * software will have to manually configure the two flow control enable
-        * bits in the CTRL register.
-        *
-        * The possible values of the "fc" parameter are:
-        *      0:  Flow control is completely disabled
-        *      1:  Rx flow control is enabled (we can receive pause frames,
-        *          but not send pause frames).
-        *      2:  Tx flow control is enabled (we can send pause frames but we
-        *          do not support receiving pause frames).
-        *      3:  Both Rx and Tx flow control (symmetric) are enabled.
-        */
-       switch (hw->fc.current_mode) {
-       case e1000_fc_none:
-               /* Flow control completely disabled by a software over-ride. */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD);
-               break;
-       case e1000_fc_rx_pause:
-               /*
-                * Rx Flow control is enabled and Tx Flow control is disabled
-                * by a software over-ride. Since there really isn't a way to
-                * advertise that we are capable of Rx Pause ONLY, we will
-                * advertise that we support both symmetric and asymmetric RX
-                * PAUSE.  Later, we will disable the adapter's ability to send
-                * PAUSE frames.
-                */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
-               break;
-       case e1000_fc_tx_pause:
-               /*
-                * Tx Flow control is enabled, and Rx Flow control is disabled,
-                * by a software over-ride.
-                */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_ASM_DIR);
-               break;
-       case e1000_fc_full:
-               /*
-                * Flow control (both Rx and Tx) is enabled by a software
-                * over-ride.
-                */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
-               break;
-       default:
-               DEBUGOUT("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-               break;
-       }
-
-       E1000_WRITE_REG(hw, E1000_TXCW, txcw);
-       mac->txcw = txcw;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_set_fc_watermarks_generic - Set flow control high/low watermarks
- *  @hw: pointer to the HW structure
- *
- *  Sets the flow control high/low threshold (watermark) registers.  If
- *  flow control XON frame transmission is enabled, then set XON frame
- *  transmission as well.
- **/
-s32 e1000_set_fc_watermarks_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u32 fcrtl = 0, fcrth = 0;
-
-       DEBUGFUNC("e1000_set_fc_watermarks_generic");
-
-       /*
-        * Set the flow control receive threshold registers.  Normally,
-        * these registers will be set to a default threshold that may be
-        * adjusted later by the driver's runtime code.  However, if the
-        * ability to transmit pause frames is not enabled, then these
-        * registers will be set to 0.
-        */
-       if (hw->fc.current_mode & e1000_fc_tx_pause) {
-               /*
-                * We need to set up the Receive Threshold high and low water
-                * marks as well as (optionally) enabling the transmission of
-                * XON frames.
-                */
-               fcrtl = hw->fc.low_water;
-               if (hw->fc.send_xon)
-                       fcrtl |= E1000_FCRTL_XONE;
-
-               fcrth = hw->fc.high_water;
-       }
-       E1000_WRITE_REG(hw, E1000_FCRTL, fcrtl);
-       E1000_WRITE_REG(hw, E1000_FCRTH, fcrth);
-
-       return ret_val;
-}
-
-/**
- *  e1000_set_default_fc_generic - Set flow control default values
- *  @hw: pointer to the HW structure
- *
- *  Read the EEPROM for the default values for flow control and store the
- *  values.
- **/
-s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 nvm_data;
-
-       DEBUGFUNC("e1000_set_default_fc_generic");
-
-       /*
-        * Read and store word 0x0F of the EEPROM. This word contains bits
-        * that determine the hardware's default PAUSE (flow control) mode,
-        * a bit that determines whether the HW defaults to enabling or
-        * disabling auto-negotiation, and the direction of the
-        * SW defined pins. If there is no SW over-ride of the flow
-        * control setting, then the variable hw->fc will
-        * be initialized based on a value in the EEPROM.
-        */
-       ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, 1, &nvm_data);
-
-       if (ret_val) {
-               DEBUGOUT("NVM Read Error\n");
-               goto out;
-       }
-
-       if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0)
-               hw->fc.requested_mode = e1000_fc_none;
-       else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) ==
-                NVM_WORD0F_ASM_DIR)
-               hw->fc.requested_mode = e1000_fc_tx_pause;
-       else
-               hw->fc.requested_mode = e1000_fc_full;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_force_mac_fc_generic - Force the MAC's flow control settings
- *  @hw: pointer to the HW structure
- *
- *  Force the MAC's flow control settings.  Sets the TFCE and RFCE bits in the
- *  device control register to reflect the adapter settings.  TFCE and RFCE
- *  need to be explicitly set by software when a copper PHY is used because
- *  autonegotiation is managed by the PHY rather than the MAC.  Software must
- *  also configure these bits when link is forced on a fiber connection.
- **/
-s32 e1000_force_mac_fc_generic(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_force_mac_fc_generic");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       /*
-        * Because we didn't get link via the internal auto-negotiation
-        * mechanism (we either forced link or we got link via PHY
-        * auto-neg), we have to manually enable/disable transmit an
-        * receive flow control.
-        *
-        * The "Case" statement below enables/disable flow control
-        * according to the "hw->fc.current_mode" parameter.
-        *
-        * The possible values of the "fc" parameter are:
-        *      0:  Flow control is completely disabled
-        *      1:  Rx flow control is enabled (we can receive pause
-        *          frames but not send pause frames).
-        *      2:  Tx flow control is enabled (we can send pause frames
-        *          frames but we do not receive pause frames).
-        *      3:  Both Rx and Tx flow control (symmetric) is enabled.
-        *  other:  No other values should be possible at this point.
-        */
-       DEBUGOUT1("hw->fc.current_mode = %u\n", hw->fc.current_mode);
-
-       switch (hw->fc.current_mode) {
-       case e1000_fc_none:
-               ctrl &= (~(E1000_CTRL_TFCE | E1000_CTRL_RFCE));
-               break;
-       case e1000_fc_rx_pause:
-               ctrl &= (~E1000_CTRL_TFCE);
-               ctrl |= E1000_CTRL_RFCE;
-               break;
-       case e1000_fc_tx_pause:
-               ctrl &= (~E1000_CTRL_RFCE);
-               ctrl |= E1000_CTRL_TFCE;
-               break;
-       case e1000_fc_full:
-               ctrl |= (E1000_CTRL_TFCE | E1000_CTRL_RFCE);
-               break;
-       default:
-               DEBUGOUT("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_config_fc_after_link_up_generic - Configures flow control after link
- *  @hw: pointer to the HW structure
- *
- *  Checks the status of auto-negotiation after link up to ensure that the
- *  speed and duplex were not forced.  If the link needed to be forced, then
- *  flow control needs to be forced also.  If auto-negotiation is enabled
- *  and did not fail, then we configure flow control based on our link
- *  partner.
- **/
-s32 e1000_config_fc_after_link_up_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = E1000_SUCCESS;
-       u16 mii_status_reg, mii_nway_adv_reg, mii_nway_lp_ability_reg;
-       u16 speed, duplex;
-
-       DEBUGFUNC("e1000_config_fc_after_link_up_generic");
-
-       /*
-        * Check for the case where we have fiber media and auto-neg failed
-        * so we had to force link.  In this case, we need to force the
-        * configuration of the MAC to match the "fc" parameter.
-        */
-       if (mac->autoneg_failed) {
-               if (hw->phy.media_type == e1000_media_type_fiber ||
-                   hw->phy.media_type == e1000_media_type_internal_serdes)
-                       ret_val = e1000_force_mac_fc_generic(hw);
-       } else {
-               if (hw->phy.media_type == e1000_media_type_copper)
-                       ret_val = e1000_force_mac_fc_generic(hw);
-       }
-
-       if (ret_val) {
-               DEBUGOUT("Error forcing flow control settings\n");
-               goto out;
-       }
-
-       /*
-        * Check for the case where we have copper media and auto-neg is
-        * enabled.  In this case, we need to check and see if Auto-Neg
-        * has completed, and if so, how the PHY and link partner has
-        * flow control configured.
-        */
-       if ((hw->phy.media_type == e1000_media_type_copper) && mac->autoneg) {
-               /*
-                * Read the MII Status Register and check to see if AutoNeg
-                * has completed.  We read this twice because this reg has
-                * some "sticky" (latched) bits.
-                */
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       goto out;
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       goto out;
-
-               if (!(mii_status_reg & MII_SR_AUTONEG_COMPLETE)) {
-                       DEBUGOUT("Copper PHY and Auto Neg "
-                                "has not completed.\n");
-                       goto out;
-               }
-
-               /*
-                * The AutoNeg process has completed, so we now need to
-                * read both the Auto Negotiation Advertisement
-                * Register (Address 4) and the Auto_Negotiation Base
-                * Page Ability Register (Address 5) to determine how
-                * flow control was negotiated.
-                */
-               ret_val = hw->phy.ops.read_reg(hw, PHY_AUTONEG_ADV,
-                                            &mii_nway_adv_reg);
-               if (ret_val)
-                       goto out;
-               ret_val = hw->phy.ops.read_reg(hw, PHY_LP_ABILITY,
-                                            &mii_nway_lp_ability_reg);
-               if (ret_val)
-                       goto out;
-
-               /*
-                * Two bits in the Auto Negotiation Advertisement Register
-                * (Address 4) and two bits in the Auto Negotiation Base
-                * Page Ability Register (Address 5) determine flow control
-                * for both the PHY and the link partner.  The following
-                * table, taken out of the IEEE 802.3ab/D6.0 dated March 25,
-                * 1999, describes these PAUSE resolution bits and how flow
-                * control is determined based upon these settings.
-                * NOTE:  DC = Don't Care
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | NIC Resolution
-                *-------|---------|-------|---------|--------------------
-                *   0   |    0    |  DC   |   DC    | e1000_fc_none
-                *   0   |    1    |   0   |   DC    | e1000_fc_none
-                *   0   |    1    |   1   |    0    | e1000_fc_none
-                *   0   |    1    |   1   |    1    | e1000_fc_tx_pause
-                *   1   |    0    |   0   |   DC    | e1000_fc_none
-                *   1   |   DC    |   1   |   DC    | e1000_fc_full
-                *   1   |    1    |   0   |    0    | e1000_fc_none
-                *   1   |    1    |   0   |    1    | e1000_fc_rx_pause
-                *
-                * Are both PAUSE bits set to 1?  If so, this implies
-                * Symmetric Flow Control is enabled at both ends.  The
-                * ASM_DIR bits are irrelevant per the spec.
-                *
-                * For Symmetric Flow Control:
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-                *-------|---------|-------|---------|--------------------
-                *   1   |   DC    |   1   |   DC    | E1000_fc_full
-                *
-                */
-               if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                   (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE)) {
-                       /*
-                        * Now we need to check if the user selected Rx ONLY
-                        * of pause frames.  In this case, we had to advertise
-                        * FULL flow control because we could not advertise RX
-                        * ONLY. Hence, we must now check to see if we need to
-                        * turn OFF  the TRANSMISSION of PAUSE frames.
-                        */
-                       if (hw->fc.requested_mode == e1000_fc_full) {
-                               hw->fc.current_mode = e1000_fc_full;
-                               DEBUGOUT("Flow Control = FULL.\r\n");
-                       } else {
-                               hw->fc.current_mode = e1000_fc_rx_pause;
-                               DEBUGOUT("Flow Control = "
-                                        "RX PAUSE frames only.\r\n");
-                       }
-               }
-               /*
-                * For receiving PAUSE frames ONLY.
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-                *-------|---------|-------|---------|--------------------
-                *   0   |    1    |   1   |    1    | e1000_fc_tx_pause
-                */
-               else if (!(mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                         (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
-                         (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
-                         (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-                       hw->fc.current_mode = e1000_fc_tx_pause;
-                       DEBUGOUT("Flow Control = TX PAUSE frames only.\r\n");
-               }
-               /*
-                * For transmitting PAUSE frames ONLY.
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-                *-------|---------|-------|---------|--------------------
-                *   1   |    1    |   0   |    1    | e1000_fc_rx_pause
-                */
-               else if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                        (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
-                        !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
-                        (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-                       hw->fc.current_mode = e1000_fc_rx_pause;
-                       DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n");
-               } else {
-                       /*
-                        * Per the IEEE spec, at this point flow control
-                        * should be disabled.
-                        */
-                       hw->fc.current_mode = e1000_fc_none;
-                       DEBUGOUT("Flow Control = NONE.\r\n");
-               }
-
-               /*
-                * Now we need to do one last check...  If we auto-
-                * negotiated to HALF DUPLEX, flow control should not be
-                * enabled per IEEE 802.3 spec.
-                */
-               ret_val = mac->ops.get_link_up_info(hw, &speed, &duplex);
-               if (ret_val) {
-                       DEBUGOUT("Error getting link speed and duplex\n");
-                       goto out;
-               }
-
-               if (duplex == HALF_DUPLEX)
-                       hw->fc.current_mode = e1000_fc_none;
-
-               /*
-                * Now we call a subroutine to actually force the MAC
-                * controller to use the correct flow control settings.
-                */
-               ret_val = e1000_force_mac_fc_generic(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error forcing flow control settings\n");
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_get_speed_and_duplex_copper_generic - Retrieve current speed/duplex
- *  @hw: pointer to the HW structure
- *  @speed: stores the current speed
- *  @duplex: stores the current duplex
- *
- *  Read the status register for the current speed/duplex and store the current
- *  speed and duplex for copper connections.
- **/
-s32 e1000_get_speed_and_duplex_copper_generic(struct e1000_hw *hw, u16 *speed,
-                                              u16 *duplex)
-{
-       u32 status;
-
-       DEBUGFUNC("e1000_get_speed_and_duplex_copper_generic");
-
-       status = E1000_READ_REG(hw, E1000_STATUS);
-       if (status & E1000_STATUS_SPEED_1000) {
-               *speed = SPEED_1000;
-               DEBUGOUT("1000 Mbs, ");
-       } else if (status & E1000_STATUS_SPEED_100) {
-               *speed = SPEED_100;
-               DEBUGOUT("100 Mbs, ");
-       } else {
-               *speed = SPEED_10;
-               DEBUGOUT("10 Mbs, ");
-       }
-
-       if (status & E1000_STATUS_FD) {
-               *duplex = FULL_DUPLEX;
-               DEBUGOUT("Full Duplex\n");
-       } else {
-               *duplex = HALF_DUPLEX;
-               DEBUGOUT("Half Duplex\n");
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_get_speed_and_duplex_fiber_generic - Retrieve current speed/duplex
- *  @hw: pointer to the HW structure
- *  @speed: stores the current speed
- *  @duplex: stores the current duplex
- *
- *  Sets the speed and duplex to gigabit full duplex (the only possible option)
- *  for fiber/serdes links.
- **/
-s32 e1000_get_speed_and_duplex_fiber_serdes_generic(struct e1000_hw *hw __unused,
-                                                    u16 *speed, u16 *duplex)
-{
-       DEBUGFUNC("e1000_get_speed_and_duplex_fiber_serdes_generic");
-
-       *speed = SPEED_1000;
-       *duplex = FULL_DUPLEX;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_get_hw_semaphore_generic - Acquire hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Acquire the HW semaphore to access the PHY or NVM
- **/
-s32 e1000_get_hw_semaphore_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 swsm;
-       s32 ret_val = E1000_SUCCESS;
-       s32 timeout = hw->nvm.word_size + 1;
-       s32 i = 0;
-
-       DEBUGFUNC("e1000_get_hw_semaphore_generic");
-
-       /* Get the SW semaphore */
-       while (i < timeout) {
-               swsm = E1000_READ_REG(hw, E1000_SWSM);
-               if (!(swsm & E1000_SWSM_SMBI))
-                       break;
-
-               usec_delay(50);
-               i++;
-       }
-
-       if (i == timeout) {
-               DEBUGOUT("Driver can't access device - SMBI bit is set.\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       /* Get the FW semaphore. */
-       for (i = 0; i < timeout; i++) {
-               swsm = E1000_READ_REG(hw, E1000_SWSM);
-               E1000_WRITE_REG(hw, E1000_SWSM, swsm | E1000_SWSM_SWESMBI);
-
-               /* Semaphore acquired if bit latched */
-               if (E1000_READ_REG(hw, E1000_SWSM) & E1000_SWSM_SWESMBI)
-                       break;
-
-               usec_delay(50);
-       }
-
-       if (i == timeout) {
-               /* Release semaphores */
-               e1000_put_hw_semaphore_generic(hw);
-               DEBUGOUT("Driver can't access the NVM\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-#endif
-       return 0;
-}
-
-/**
- *  e1000_put_hw_semaphore_generic - Release hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Release hardware semaphore used to access the PHY or NVM
- **/
-void e1000_put_hw_semaphore_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 swsm;
-
-       DEBUGFUNC("e1000_put_hw_semaphore_generic");
-
-       swsm = E1000_READ_REG(hw, E1000_SWSM);
-
-       swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
-
-       E1000_WRITE_REG(hw, E1000_SWSM, swsm);
-#endif
-}
-
-/**
- *  e1000_get_auto_rd_done_generic - Check for auto read completion
- *  @hw: pointer to the HW structure
- *
- *  Check EEPROM for Auto Read done bit.
- **/
-s32 e1000_get_auto_rd_done_generic(struct e1000_hw *hw)
-{
-       s32 i = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_get_auto_rd_done_generic");
-
-       while (i < AUTO_READ_DONE_TIMEOUT) {
-               if (E1000_READ_REG(hw, E1000_EECD) & E1000_EECD_AUTO_RD)
-                       break;
-               msec_delay(1);
-               i++;
-       }
-
-       if (i == AUTO_READ_DONE_TIMEOUT) {
-               DEBUGOUT("Auto read by HW from NVM has not completed.\n");
-               ret_val = -E1000_ERR_RESET;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_valid_led_default_generic - Verify a valid default LED config
- *  @hw: pointer to the HW structure
- *  @data: pointer to the NVM (EEPROM)
- *
- *  Read the EEPROM for the current default LED configuration.  If the
- *  LED configuration is not valid, set to a valid LED configuration.
- **/
-s32 e1000_valid_led_default_generic(struct e1000_hw *hw, u16 *data)
-{
-       s32 ret_val;
-
-       DEBUGFUNC("e1000_valid_led_default_generic");
-
-       ret_val = hw->nvm.ops.read(hw, NVM_ID_LED_SETTINGS, 1, data);
-       if (ret_val) {
-               DEBUGOUT("NVM Read Error\n");
-               goto out;
-       }
-
-       if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF)
-               *data = ID_LED_DEFAULT;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_id_led_init_generic -
- *  @hw: pointer to the HW structure
- *
- **/
-s32 e1000_id_led_init_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val;
-       const u32 ledctl_mask = 0x000000FF;
-       const u32 ledctl_on = E1000_LEDCTL_MODE_LED_ON;
-       const u32 ledctl_off = E1000_LEDCTL_MODE_LED_OFF;
-       u16 data, i, temp;
-       const u16 led_mask = 0x0F;
-
-       DEBUGFUNC("e1000_id_led_init_generic");
-
-       ret_val = hw->nvm.ops.valid_led_default(hw, &data);
-       if (ret_val)
-               goto out;
-
-       mac->ledctl_default = E1000_READ_REG(hw, E1000_LEDCTL);
-       mac->ledctl_mode1 = mac->ledctl_default;
-       mac->ledctl_mode2 = mac->ledctl_default;
-
-       for (i = 0; i < 4; i++) {
-               temp = (data >> (i << 2)) & led_mask;
-               switch (temp) {
-               case ID_LED_ON1_DEF2:
-               case ID_LED_ON1_ON2:
-               case ID_LED_ON1_OFF2:
-                       mac->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode1 |= ledctl_on << (i << 3);
-                       break;
-               case ID_LED_OFF1_DEF2:
-               case ID_LED_OFF1_ON2:
-               case ID_LED_OFF1_OFF2:
-                       mac->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode1 |= ledctl_off << (i << 3);
-                       break;
-               default:
-                       /* Do nothing */
-                       break;
-               }
-               switch (temp) {
-               case ID_LED_DEF1_ON2:
-               case ID_LED_ON1_ON2:
-               case ID_LED_OFF1_ON2:
-                       mac->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode2 |= ledctl_on << (i << 3);
-                       break;
-               case ID_LED_DEF1_OFF2:
-               case ID_LED_ON1_OFF2:
-               case ID_LED_OFF1_OFF2:
-                       mac->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode2 |= ledctl_off << (i << 3);
-                       break;
-               default:
-                       /* Do nothing */
-                       break;
-               }
-       }
-
-out:
-       return ret_val;
-#endif
-       return 0;
-}
-
-/**
- *  e1000_setup_led_generic - Configures SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This prepares the SW controllable LED for use and saves the current state
- *  of the LED so it can be later restored.
- **/
-s32 e1000_setup_led_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ledctl;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_setup_led_generic");
-
-       if (hw->mac.ops.setup_led != e1000_setup_led_generic) {
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       if (hw->phy.media_type == e1000_media_type_fiber) {
-               ledctl = E1000_READ_REG(hw, E1000_LEDCTL);
-               hw->mac.ledctl_default = ledctl;
-               /* Turn off LED0 */
-               ledctl &= ~(E1000_LEDCTL_LED0_IVRT |
-                           E1000_LEDCTL_LED0_BLINK |
-                           E1000_LEDCTL_LED0_MODE_MASK);
-               ledctl |= (E1000_LEDCTL_MODE_LED_OFF <<
-                          E1000_LEDCTL_LED0_MODE_SHIFT);
-               E1000_WRITE_REG(hw, E1000_LEDCTL, ledctl);
-       } else if (hw->phy.media_type == e1000_media_type_copper) {
-               E1000_WRITE_REG(hw, E1000_LEDCTL, hw->mac.ledctl_mode1);
-       }
-
-out:
-       return ret_val;
-#endif
-       return 0;
-}
-
-/**
- *  e1000_cleanup_led_generic - Set LED config to default operation
- *  @hw: pointer to the HW structure
- *
- *  Remove the current LED configuration and set the LED configuration
- *  to the default value, saved from the EEPROM.
- **/
-s32 e1000_cleanup_led_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_cleanup_led_generic");
-
-       if (hw->mac.ops.cleanup_led != e1000_cleanup_led_generic) {
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       E1000_WRITE_REG(hw, E1000_LEDCTL, hw->mac.ledctl_default);
-
-out:
-       return ret_val;
-#endif
-       return 0;
-}
-
-/**
- *  e1000_blink_led_generic - Blink LED
- *  @hw: pointer to the HW structure
- *
- *  Blink the LEDs which are set to be on.
- **/
-s32 e1000_blink_led_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ledctl_blink = 0;
-       u32 i;
-
-       DEBUGFUNC("e1000_blink_led_generic");
-
-       if (hw->phy.media_type == e1000_media_type_fiber) {
-               /* always blink LED0 for PCI-E fiber */
-               ledctl_blink = E1000_LEDCTL_LED0_BLINK |
-                    (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED0_MODE_SHIFT);
-       } else {
-               /*
-                * set the blink bit for each LED that's "on" (0x0E)
-                * in ledctl_mode2
-                */
-               ledctl_blink = hw->mac.ledctl_mode2;
-               for (i = 0; i < 4; i++)
-                       if (((hw->mac.ledctl_mode2 >> (i * 8)) & 0xFF) ==
-                           E1000_LEDCTL_MODE_LED_ON)
-                               ledctl_blink |= (E1000_LEDCTL_LED0_BLINK <<
-                                                (i * 8));
-       }
-
-       E1000_WRITE_REG(hw, E1000_LEDCTL, ledctl_blink);
-
-       return E1000_SUCCESS;
-#endif
-       return 0;
-}
-
-/**
- *  e1000_led_on_generic - Turn LED on
- *  @hw: pointer to the HW structure
- *
- *  Turn LED on.
- **/
-s32 e1000_led_on_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ctrl;
-
-       DEBUGFUNC("e1000_led_on_generic");
-
-       switch (hw->phy.media_type) {
-       case e1000_media_type_fiber:
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               ctrl &= ~E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-               break;
-       case e1000_media_type_copper:
-               E1000_WRITE_REG(hw, E1000_LEDCTL, hw->mac.ledctl_mode2);
-               break;
-       default:
-               break;
-       }
-
-       return E1000_SUCCESS;
-#endif
-       return 0;
-}
-
-/**
- *  e1000_led_off_generic - Turn LED off
- *  @hw: pointer to the HW structure
- *
- *  Turn LED off.
- **/
-s32 e1000_led_off_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ctrl;
-
-       DEBUGFUNC("e1000_led_off_generic");
-
-       switch (hw->phy.media_type) {
-       case e1000_media_type_fiber:
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               ctrl |= E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-               break;
-       case e1000_media_type_copper:
-               E1000_WRITE_REG(hw, E1000_LEDCTL, hw->mac.ledctl_mode1);
-               break;
-       default:
-               break;
-       }
-
-       return E1000_SUCCESS;
-#endif
-       return 0;
-}
-
-/**
- *  e1000_set_pcie_no_snoop_generic - Set PCI-express capabilities
- *  @hw: pointer to the HW structure
- *  @no_snoop: bitmap of snoop events
- *
- *  Set the PCI-express register to snoop for events enabled in 'no_snoop'.
- **/
-void e1000_set_pcie_no_snoop_generic(struct e1000_hw *hw, u32 no_snoop)
-{
-       u32 gcr;
-
-       DEBUGFUNC("e1000_set_pcie_no_snoop_generic");
-
-       if (hw->bus.type != e1000_bus_type_pci_express)
-               goto out;
-
-       if (no_snoop) {
-               gcr = E1000_READ_REG(hw, E1000_GCR);
-               gcr &= ~(PCIE_NO_SNOOP_ALL);
-               gcr |= no_snoop;
-               E1000_WRITE_REG(hw, E1000_GCR, gcr);
-       }
-out:
-       return;
-}
-
-/**
- *  e1000_disable_pcie_master_generic - Disables PCI-express master access
- *  @hw: pointer to the HW structure
- *
- *  Returns 0 (E1000_SUCCESS) if successful, else returns -10
- *  (-E1000_ERR_MASTER_REQUESTS_PENDING) if master disable bit has not caused
- *  the master requests to be disabled.
- *
- *  Disables PCI-Express master access and verifies there are no pending
- *  requests.
- **/
-s32 e1000_disable_pcie_master_generic(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 timeout = MASTER_DISABLE_TIMEOUT;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_disable_pcie_master_generic");
-
-       if (hw->bus.type != e1000_bus_type_pci_express)
-               goto out;
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       ctrl |= E1000_CTRL_GIO_MASTER_DISABLE;
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-       while (timeout) {
-               if (!(E1000_READ_REG(hw, E1000_STATUS) &
-                     E1000_STATUS_GIO_MASTER_ENABLE))
-                       break;
-               usec_delay(100);
-               timeout--;
-       }
-
-       if (!timeout) {
-               DEBUGOUT("Master requests are pending.\n");
-               ret_val = -E1000_ERR_MASTER_REQUESTS_PENDING;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_reset_adaptive_generic - Reset Adaptive Interframe Spacing
- *  @hw: pointer to the HW structure
- *
- *  Reset the Adaptive Interframe Spacing throttle to default values.
- **/
-void e1000_reset_adaptive_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-
-       DEBUGFUNC("e1000_reset_adaptive_generic");
-
-       if (!mac->adaptive_ifs) {
-               DEBUGOUT("Not in Adaptive IFS mode!\n");
-               goto out;
-       }
-
-       mac->current_ifs_val = 0;
-       mac->ifs_min_val = IFS_MIN;
-       mac->ifs_max_val = IFS_MAX;
-       mac->ifs_step_size = IFS_STEP;
-       mac->ifs_ratio = IFS_RATIO;
-
-       mac->in_ifs_mode = false;
-       E1000_WRITE_REG(hw, E1000_AIT, 0);
-out:
-       return;
-}
-
-/**
- *  e1000_update_adaptive_generic - Update Adaptive Interframe Spacing
- *  @hw: pointer to the HW structure
- *
- *  Update the Adaptive Interframe Spacing Throttle value based on the
- *  time between transmitted packets and time between collisions.
- **/
-void e1000_update_adaptive_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-
-       DEBUGFUNC("e1000_update_adaptive_generic");
-
-       if (!mac->adaptive_ifs) {
-               DEBUGOUT("Not in Adaptive IFS mode!\n");
-               goto out;
-       }
-
-       if ((mac->collision_delta * mac->ifs_ratio) > mac->tx_packet_delta) {
-               if (mac->tx_packet_delta > MIN_NUM_XMITS) {
-                       mac->in_ifs_mode = true;
-                       if (mac->current_ifs_val < mac->ifs_max_val) {
-                               if (!mac->current_ifs_val)
-                                       mac->current_ifs_val = mac->ifs_min_val;
-                               else
-                                       mac->current_ifs_val +=
-                                               mac->ifs_step_size;
-                               E1000_WRITE_REG(hw, E1000_AIT, mac->current_ifs_val);
-                       }
-               }
-       } else {
-               if (mac->in_ifs_mode &&
-                   (mac->tx_packet_delta <= MIN_NUM_XMITS)) {
-                       mac->current_ifs_val = 0;
-                       mac->in_ifs_mode = false;
-                       E1000_WRITE_REG(hw, E1000_AIT, 0);
-               }
-       }
-out:
-       return;
-}
-
-/**
- *  e1000_validate_mdi_setting_generic - Verify MDI/MDIx settings
- *  @hw: pointer to the HW structure
- *
- *  Verify that when not using auto-negotiation that MDI/MDIx is correctly
- *  set, which is forced to MDI mode only.
- **/
-static s32 e1000_validate_mdi_setting_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_validate_mdi_setting_generic");
-
-       if (!hw->mac.autoneg && (hw->phy.mdix == 0 || hw->phy.mdix == 3)) {
-               DEBUGOUT("Invalid MDI setting detected\n");
-               hw->phy.mdix = 1;
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
diff --git a/src/drivers/net/e1000/e1000_mac.h b/src/drivers/net/e1000/e1000_mac.h
deleted file mode 100644 (file)
index 51acae0..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000_MAC_H_
-#define _E1000_MAC_H_
-
-/*
- * Functions that should not be called directly from drivers but can be used
- * by other files in this 'shared code'
- */
-void e1000_init_mac_ops_generic(struct e1000_hw *hw);
-void e1000_null_mac_generic(struct e1000_hw *hw);
-s32  e1000_null_ops_generic(struct e1000_hw *hw);
-s32  e1000_null_link_info(struct e1000_hw *hw, u16 *s, u16 *d);
-bool e1000_null_mng_mode(struct e1000_hw *hw);
-void e1000_null_update_mc(struct e1000_hw *hw, u8 *h, u32 a);
-void e1000_null_write_vfta(struct e1000_hw *hw, u32 a, u32 b);
-void e1000_null_mta_set(struct e1000_hw *hw, u32 a);
-void e1000_null_rar_set(struct e1000_hw *hw, u8 *h, u32 a);
-s32  e1000_blink_led_generic(struct e1000_hw *hw);
-s32  e1000_check_for_copper_link_generic(struct e1000_hw *hw);
-s32  e1000_check_for_fiber_link_generic(struct e1000_hw *hw);
-s32  e1000_check_for_serdes_link_generic(struct e1000_hw *hw);
-s32  e1000_cleanup_led_generic(struct e1000_hw *hw);
-s32  e1000_commit_fc_settings_generic(struct e1000_hw *hw);
-s32  e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw);
-s32  e1000_config_fc_after_link_up_generic(struct e1000_hw *hw);
-s32  e1000_disable_pcie_master_generic(struct e1000_hw *hw);
-s32  e1000_force_mac_fc_generic(struct e1000_hw *hw);
-s32  e1000_get_auto_rd_done_generic(struct e1000_hw *hw);
-s32  e1000_get_bus_info_pci_generic(struct e1000_hw *hw);
-s32  e1000_get_bus_info_pcie_generic(struct e1000_hw *hw);
-void e1000_set_lan_id_single_port(struct e1000_hw *hw);
-void e1000_set_lan_id_multi_port_pci(struct e1000_hw *hw);
-s32  e1000_get_hw_semaphore_generic(struct e1000_hw *hw);
-s32  e1000_get_speed_and_duplex_copper_generic(struct e1000_hw *hw, u16 *speed,
-                                               u16 *duplex);
-s32  e1000_get_speed_and_duplex_fiber_serdes_generic(struct e1000_hw *hw,
-                                                     u16 *speed, u16 *duplex);
-s32  e1000_id_led_init_generic(struct e1000_hw *hw);
-s32  e1000_led_on_generic(struct e1000_hw *hw);
-s32  e1000_led_off_generic(struct e1000_hw *hw);
-void e1000_update_mc_addr_list_generic(struct e1000_hw *hw,
-                                      u8 *mc_addr_list, u32 mc_addr_count);
-s32  e1000_set_default_fc_generic(struct e1000_hw *hw);
-s32  e1000_set_fc_watermarks_generic(struct e1000_hw *hw);
-s32  e1000_setup_fiber_serdes_link_generic(struct e1000_hw *hw);
-s32  e1000_setup_led_generic(struct e1000_hw *hw);
-s32  e1000_setup_link_generic(struct e1000_hw *hw);
-
-u32  e1000_hash_mc_addr_generic(struct e1000_hw *hw, u8 *mc_addr);
-
-void e1000_clear_hw_cntrs_base_generic(struct e1000_hw *hw);
-void e1000_clear_vfta_generic(struct e1000_hw *hw);
-void e1000_config_collision_dist_generic(struct e1000_hw *hw);
-void e1000_init_rx_addrs_generic(struct e1000_hw *hw, u16 rar_count);
-void e1000_mta_set_generic(struct e1000_hw *hw, u32 hash_value);
-void e1000_pcix_mmrbc_workaround_generic(struct e1000_hw *hw);
-void e1000_put_hw_semaphore_generic(struct e1000_hw *hw);
-void e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index);
-s32  e1000_check_alt_mac_addr_generic(struct e1000_hw *hw);
-void e1000_reset_adaptive_generic(struct e1000_hw *hw);
-void e1000_set_pcie_no_snoop_generic(struct e1000_hw *hw, u32 no_snoop);
-void e1000_update_adaptive_generic(struct e1000_hw *hw);
-void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value);
-
-#endif
diff --git a/src/drivers/net/e1000/e1000_main.c b/src/drivers/net/e1000/e1000_main.c
deleted file mode 100644 (file)
index bc2aa96..0000000
+++ /dev/null
@@ -1,909 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  Portions Copyright(c) 2010 Marty Connor <mdc@etherboot.org>
-  Portions Copyright(c) 2010 Entity Cyber, Inc.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#include "e1000.h"
-
-/**
- * e1000_irq_disable - Disable interrupt generation
- *
- * @adapter: board private structure
- **/
-static void e1000_irq_disable ( struct e1000_adapter *adapter )
-{
-       E1000_WRITE_REG ( &adapter->hw, E1000_IMC, ~0 );
-       E1000_WRITE_FLUSH ( &adapter->hw );
-}
-
-/**
- * e1000_irq_enable - Enable interrupt generation
- *
- * @adapter: board private structure
- **/
-static void e1000_irq_enable ( struct e1000_adapter *adapter )
-{
-       E1000_WRITE_REG(&adapter->hw, E1000_IMS, IMS_ENABLE_MASK);
-       E1000_WRITE_FLUSH(&adapter->hw);
-}
-
-/**
- * e1000_sw_init - Initialize general software structures (struct e1000_adapter)
- * @adapter: board private structure to initialize
- *
- * e1000_sw_init initializes the Adapter private data structure.
- * Fields are initialized based on PCI device information and
- * OS network device settings (MTU size).
- **/
-static int e1000_sw_init(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct pci_device  *pdev = adapter->pdev;
-
-       /* PCI config space info */
-
-       hw->vendor_id = pdev->vendor;
-       hw->device_id = pdev->device;
-
-       pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &hw->subsystem_vendor_id);
-       pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &hw->subsystem_device_id);
-
-       pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
-
-       pci_read_config_word(pdev, PCI_COMMAND, &hw->bus.pci_cmd_word);
-
-       adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
-       adapter->max_frame_size = MAXIMUM_ETHERNET_VLAN_SIZE +
-                                  ETH_HLEN + ETH_FCS_LEN;
-       adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
-
-       hw->fc.requested_mode = e1000_fc_none;
-
-       /* Initialize the hardware-specific values */
-       if (e1000_setup_init_funcs(hw, false)) {
-               DBG ("Hardware Initialization Failure\n");
-               return -EIO;
-       }
-
-       /* Explicitly disable IRQ since the NIC can be in any state. */
-       e1000_irq_disable ( adapter );
-
-       return 0;
-}
-
-int32_t e1000_read_pcie_cap_reg(struct e1000_hw *hw, uint32_t reg, uint16_t *value)
-{
-    struct e1000_adapter *adapter = hw->back;
-    uint16_t cap_offset;
-
-#define  PCI_CAP_ID_EXP        0x10    /* PCI Express */
-    cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
-    if (!cap_offset)
-        return -E1000_ERR_CONFIG;
-
-    pci_read_config_word(adapter->pdev, cap_offset + reg, value);
-
-    return 0;
-}
-
-void e1000_pci_clear_mwi ( struct e1000_hw *hw )
-{
-       struct e1000_adapter *adapter = hw->back;
-
-       pci_write_config_word ( adapter->pdev, PCI_COMMAND,
-                               hw->bus.pci_cmd_word & ~PCI_COMMAND_INVALIDATE );
-}
-
-void e1000_pci_set_mwi ( struct e1000_hw *hw )
-{
-       struct e1000_adapter *adapter = hw->back;
-
-       pci_write_config_word ( adapter->pdev, PCI_COMMAND,
-                                hw->bus.pci_cmd_word );
-}
-
-void e1000_read_pci_cfg ( struct e1000_hw *hw, uint32_t reg, uint16_t *value )
-{
-       struct e1000_adapter *adapter = hw->back;
-
-       pci_read_config_word ( adapter->pdev, reg, value );
-}
-
-void e1000_write_pci_cfg ( struct e1000_hw *hw, uint32_t reg, uint16_t *value )
-{
-       struct e1000_adapter *adapter = hw->back;
-
-       pci_write_config_word ( adapter->pdev, reg, *value );
-}
-
-/**
- * e1000_init_manageability - disable interception of ARP packets
- *
- * @v adapter  e1000 private structure
- **/
-static void e1000_init_manageability ( struct e1000_adapter *adapter )
-{
-       if (adapter->en_mng_pt) {
-               u32 manc = E1000_READ_REG(&adapter->hw, E1000_MANC);
-
-               /* disable hardware interception of ARP */
-               manc &= ~(E1000_MANC_ARP_EN);
-
-               E1000_WRITE_REG(&adapter->hw, E1000_MANC, manc);
-       }
-}
-
-/**
- * e1000_setup_tx_resources - allocate Tx resources (Descriptors)
- *
- * @v adapter  e1000 private structure
- *
- * @ret rc       Returns 0 on success, negative on failure
- **/
-static int e1000_setup_tx_resources ( struct e1000_adapter *adapter )
-{
-       DBG ( "e1000_setup_tx_resources\n" );
-
-       /* Allocate transmit descriptor ring memory.
-          It must not cross a 64K boundary because of hardware errata #23
-          so we use malloc_dma() requesting a 128 byte block that is
-          128 byte aligned. This should guarantee that the memory
-          allocated will not cross a 64K boundary, because 128 is an
-          even multiple of 65536 ( 65536 / 128 == 512 ), so all possible
-          allocations of 128 bytes on a 128 byte boundary will not
-          cross 64K bytes.
-        */
-
-        adapter->tx_base =
-               malloc_dma ( adapter->tx_ring_size, adapter->tx_ring_size );
-
-       if ( ! adapter->tx_base ) {
-               return -ENOMEM;
-       }
-
-       memset ( adapter->tx_base, 0, adapter->tx_ring_size );
-
-       DBG ( "adapter->tx_base = %#08lx\n", virt_to_bus ( adapter->tx_base ) );
-
-       return 0;
-}
-
-/**
- * e1000_process_tx_packets - process transmitted packets
- *
- * @v netdev   network interface device structure
- **/
-static void e1000_process_tx_packets ( struct net_device *netdev )
-{
-       struct e1000_adapter *adapter = netdev_priv ( netdev );
-       uint32_t i;
-       uint32_t tx_status;
-       struct e1000_tx_desc *tx_curr_desc;
-
-       /* Check status of transmitted packets
-        */
-       while ( ( i = adapter->tx_head ) != adapter->tx_tail ) {
-
-               tx_curr_desc = ( void * )  ( adapter->tx_base ) +
-                                          ( i * sizeof ( *adapter->tx_base ) );
-
-               tx_status = tx_curr_desc->upper.data;
-
-               /* if the packet at tx_head is not owned by hardware it is for us */
-               if ( ! ( tx_status & E1000_TXD_STAT_DD ) )
-                       break;
-
-               DBG ( "Sent packet. tx_head: %d tx_tail: %d tx_status: %#08x\n",
-                     adapter->tx_head, adapter->tx_tail, tx_status );
-
-               if ( tx_status & ( E1000_TXD_STAT_EC | E1000_TXD_STAT_LC |
-                                  E1000_TXD_STAT_TU ) ) {
-                       netdev_tx_complete_err ( netdev, adapter->tx_iobuf[i], -EINVAL );
-                       DBG ( "Error transmitting packet, tx_status: %#08x\n",
-                             tx_status );
-               } else {
-                       netdev_tx_complete ( netdev, adapter->tx_iobuf[i] );
-                       DBG ( "Success transmitting packet, tx_status: %#08x\n",
-                             tx_status );
-               }
-
-               /* Decrement count of used descriptors, clear this descriptor
-                */
-               adapter->tx_fill_ctr--;
-               memset ( tx_curr_desc, 0, sizeof ( *tx_curr_desc ) );
-
-               adapter->tx_head = ( adapter->tx_head + 1 ) % NUM_TX_DESC;
-       }
-}
-
-static void e1000_free_tx_resources ( struct e1000_adapter *adapter )
-{
-       DBG ( "e1000_free_tx_resources\n" );
-
-        free_dma ( adapter->tx_base, adapter->tx_ring_size );
-}
-
-/**
- * e1000_configure_tx - Configure 8254x Transmit Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Tx unit of the MAC after a reset.
- **/
-static void e1000_configure_tx ( struct e1000_adapter *adapter )
-{
-       struct e1000_hw *hw = &adapter->hw;
-       uint32_t tctl;
-
-       DBG ( "e1000_configure_tx\n" );
-
-       E1000_WRITE_REG ( hw, E1000_TDBAH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_TDBAL(0), virt_to_bus ( adapter->tx_base ) );
-       E1000_WRITE_REG ( hw, E1000_TDLEN(0), adapter->tx_ring_size );
-
-        DBG ( "E1000_TDBAL(0): %#08x\n",  E1000_READ_REG ( hw, E1000_TDBAL(0) ) );
-        DBG ( "E1000_TDLEN(0): %d\n",     E1000_READ_REG ( hw, E1000_TDLEN(0) ) );
-
-       /* Setup the HW Tx Head and Tail descriptor pointers */
-       E1000_WRITE_REG ( hw, E1000_TDH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_TDT(0), 0 );
-
-       adapter->tx_head = 0;
-       adapter->tx_tail = 0;
-       adapter->tx_fill_ctr = 0;
-
-       /* Setup Transmit Descriptor Settings for eop descriptor */
-       tctl = E1000_TCTL_PSP | E1000_TCTL_EN |
-               (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT) |
-               (E1000_COLLISION_DISTANCE  << E1000_COLD_SHIFT);
-
-       e1000_config_collision_dist ( hw );
-
-       E1000_WRITE_REG ( hw, E1000_TCTL, tctl );
-        E1000_WRITE_FLUSH ( hw );
-}
-
-static void e1000_free_rx_resources ( struct e1000_adapter *adapter )
-{
-       int i;
-
-       DBG ( "e1000_free_rx_resources\n" );
-
-       free_dma ( adapter->rx_base, adapter->rx_ring_size );
-
-       for ( i = 0; i < NUM_RX_DESC; i++ ) {
-               free_iob ( adapter->rx_iobuf[i] );
-       }
-}
-
-/**
- * e1000_refill_rx_ring - allocate Rx io_buffers
- *
- * @v adapter  e1000 private structure
- *
- * @ret rc       Returns 0 on success, negative on failure
- **/
-static int e1000_refill_rx_ring ( struct e1000_adapter *adapter )
-{
-       int i, rx_curr;
-       int rc = 0;
-       struct e1000_rx_desc *rx_curr_desc;
-       struct e1000_hw *hw = &adapter->hw;
-       struct io_buffer *iob;
-
-       DBG ("e1000_refill_rx_ring\n");
-
-       for ( i = 0; i < NUM_RX_DESC; i++ ) {
-               rx_curr = ( ( adapter->rx_curr + i ) % NUM_RX_DESC );
-               rx_curr_desc = adapter->rx_base + rx_curr;
-
-               if ( rx_curr_desc->status & E1000_RXD_STAT_DD )
-                       continue;
-
-               if ( adapter->rx_iobuf[rx_curr] != NULL )
-                       continue;
-
-               DBG2 ( "Refilling rx desc %d\n", rx_curr );
-
-               iob = alloc_iob ( MAXIMUM_ETHERNET_VLAN_SIZE );
-               adapter->rx_iobuf[rx_curr] = iob;
-
-               if ( ! iob ) {
-                       DBG ( "alloc_iob failed\n" );
-                       rc = -ENOMEM;
-                       break;
-               } else {
-                       rx_curr_desc->buffer_addr = virt_to_bus ( iob->data );
-
-                       E1000_WRITE_REG ( hw, E1000_RDT(0), rx_curr );
-               }
-       }
-       return rc;
-}
-
-/**
- * e1000_setup_rx_resources - allocate Rx resources (Descriptors)
- *
- * @v adapter  e1000 private structure
- *
- * @ret rc       Returns 0 on success, negative on failure
- **/
-static int e1000_setup_rx_resources ( struct e1000_adapter *adapter )
-{
-       int i, rc = 0;
-
-       DBG ( "e1000_setup_rx_resources\n" );
-
-       /* Allocate receive descriptor ring memory.
-          It must not cross a 64K boundary because of hardware errata
-        */
-
-        adapter->rx_base =
-               malloc_dma ( adapter->rx_ring_size, adapter->rx_ring_size );
-
-       if ( ! adapter->rx_base ) {
-               return -ENOMEM;
-       }
-       memset ( adapter->rx_base, 0, adapter->rx_ring_size );
-
-       for ( i = 0; i < NUM_RX_DESC; i++ ) {
-               /* let e1000_refill_rx_ring() io_buffer allocations */
-               adapter->rx_iobuf[i] = NULL;
-       }
-
-       /* allocate io_buffers */
-       rc = e1000_refill_rx_ring ( adapter );
-       if ( rc < 0 )
-               e1000_free_rx_resources ( adapter );
-
-       return rc;
-}
-
-/**
- * e1000_configure_rx - Configure 8254x Receive Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Rx unit of the MAC after a reset.
- **/
-static void e1000_configure_rx ( struct e1000_adapter *adapter )
-{
-       struct e1000_hw *hw = &adapter->hw;
-       uint32_t rctl;
-
-       DBG ( "e1000_configure_rx\n" );
-
-       /* disable receives while setting up the descriptors */
-       rctl = E1000_READ_REG ( hw, E1000_RCTL );
-       E1000_WRITE_REG ( hw, E1000_RCTL, rctl & ~E1000_RCTL_EN );
-       E1000_WRITE_FLUSH ( hw );
-       mdelay(10);
-
-       adapter->rx_curr = 0;
-
-       /* Setup the HW Rx Head and Tail Descriptor Pointers and
-        * the Base and Length of the Rx Descriptor Ring */
-
-       E1000_WRITE_REG ( hw, E1000_RDBAL(0), virt_to_bus ( adapter->rx_base ) );
-       E1000_WRITE_REG ( hw, E1000_RDBAH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_RDLEN(0), adapter->rx_ring_size );
-
-       E1000_WRITE_REG ( hw, E1000_RDH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_RDT(0), NUM_RX_DESC - 1 );
-
-       /* Enable Receives */
-       rctl |=  E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
-                E1000_RCTL_MPE | E1000_RCTL_SECRC;
-       E1000_WRITE_REG ( hw, E1000_RCTL, rctl );
-       E1000_WRITE_FLUSH ( hw );
-
-        DBG ( "E1000_RDBAL(0): %#08x\n",  E1000_READ_REG ( hw, E1000_RDBAL(0) ) );
-        DBG ( "E1000_RDLEN(0): %d\n",     E1000_READ_REG ( hw, E1000_RDLEN(0) ) );
-        DBG ( "E1000_RCTL:  %#08x\n",  E1000_READ_REG ( hw, E1000_RCTL ) );
-}
-
-/**
- * e1000_process_rx_packets - process received packets
- *
- * @v netdev   network interface device structure
- **/
-static void e1000_process_rx_packets ( struct net_device *netdev )
-{
-       struct e1000_adapter *adapter = netdev_priv ( netdev );
-       uint32_t i;
-       uint32_t rx_status;
-       uint32_t rx_len;
-       uint32_t rx_err;
-       struct e1000_rx_desc *rx_curr_desc;
-
-       /* Process received packets
-        */
-       while ( 1 ) {
-
-               i = adapter->rx_curr;
-
-               rx_curr_desc = ( void * )  ( adapter->rx_base ) +
-                                 ( i * sizeof ( *adapter->rx_base ) );
-               rx_status = rx_curr_desc->status;
-
-               DBG2 ( "Before DD Check RX_status: %#08x\n", rx_status );
-
-               if ( ! ( rx_status & E1000_RXD_STAT_DD ) )
-                       break;
-
-               if ( adapter->rx_iobuf[i] == NULL )
-                       break;
-
-               DBG ( "E1000_RCTL = %#08x\n", E1000_READ_REG ( &adapter->hw, E1000_RCTL ) );
-
-               rx_len = rx_curr_desc->length;
-
-                DBG ( "Received packet, rx_curr: %d  rx_status: %#08x  rx_len: %d\n",
-                      i, rx_status, rx_len );
-
-                rx_err = rx_curr_desc->errors;
-
-               iob_put ( adapter->rx_iobuf[i], rx_len );
-
-               if ( rx_err & E1000_RXD_ERR_FRAME_ERR_MASK ) {
-
-                       netdev_rx_err ( netdev, adapter->rx_iobuf[i], -EINVAL );
-                       DBG ( "e1000_poll: Corrupted packet received!"
-                             " rx_err: %#08x\n", rx_err );
-               } else {
-                       /* Add this packet to the receive queue. */
-                       netdev_rx ( netdev, adapter->rx_iobuf[i] );
-               }
-               adapter->rx_iobuf[i] = NULL;
-
-               memset ( rx_curr_desc, 0, sizeof ( *rx_curr_desc ) );
-
-               adapter->rx_curr = ( adapter->rx_curr + 1 ) % NUM_RX_DESC;
-       }
-}
-
-/**
- * e1000_reset - Put e1000 NIC in known initial state
- *
- * @v adapter  e1000 private structure
- **/
-void e1000_reset ( struct e1000_adapter *adapter )
-{
-       struct e1000_mac_info *mac = &adapter->hw.mac;
-       u32 pba = 0;
-
-       DBG ( "e1000_reset\n" );
-
-       switch (mac->type) {
-       case e1000_82542:
-       case e1000_82543:
-       case e1000_82544:
-       case e1000_82540:
-       case e1000_82541:
-       case e1000_82541_rev_2:
-               pba = E1000_PBA_48K;
-               break;
-       case e1000_82545:
-       case e1000_82545_rev_3:
-       case e1000_82546:
-       case e1000_82546_rev_3:
-               pba = E1000_PBA_48K;
-               break;
-       case e1000_82547:
-       case e1000_82547_rev_2:
-               pba = E1000_PBA_30K;
-               break;
-       case e1000_undefined:
-       case e1000_num_macs:
-               break;
-       }
-
-       E1000_WRITE_REG ( &adapter->hw, E1000_PBA, pba );
-
-       /* Allow time for pending master requests to run */
-       e1000_reset_hw ( &adapter->hw );
-
-       if ( mac->type >= e1000_82544 )
-               E1000_WRITE_REG ( &adapter->hw, E1000_WUC, 0 );
-
-       if ( e1000_init_hw ( &adapter->hw ) )
-               DBG ( "Hardware Error\n" );
-
-       e1000_reset_adaptive ( &adapter->hw );
-       e1000_get_phy_info ( &adapter->hw );
-
-       e1000_init_manageability ( adapter );
-}
-
-/** Functions that implement the iPXE driver API **/
-
-/**
- * e1000_close - Disables a network interface
- *
- * @v netdev   network interface device structure
- *
- **/
-static void e1000_close ( struct net_device *netdev )
-{
-       struct e1000_adapter *adapter = netdev_priv ( netdev );
-       struct e1000_hw *hw = &adapter->hw;
-       uint32_t rctl;
-
-       DBG ( "e1000_close\n" );
-
-       /* Disable and acknowledge interrupts */
-       e1000_irq_disable ( adapter );
-       E1000_READ_REG ( hw, E1000_ICR );
-
-       /* disable receives */
-       rctl = E1000_READ_REG ( hw, E1000_RCTL );
-       E1000_WRITE_REG ( hw, E1000_RCTL, rctl & ~E1000_RCTL_EN );
-       E1000_WRITE_FLUSH ( hw );
-
-       e1000_reset_hw ( hw );
-
-       e1000_free_tx_resources ( adapter );
-       e1000_free_rx_resources ( adapter );
-}
-
-/**
- * e1000_transmit - Transmit a packet
- *
- * @v netdev   Network device
- * @v iobuf    I/O buffer
- *
- * @ret rc       Returns 0 on success, negative on failure
- */
-static int e1000_transmit ( struct net_device *netdev, struct io_buffer *iobuf )
-{
-       struct e1000_adapter *adapter = netdev_priv( netdev );
-       struct e1000_hw *hw = &adapter->hw;
-       uint32_t tx_curr = adapter->tx_tail;
-       struct e1000_tx_desc *tx_curr_desc;
-
-       DBG ("e1000_transmit\n");
-
-       if ( adapter->tx_fill_ctr == NUM_TX_DESC ) {
-               DBG ("TX overflow\n");
-               return -ENOBUFS;
-       }
-
-       /* Save pointer to iobuf we have been given to transmit,
-          netdev_tx_complete() will need it later
-        */
-       adapter->tx_iobuf[tx_curr] = iobuf;
-
-       tx_curr_desc = ( void * ) ( adapter->tx_base ) +
-                      ( tx_curr * sizeof ( *adapter->tx_base ) );
-
-       DBG ( "tx_curr_desc = %#08lx\n", virt_to_bus ( tx_curr_desc ) );
-       DBG ( "tx_curr_desc + 16 = %#08lx\n", virt_to_bus ( tx_curr_desc ) + 16 );
-       DBG ( "iobuf->data = %#08lx\n", virt_to_bus ( iobuf->data ) );
-
-       /* Add the packet to TX ring
-        */
-       tx_curr_desc->buffer_addr =
-               virt_to_bus ( iobuf->data );
-       tx_curr_desc->lower.data =
-               E1000_TXD_CMD_RS | E1000_TXD_CMD_EOP |
-               E1000_TXD_CMD_IFCS | iob_len ( iobuf );
-       tx_curr_desc->upper.data = 0;
-
-       DBG ( "TX fill: %d tx_curr: %d addr: %#08lx len: %zd\n", adapter->tx_fill_ctr,
-             tx_curr, virt_to_bus ( iobuf->data ), iob_len ( iobuf ) );
-
-       /* Point to next free descriptor */
-       adapter->tx_tail = ( adapter->tx_tail + 1 ) % NUM_TX_DESC;
-       adapter->tx_fill_ctr++;
-
-       /* Write new tail to NIC, making packet available for transmit
-        */
-       wmb();
-       E1000_WRITE_REG ( hw, E1000_TDT(0), adapter->tx_tail );
-
-       return 0;
-}
-
-/**
- * e1000_poll - Poll for received packets
- *
- * @v netdev   Network device
- */
-static void e1000_poll ( struct net_device *netdev )
-{
-       struct e1000_adapter *adapter = netdev_priv( netdev );
-       struct e1000_hw *hw = &adapter->hw;
-
-       uint32_t icr;
-
-       DBGP ( "e1000_poll\n" );
-
-       /* Acknowledge interrupts */
-       icr = E1000_READ_REG ( hw, E1000_ICR );
-       if ( ! icr )
-               return;
-
-        DBG ( "e1000_poll: intr_status = %#08x\n", icr );
-
-       e1000_process_tx_packets ( netdev );
-
-       e1000_process_rx_packets ( netdev );
-
-       e1000_refill_rx_ring(adapter);
-}
-
-/**
- * e1000_irq - enable or Disable interrupts
- *
- * @v adapter   e1000 adapter
- * @v action    requested interrupt action
- **/
-static void e1000_irq ( struct net_device *netdev, int enable )
-{
-       struct e1000_adapter *adapter = netdev_priv ( netdev );
-
-       DBG ( "e1000_irq\n" );
-
-       if ( enable ) {
-               e1000_irq_enable ( adapter );
-       } else {
-               e1000_irq_disable ( adapter );
-       }
-}
-
-static struct net_device_operations e1000_operations;
-
-/**
- * e1000_probe - Initial configuration of e1000 NIC
- *
- * @v pci      PCI device
- * @v id       PCI IDs
- *
- * @ret rc     Return status code
- **/
-int e1000_probe ( struct pci_device *pdev )
-{
-       int i, err;
-       struct net_device *netdev;
-       struct e1000_adapter *adapter;
-       unsigned long mmio_start, mmio_len;
-
-       DBG ( "e1000_probe\n" );
-
-       err = -ENOMEM;
-
-       /* Allocate net device ( also allocates memory for netdev->priv
-          and makes netdev-priv point to it ) */
-       netdev = alloc_etherdev ( sizeof ( struct e1000_adapter ) );
-       if ( ! netdev )
-               goto err_alloc_etherdev;
-
-       /* Associate e1000-specific network operations operations with
-        * generic network device layer */
-       netdev_init ( netdev, &e1000_operations );
-
-       /* Associate this network device with given PCI device */
-       pci_set_drvdata ( pdev, netdev );
-       netdev->dev = &pdev->dev;
-
-       /* Initialize driver private storage */
-       adapter = netdev_priv ( netdev );
-        memset ( adapter, 0, ( sizeof ( *adapter ) ) );
-
-       adapter->pdev       = pdev;
-
-       adapter->ioaddr     = pdev->ioaddr;
-        adapter->hw.io_base = pdev->ioaddr;
-
-        adapter->irqno      = pdev->irq;
-       adapter->netdev     = netdev;
-       adapter->hw.back    = adapter;
-
-       adapter->tx_ring_size = sizeof ( *adapter->tx_base ) * NUM_TX_DESC;
-       adapter->rx_ring_size = sizeof ( *adapter->rx_base ) * NUM_RX_DESC;
-
-       mmio_start = pci_bar_start ( pdev, PCI_BASE_ADDRESS_0 );
-       mmio_len   = pci_bar_size  ( pdev, PCI_BASE_ADDRESS_0 );
-
-       DBG ( "mmio_start: %#08lx\n", mmio_start );
-       DBG ( "mmio_len: %#08lx\n", mmio_len );
-
-       /* Fix up PCI device */
-       adjust_pci_device ( pdev );
-
-       err = -EIO;
-
-       adapter->hw.hw_addr = ioremap ( mmio_start, mmio_len );
-       DBG ( "adapter->hw.hw_addr: %p\n", adapter->hw.hw_addr );
-
-       if ( ! adapter->hw.hw_addr )
-               goto err_ioremap;
-
-       /* Hardware features, flags and workarounds */
-       if (adapter->hw.mac.type >= e1000_82540) {
-               adapter->flags |= E1000_FLAG_HAS_SMBUS;
-               adapter->flags |= E1000_FLAG_HAS_INTR_MODERATION;
-       }
-
-       if (adapter->hw.mac.type == e1000_82543)
-               adapter->flags |= E1000_FLAG_BAD_TX_CARRIER_STATS_FD;
-
-       adapter->hw.phy.autoneg_wait_to_complete = true;
-       adapter->hw.mac.adaptive_ifs = true;
-
-       /* setup the private structure */
-       if ( ( err = e1000_sw_init ( adapter ) ) )
-               goto err_sw_init;
-
-       if ((err = e1000_init_mac_params(&adapter->hw)))
-               goto err_hw_init;
-
-       if ((err = e1000_init_nvm_params(&adapter->hw)))
-               goto err_hw_init;
-
-        /* Force auto-negotiated speed and duplex */
-        adapter->hw.mac.autoneg = 1;
-
-       if ((err = e1000_init_phy_params(&adapter->hw)))
-               goto err_hw_init;
-
-       DBG ( "adapter->hw.mac.type: %#08x\n", adapter->hw.mac.type );
-
-       /* before reading the EEPROM, reset the controller to
-        * put the device in a known good starting state
-        */
-       err = e1000_reset_hw ( &adapter->hw );
-       if ( err < 0 ) {
-               DBG ( "Hardware Initialization Failed\n" );
-               goto err_reset;
-       }
-       /* make sure the NVM is good */
-
-       if ( e1000_validate_nvm_checksum(&adapter->hw) < 0 ) {
-               DBG ( "The NVM Checksum Is Not Valid\n" );
-               err = -EIO;
-               goto err_eeprom;
-       }
-
-       /* copy the MAC address out of the EEPROM */
-       if ( e1000_read_mac_addr ( &adapter->hw ) )
-               DBG ( "EEPROM Read Error\n" );
-
-        memcpy ( netdev->hw_addr, adapter->hw.mac.perm_addr, ETH_ALEN );
-
-       /* reset the hardware with the new settings */
-       e1000_reset ( adapter );
-
-       if ( ( err = register_netdev ( netdev ) ) != 0)
-               goto err_register;
-
-       /* Mark as link up; we don't yet handle link state */
-       netdev_link_up ( netdev );
-
-       for (i = 0; i < 6; i++)
-               DBG ("%02x%s", netdev->ll_addr[i], i == 5 ? "\n" : ":");
-
-       DBG ( "e1000_probe succeeded!\n" );
-
-       /* No errors, return success */
-       return 0;
-
-/* Error return paths */
-err_reset:
-err_register:
-err_hw_init:
-err_eeprom:
-       if (!e1000_check_reset_block(&adapter->hw))
-               e1000_phy_hw_reset(&adapter->hw);
-       if (adapter->hw.flash_address)
-               iounmap(adapter->hw.flash_address);
-err_sw_init:
-       iounmap ( adapter->hw.hw_addr );
-err_ioremap:
-       netdev_put ( netdev );
-err_alloc_etherdev:
-       return err;
-}
-
-/**
- * e1000_remove - Device Removal Routine
- *
- * @v pdev PCI device information struct
- *
- **/
-void e1000_remove ( struct pci_device *pdev )
-{
-       struct net_device *netdev = pci_get_drvdata ( pdev );
-       struct e1000_adapter *adapter = netdev_priv ( netdev );
-
-       DBG ( "e1000_remove\n" );
-
-       if ( adapter->hw.flash_address )
-               iounmap ( adapter->hw.flash_address );
-       if  ( adapter->hw.hw_addr )
-               iounmap ( adapter->hw.hw_addr );
-
-       unregister_netdev ( netdev );
-       e1000_reset_hw ( &adapter->hw );
-       netdev_nullify ( netdev );
-       netdev_put ( netdev );
-}
-
-/**
- * e1000_open - Called when a network interface is made active
- *
- * @v netdev   network interface device structure
- * @ret rc     Return status code, 0 on success, negative value on failure
- *
- **/
-static int e1000_open ( struct net_device *netdev )
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       int err;
-
-       DBG ( "e1000_open\n" );
-
-       /* allocate transmit descriptors */
-       err = e1000_setup_tx_resources ( adapter );
-       if ( err ) {
-               DBG ( "Error setting up TX resources!\n" );
-               goto err_setup_tx;
-       }
-
-       /* allocate receive descriptors */
-       err = e1000_setup_rx_resources ( adapter );
-       if ( err ) {
-               DBG ( "Error setting up RX resources!\n" );
-               goto err_setup_rx;
-       }
-
-       e1000_configure_tx ( adapter );
-
-       e1000_configure_rx ( adapter );
-
-        DBG ( "E1000_RXDCTL(0): %#08x\n",  E1000_READ_REG ( &adapter->hw, E1000_RXDCTL(0) ) );
-
-       return 0;
-
-err_setup_rx:
-       e1000_free_tx_resources ( adapter );
-err_setup_tx:
-       e1000_reset ( adapter );
-
-       return err;
-}
-
-/** e1000 net device operations */
-static struct net_device_operations e1000_operations = {
-        .open           = e1000_open,
-        .close          = e1000_close,
-        .transmit       = e1000_transmit,
-        .poll           = e1000_poll,
-        .irq            = e1000_irq,
-};
diff --git a/src/drivers/net/e1000/e1000_manage.c b/src/drivers/net/e1000/e1000_manage.c
deleted file mode 100644 (file)
index 3362942..0000000
+++ /dev/null
@@ -1,389 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#if 0
-
-#include "e1000_api.h"
-
-static u8 e1000_calculate_checksum(u8 *buffer, u32 length);
-
-/**
- *  e1000_calculate_checksum - Calculate checksum for buffer
- *  @buffer: pointer to EEPROM
- *  @length: size of EEPROM to calculate a checksum for
- *
- *  Calculates the checksum for some buffer on a specified length.  The
- *  checksum calculated is returned.
- **/
-static u8 e1000_calculate_checksum(u8 *buffer, u32 length)
-{
-       u32 i;
-       u8  sum = 0;
-
-       DEBUGFUNC("e1000_calculate_checksum");
-
-       if (!buffer)
-               return 0;
-
-       for (i = 0; i < length; i++)
-               sum += buffer[i];
-
-       return (u8) (0 - sum);
-}
-
-/**
- *  e1000_mng_enable_host_if_generic - Checks host interface is enabled
- *  @hw: pointer to the HW structure
- *
- *  Returns E1000_success upon success, else E1000_ERR_HOST_INTERFACE_COMMAND
- *
- *  This function checks whether the HOST IF is enabled for command operation
- *  and also checks whether the previous command is completed.  It busy waits
- *  in case of previous command is not completed.
- **/
-s32 e1000_mng_enable_host_if_generic(struct e1000_hw *hw)
-{
-       u32 hicr;
-       s32 ret_val = E1000_SUCCESS;
-       u8  i;
-
-       DEBUGFUNC("e1000_mng_enable_host_if_generic");
-
-       /* Check that the host interface is enabled. */
-       hicr = E1000_READ_REG(hw, E1000_HICR);
-       if ((hicr & E1000_HICR_EN) == 0) {
-               DEBUGOUT("E1000_HOST_EN bit disabled.\n");
-               ret_val = -E1000_ERR_HOST_INTERFACE_COMMAND;
-               goto out;
-       }
-       /* check the previous command is completed */
-       for (i = 0; i < E1000_MNG_DHCP_COMMAND_TIMEOUT; i++) {
-               hicr = E1000_READ_REG(hw, E1000_HICR);
-               if (!(hicr & E1000_HICR_C))
-                       break;
-               msec_delay_irq(1);
-       }
-
-       if (i == E1000_MNG_DHCP_COMMAND_TIMEOUT) {
-               DEBUGOUT("Previous command timeout failed .\n");
-               ret_val = -E1000_ERR_HOST_INTERFACE_COMMAND;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_check_mng_mode_generic - Generic check management mode
- *  @hw: pointer to the HW structure
- *
- *  Reads the firmware semaphore register and returns true (>0) if
- *  manageability is enabled, else false (0).
- **/
-bool e1000_check_mng_mode_generic(struct e1000_hw *hw)
-{
-       u32 fwsm;
-
-       DEBUGFUNC("e1000_check_mng_mode_generic");
-
-       fwsm = E1000_READ_REG(hw, E1000_FWSM);
-
-       return (fwsm & E1000_FWSM_MODE_MASK) ==
-               (E1000_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT);
-}
-
-/**
- *  e1000_enable_tx_pkt_filtering_generic - Enable packet filtering on TX
- *  @hw: pointer to the HW structure
- *
- *  Enables packet filtering on transmit packets if manageability is enabled
- *  and host interface is enabled.
- **/
-bool e1000_enable_tx_pkt_filtering_generic(struct e1000_hw *hw)
-{
-       struct e1000_host_mng_dhcp_cookie *hdr = &hw->mng_cookie;
-       u32 *buffer = (u32 *)&hw->mng_cookie;
-       u32 offset;
-       s32 ret_val, hdr_csum, csum;
-       u8 i, len;
-       bool tx_filter = true;
-
-       DEBUGFUNC("e1000_enable_tx_pkt_filtering_generic");
-
-       /* No manageability, no filtering */
-       if (!hw->mac.ops.check_mng_mode(hw)) {
-               tx_filter = false;
-               goto out;
-       }
-
-       /*
-        * If we can't read from the host interface for whatever
-        * reason, disable filtering.
-        */
-       ret_val = hw->mac.ops.mng_enable_host_if(hw);
-       if (ret_val != E1000_SUCCESS) {
-               tx_filter = false;
-               goto out;
-       }
-
-       /* Read in the header.  Length and offset are in dwords. */
-       len    = E1000_MNG_DHCP_COOKIE_LENGTH >> 2;
-       offset = E1000_MNG_DHCP_COOKIE_OFFSET >> 2;
-       for (i = 0; i < len; i++) {
-               *(buffer + i) = E1000_READ_REG_ARRAY_DWORD(hw,
-                                                          E1000_HOST_IF,
-                                                          offset + i);
-       }
-       hdr_csum = hdr->checksum;
-       hdr->checksum = 0;
-       csum = e1000_calculate_checksum((u8 *)hdr,
-                                       E1000_MNG_DHCP_COOKIE_LENGTH);
-       /*
-        * If either the checksums or signature don't match, then
-        * the cookie area isn't considered valid, in which case we
-        * take the safe route of assuming Tx filtering is enabled.
-        */
-       if (hdr_csum != csum)
-               goto out;
-       if (hdr->signature != E1000_IAMT_SIGNATURE)
-               goto out;
-
-       /* Cookie area is valid, make the final check for filtering. */
-       if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING))
-               tx_filter = false;
-
-out:
-       hw->mac.tx_pkt_filtering = tx_filter;
-       return tx_filter;
-}
-
-/**
- *  e1000_mng_write_dhcp_info_generic - Writes DHCP info to host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface
- *  @length: size of the buffer
- *
- *  Writes the DHCP information to the host interface.
- **/
-s32 e1000_mng_write_dhcp_info_generic(struct e1000_hw *hw, u8 *buffer,
-                                      u16 length)
-{
-       struct e1000_host_mng_command_header hdr;
-       s32 ret_val;
-       u32 hicr;
-
-       DEBUGFUNC("e1000_mng_write_dhcp_info_generic");
-
-       hdr.command_id = E1000_MNG_DHCP_TX_PAYLOAD_CMD;
-       hdr.command_length = length;
-       hdr.reserved1 = 0;
-       hdr.reserved2 = 0;
-       hdr.checksum = 0;
-
-       /* Enable the host interface */
-       ret_val = hw->mac.ops.mng_enable_host_if(hw);
-       if (ret_val)
-               goto out;
-
-       /* Populate the host interface with the contents of "buffer". */
-       ret_val = hw->mac.ops.mng_host_if_write(hw, buffer, length,
-                                         sizeof(hdr), &(hdr.checksum));
-       if (ret_val)
-               goto out;
-
-       /* Write the manageability command header */
-       ret_val = hw->mac.ops.mng_write_cmd_header(hw, &hdr);
-       if (ret_val)
-               goto out;
-
-       /* Tell the ARC a new command is pending. */
-       hicr = E1000_READ_REG(hw, E1000_HICR);
-       E1000_WRITE_REG(hw, E1000_HICR, hicr | E1000_HICR_C);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_mng_write_cmd_header_generic - Writes manageability command header
- *  @hw: pointer to the HW structure
- *  @hdr: pointer to the host interface command header
- *
- *  Writes the command header after does the checksum calculation.
- **/
-s32 e1000_mng_write_cmd_header_generic(struct e1000_hw *hw,
-                                    struct e1000_host_mng_command_header *hdr)
-{
-       u16 i, length = sizeof(struct e1000_host_mng_command_header);
-
-       DEBUGFUNC("e1000_mng_write_cmd_header_generic");
-
-       /* Write the whole command header structure with new checksum. */
-
-       hdr->checksum = e1000_calculate_checksum((u8 *)hdr, length);
-
-       length >>= 2;
-       /* Write the relevant command block into the ram area. */
-       for (i = 0; i < length; i++) {
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, i,
-                                           *((u32 *) hdr + i));
-               E1000_WRITE_FLUSH(hw);
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_mng_host_if_write_generic - Write to the manageability host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface buffer
- *  @length: size of the buffer
- *  @offset: location in the buffer to write to
- *  @sum: sum of the data (not checksum)
- *
- *  This function writes the buffer content at the offset given on the host if.
- *  It also does alignment considerations to do the writes in most efficient
- *  way.  Also fills up the sum of the buffer in *buffer parameter.
- **/
-s32 e1000_mng_host_if_write_generic(struct e1000_hw *hw, u8 *buffer,
-                                    u16 length, u16 offset, u8 *sum)
-{
-       u8 *tmp;
-       u8 *bufptr = buffer;
-       u32 data = 0;
-       s32 ret_val = E1000_SUCCESS;
-       u16 remaining, i, j, prev_bytes;
-
-       DEBUGFUNC("e1000_mng_host_if_write_generic");
-
-       /* sum = only sum of the data and it is not checksum */
-
-       if (length == 0 || offset + length > E1000_HI_MAX_MNG_DATA_LENGTH) {
-               ret_val = -E1000_ERR_PARAM;
-               goto out;
-       }
-
-       tmp = (u8 *)&data;
-       prev_bytes = offset & 0x3;
-       offset >>= 2;
-
-       if (prev_bytes) {
-               data = E1000_READ_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset);
-               for (j = prev_bytes; j < sizeof(u32); j++) {
-                       *(tmp + j) = *bufptr++;
-                       *sum += *(tmp + j);
-               }
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset, data);
-               length -= j - prev_bytes;
-               offset++;
-       }
-
-       remaining = length & 0x3;
-       length -= remaining;
-
-       /* Calculate length in DWORDs */
-       length >>= 2;
-
-       /*
-        * The device driver writes the relevant command block into the
-        * ram area.
-        */
-       for (i = 0; i < length; i++) {
-               for (j = 0; j < sizeof(u32); j++) {
-                       *(tmp + j) = *bufptr++;
-                       *sum += *(tmp + j);
-               }
-
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset + i,
-                                           data);
-       }
-       if (remaining) {
-               for (j = 0; j < sizeof(u32); j++) {
-                       if (j < remaining)
-                               *(tmp + j) = *bufptr++;
-                       else
-                               *(tmp + j) = 0;
-
-                       *sum += *(tmp + j);
-               }
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset + i, data);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_enable_mng_pass_thru - Enable processing of ARP's
- *  @hw: pointer to the HW structure
- *
- *  Verifies the hardware needs to allow ARPs to be processed by the host.
- **/
-bool e1000_enable_mng_pass_thru(struct e1000_hw *hw)
-{
-       u32 manc;
-       u32 fwsm, factps;
-       bool ret_val = false;
-
-       DEBUGFUNC("e1000_enable_mng_pass_thru");
-
-       if (!hw->mac.asf_firmware_present)
-               goto out;
-
-       manc = E1000_READ_REG(hw, E1000_MANC);
-
-       if (!(manc & E1000_MANC_RCV_TCO_EN) ||
-           !(manc & E1000_MANC_EN_MAC_ADDR_FILTER))
-               goto out;
-
-       if (hw->mac.arc_subsystem_valid) {
-               fwsm = E1000_READ_REG(hw, E1000_FWSM);
-               factps = E1000_READ_REG(hw, E1000_FACTPS);
-
-               if (!(factps & E1000_FACTPS_MNGCG) &&
-                   ((fwsm & E1000_FWSM_MODE_MASK) ==
-                    (e1000_mng_mode_pt << E1000_FWSM_MODE_SHIFT))) {
-                       ret_val = true;
-                       goto out;
-               }
-       } else {
-               if ((manc & E1000_MANC_SMBUS_EN) &&
-                   !(manc & E1000_MANC_ASF_EN)) {
-                       ret_val = true;
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-#endif
diff --git a/src/drivers/net/e1000/e1000_manage.h b/src/drivers/net/e1000/e1000_manage.h
deleted file mode 100644 (file)
index 14467aa..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000_MANAGE_H_
-#define _E1000_MANAGE_H_
-
-bool e1000_check_mng_mode_generic(struct e1000_hw *hw);
-bool e1000_enable_tx_pkt_filtering_generic(struct e1000_hw *hw);
-s32  e1000_mng_enable_host_if_generic(struct e1000_hw *hw);
-s32  e1000_mng_host_if_write_generic(struct e1000_hw *hw, u8 *buffer,
-                                     u16 length, u16 offset, u8 *sum);
-s32  e1000_mng_write_cmd_header_generic(struct e1000_hw *hw,
-                                    struct e1000_host_mng_command_header *hdr);
-s32  e1000_mng_write_dhcp_info_generic(struct e1000_hw *hw,
-                                       u8 *buffer, u16 length);
-bool e1000_enable_mng_pass_thru(struct e1000_hw *hw);
-
-enum e1000_mng_mode {
-       e1000_mng_mode_none = 0,
-       e1000_mng_mode_asf,
-       e1000_mng_mode_pt,
-       e1000_mng_mode_ipmi,
-       e1000_mng_mode_host_if_only
-};
-
-#define E1000_FACTPS_MNGCG    0x20000000
-
-#define E1000_FWSM_MODE_MASK  0xE
-#define E1000_FWSM_MODE_SHIFT 1
-
-#define E1000_MNG_IAMT_MODE                  0x3
-#define E1000_MNG_DHCP_COOKIE_LENGTH         0x10
-#define E1000_MNG_DHCP_COOKIE_OFFSET         0x6F0
-#define E1000_MNG_DHCP_COMMAND_TIMEOUT       10
-#define E1000_MNG_DHCP_TX_PAYLOAD_CMD        64
-#define E1000_MNG_DHCP_COOKIE_STATUS_PARSING 0x1
-#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN    0x2
-
-#define E1000_VFTA_ENTRY_SHIFT               5
-#define E1000_VFTA_ENTRY_MASK                0x7F
-#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK      0x1F
-
-#define E1000_HI_MAX_BLOCK_BYTE_LENGTH       1792 /* Num of bytes in range */
-#define E1000_HI_MAX_BLOCK_DWORD_LENGTH      448 /* Num of dwords in range */
-#define E1000_HI_COMMAND_TIMEOUT             500 /* Process HI command limit */
-
-#define E1000_HICR_EN              0x01  /* Enable bit - RO */
-/* Driver sets this bit when done to put command in RAM */
-#define E1000_HICR_C               0x02
-#define E1000_HICR_SV              0x04  /* Status Validity */
-#define E1000_HICR_FW_RESET_ENABLE 0x40
-#define E1000_HICR_FW_RESET        0x80
-
-/* Intel(R) Active Management Technology signature */
-#define E1000_IAMT_SIGNATURE  0x544D4149
-
-#endif
diff --git a/src/drivers/net/e1000/e1000_nvm.c b/src/drivers/net/e1000/e1000_nvm.c
deleted file mode 100644 (file)
index 488252f..0000000
+++ /dev/null
@@ -1,923 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include "e1000_api.h"
-
-static void e1000_reload_nvm_generic(struct e1000_hw *hw);
-
-/**
- *  e1000_init_nvm_ops_generic - Initialize NVM function pointers
- *  @hw: pointer to the HW structure
- *
- *  Setups up the function pointers to no-op functions
- **/
-void e1000_init_nvm_ops_generic(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       DEBUGFUNC("e1000_init_nvm_ops_generic");
-
-       /* Initialize function pointers */
-       nvm->ops.init_params = e1000_null_ops_generic;
-       nvm->ops.acquire = e1000_null_ops_generic;
-       nvm->ops.read = e1000_null_read_nvm;
-       nvm->ops.release = e1000_null_nvm_generic;
-       nvm->ops.reload = e1000_reload_nvm_generic;
-       nvm->ops.update = e1000_null_ops_generic;
-       nvm->ops.valid_led_default = e1000_null_led_default;
-       nvm->ops.validate = e1000_null_ops_generic;
-       nvm->ops.write = e1000_null_write_nvm;
-}
-
-/**
- *  e1000_null_nvm_read - No-op function, return 0
- *  @hw: pointer to the HW structure
- **/
-s32 e1000_null_read_nvm(struct e1000_hw *hw __unused, u16 a __unused,
-                        u16 b __unused, u16 *c __unused)
-{
-       DEBUGFUNC("e1000_null_read_nvm");
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_null_nvm_generic - No-op function, return void
- *  @hw: pointer to the HW structure
- **/
-void e1000_null_nvm_generic(struct e1000_hw *hw __unused)
-{
-       DEBUGFUNC("e1000_null_nvm_generic");
-       return;
-}
-
-/**
- *  e1000_null_led_default - No-op function, return 0
- *  @hw: pointer to the HW structure
- **/
-s32 e1000_null_led_default(struct e1000_hw *hw __unused,
-                           u16 *data __unused)
-{
-       DEBUGFUNC("e1000_null_led_default");
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_null_write_nvm - No-op function, return 0
- *  @hw: pointer to the HW structure
- **/
-s32 e1000_null_write_nvm(struct e1000_hw *hw __unused, u16 a __unused,
-                         u16 b __unused, u16 *c __unused)
-{
-       DEBUGFUNC("e1000_null_write_nvm");
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_raise_eec_clk - Raise EEPROM clock
- *  @hw: pointer to the HW structure
- *  @eecd: pointer to the EEPROM
- *
- *  Enable/Raise the EEPROM clock bit.
- **/
-static void e1000_raise_eec_clk(struct e1000_hw *hw, u32 *eecd)
-{
-       *eecd = *eecd | E1000_EECD_SK;
-       E1000_WRITE_REG(hw, E1000_EECD, *eecd);
-       E1000_WRITE_FLUSH(hw);
-       usec_delay(hw->nvm.delay_usec);
-}
-
-/**
- *  e1000_lower_eec_clk - Lower EEPROM clock
- *  @hw: pointer to the HW structure
- *  @eecd: pointer to the EEPROM
- *
- *  Clear/Lower the EEPROM clock bit.
- **/
-static void e1000_lower_eec_clk(struct e1000_hw *hw, u32 *eecd)
-{
-       *eecd = *eecd & ~E1000_EECD_SK;
-       E1000_WRITE_REG(hw, E1000_EECD, *eecd);
-       E1000_WRITE_FLUSH(hw);
-       usec_delay(hw->nvm.delay_usec);
-}
-
-/**
- *  e1000_shift_out_eec_bits - Shift data bits our to the EEPROM
- *  @hw: pointer to the HW structure
- *  @data: data to send to the EEPROM
- *  @count: number of bits to shift out
- *
- *  We need to shift 'count' bits out to the EEPROM.  So, the value in the
- *  "data" parameter will be shifted out to the EEPROM one bit at a time.
- *  In order to do this, "data" must be broken down into bits.
- **/
-static void e1000_shift_out_eec_bits(struct e1000_hw *hw, u16 data, u16 count)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = E1000_READ_REG(hw, E1000_EECD);
-       u32 mask;
-
-       DEBUGFUNC("e1000_shift_out_eec_bits");
-
-       mask = 0x01 << (count - 1);
-       if (nvm->type == e1000_nvm_eeprom_microwire)
-               eecd &= ~E1000_EECD_DO;
-       else
-       if (nvm->type == e1000_nvm_eeprom_spi)
-               eecd |= E1000_EECD_DO;
-
-       do {
-               eecd &= ~E1000_EECD_DI;
-
-               if (data & mask)
-                       eecd |= E1000_EECD_DI;
-
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               E1000_WRITE_FLUSH(hw);
-
-               usec_delay(nvm->delay_usec);
-
-               e1000_raise_eec_clk(hw, &eecd);
-               e1000_lower_eec_clk(hw, &eecd);
-
-               mask >>= 1;
-       } while (mask);
-
-       eecd &= ~E1000_EECD_DI;
-       E1000_WRITE_REG(hw, E1000_EECD, eecd);
-}
-
-/**
- *  e1000_shift_in_eec_bits - Shift data bits in from the EEPROM
- *  @hw: pointer to the HW structure
- *  @count: number of bits to shift in
- *
- *  In order to read a register from the EEPROM, we need to shift 'count' bits
- *  in from the EEPROM.  Bits are "shifted in" by raising the clock input to
- *  the EEPROM (setting the SK bit), and then reading the value of the data out
- *  "DO" bit.  During this "shifting in" process the data in "DI" bit should
- *  always be clear.
- **/
-static u16 e1000_shift_in_eec_bits(struct e1000_hw *hw, u16 count)
-{
-       u32 eecd;
-       u32 i;
-       u16 data;
-
-       DEBUGFUNC("e1000_shift_in_eec_bits");
-
-       eecd = E1000_READ_REG(hw, E1000_EECD);
-
-       eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);
-       data = 0;
-
-       for (i = 0; i < count; i++) {
-               data <<= 1;
-               e1000_raise_eec_clk(hw, &eecd);
-
-               eecd = E1000_READ_REG(hw, E1000_EECD);
-
-               eecd &= ~E1000_EECD_DI;
-               if (eecd & E1000_EECD_DO)
-                       data |= 1;
-
-               e1000_lower_eec_clk(hw, &eecd);
-       }
-
-       return data;
-}
-
-/**
- *  e1000_poll_eerd_eewr_done - Poll for EEPROM read/write completion
- *  @hw: pointer to the HW structure
- *  @ee_reg: EEPROM flag for polling
- *
- *  Polls the EEPROM status bit for either read or write completion based
- *  upon the value of 'ee_reg'.
- **/
-s32 e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg)
-{
-       u32 attempts = 100000;
-       u32 i, reg = 0;
-       s32 ret_val = -E1000_ERR_NVM;
-
-       DEBUGFUNC("e1000_poll_eerd_eewr_done");
-
-       for (i = 0; i < attempts; i++) {
-               if (ee_reg == E1000_NVM_POLL_READ)
-                       reg = E1000_READ_REG(hw, E1000_EERD);
-               else
-                       reg = E1000_READ_REG(hw, E1000_EEWR);
-
-               if (reg & E1000_NVM_RW_REG_DONE) {
-                       ret_val = E1000_SUCCESS;
-                       break;
-               }
-
-               usec_delay(5);
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_acquire_nvm_generic - Generic request for access to EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Set the EEPROM access request bit and wait for EEPROM access grant bit.
- *  Return successful if access grant bit set, else clear the request for
- *  EEPROM access and return -E1000_ERR_NVM (-1).
- **/
-s32 e1000_acquire_nvm_generic(struct e1000_hw *hw)
-{
-       u32 eecd = E1000_READ_REG(hw, E1000_EECD);
-       s32 timeout = E1000_NVM_GRANT_ATTEMPTS;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_acquire_nvm_generic");
-
-       E1000_WRITE_REG(hw, E1000_EECD, eecd | E1000_EECD_REQ);
-       eecd = E1000_READ_REG(hw, E1000_EECD);
-
-       while (timeout) {
-               if (eecd & E1000_EECD_GNT)
-                       break;
-               usec_delay(5);
-               eecd = E1000_READ_REG(hw, E1000_EECD);
-               timeout--;
-       }
-
-       if (!timeout) {
-               eecd &= ~E1000_EECD_REQ;
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               DEBUGOUT("Could not acquire NVM grant\n");
-               ret_val = -E1000_ERR_NVM;
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000_standby_nvm - Return EEPROM to standby state
- *  @hw: pointer to the HW structure
- *
- *  Return the EEPROM to a standby state.
- **/
-static void e1000_standby_nvm(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = E1000_READ_REG(hw, E1000_EECD);
-
-       DEBUGFUNC("e1000_standby_nvm");
-
-       if (nvm->type == e1000_nvm_eeprom_microwire) {
-               eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               E1000_WRITE_FLUSH(hw);
-               usec_delay(nvm->delay_usec);
-
-               e1000_raise_eec_clk(hw, &eecd);
-
-               /* Select EEPROM */
-               eecd |= E1000_EECD_CS;
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               E1000_WRITE_FLUSH(hw);
-               usec_delay(nvm->delay_usec);
-
-               e1000_lower_eec_clk(hw, &eecd);
-       } else
-       if (nvm->type == e1000_nvm_eeprom_spi) {
-               /* Toggle CS to flush commands */
-               eecd |= E1000_EECD_CS;
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               E1000_WRITE_FLUSH(hw);
-               usec_delay(nvm->delay_usec);
-               eecd &= ~E1000_EECD_CS;
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               E1000_WRITE_FLUSH(hw);
-               usec_delay(nvm->delay_usec);
-       }
-}
-
-/**
- *  e1000_stop_nvm - Terminate EEPROM command
- *  @hw: pointer to the HW structure
- *
- *  Terminates the current command by inverting the EEPROM's chip select pin.
- **/
-void e1000_stop_nvm(struct e1000_hw *hw)
-{
-       u32 eecd;
-
-       DEBUGFUNC("e1000_stop_nvm");
-
-       eecd = E1000_READ_REG(hw, E1000_EECD);
-       if (hw->nvm.type == e1000_nvm_eeprom_spi) {
-               /* Pull CS high */
-               eecd |= E1000_EECD_CS;
-               e1000_lower_eec_clk(hw, &eecd);
-       } else if (hw->nvm.type == e1000_nvm_eeprom_microwire) {
-               /* CS on Microwire is active-high */
-               eecd &= ~(E1000_EECD_CS | E1000_EECD_DI);
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               e1000_raise_eec_clk(hw, &eecd);
-               e1000_lower_eec_clk(hw, &eecd);
-       }
-}
-
-/**
- *  e1000_release_nvm_generic - Release exclusive access to EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Stop any current commands to the EEPROM and clear the EEPROM request bit.
- **/
-void e1000_release_nvm_generic(struct e1000_hw *hw)
-{
-       u32 eecd;
-
-       DEBUGFUNC("e1000_release_nvm_generic");
-
-       e1000_stop_nvm(hw);
-
-       eecd = E1000_READ_REG(hw, E1000_EECD);
-       eecd &= ~E1000_EECD_REQ;
-       E1000_WRITE_REG(hw, E1000_EECD, eecd);
-}
-
-/**
- *  e1000_ready_nvm_eeprom - Prepares EEPROM for read/write
- *  @hw: pointer to the HW structure
- *
- *  Setups the EEPROM for reading and writing.
- **/
-static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = E1000_READ_REG(hw, E1000_EECD);
-       s32 ret_val = E1000_SUCCESS;
-       u16 timeout = 0;
-       u8 spi_stat_reg;
-
-       DEBUGFUNC("e1000_ready_nvm_eeprom");
-
-       if (nvm->type == e1000_nvm_eeprom_microwire) {
-               /* Clear SK and DI */
-               eecd &= ~(E1000_EECD_DI | E1000_EECD_SK);
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               /* Set CS */
-               eecd |= E1000_EECD_CS;
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-       } else
-       if (nvm->type == e1000_nvm_eeprom_spi) {
-               /* Clear SK and CS */
-               eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               usec_delay(1);
-               timeout = NVM_MAX_RETRY_SPI;
-
-               /*
-                * Read "Status Register" repeatedly until the LSB is cleared.
-                * The EEPROM will signal that the command has been completed
-                * by clearing bit 0 of the internal status register.  If it's
-                * not cleared within 'timeout', then error out.
-                */
-               while (timeout) {
-                       e1000_shift_out_eec_bits(hw, NVM_RDSR_OPCODE_SPI,
-                                                hw->nvm.opcode_bits);
-                       spi_stat_reg = (u8)e1000_shift_in_eec_bits(hw, 8);
-                       if (!(spi_stat_reg & NVM_STATUS_RDY_SPI))
-                               break;
-
-                       usec_delay(5);
-                       e1000_standby_nvm(hw);
-                       timeout--;
-               }
-
-               if (!timeout) {
-                       DEBUGOUT("SPI NVM Status error\n");
-                       ret_val = -E1000_ERR_NVM;
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_read_nvm_spi - Read EEPROM's using SPI
- *  @hw: pointer to the HW structure
- *  @offset: offset of word in the EEPROM to read
- *  @words: number of words to read
- *  @data: word read from the EEPROM
- *
- *  Reads a 16 bit word from the EEPROM.
- **/
-s32 e1000_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 i = 0;
-       s32 ret_val;
-       u16 word_in;
-       u8 read_opcode = NVM_READ_OPCODE_SPI;
-
-       DEBUGFUNC("e1000_read_nvm_spi");
-
-       /*
-        * A check for invalid values:  offset too large, too many words,
-        * and not enough words.
-        */
-       if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-           (words == 0)) {
-               DEBUGOUT("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       ret_val = nvm->ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000_ready_nvm_eeprom(hw);
-       if (ret_val)
-               goto release;
-
-       e1000_standby_nvm(hw);
-
-       if ((nvm->address_bits == 8) && (offset >= 128))
-               read_opcode |= NVM_A8_OPCODE_SPI;
-
-       /* Send the READ command (opcode + addr) */
-       e1000_shift_out_eec_bits(hw, read_opcode, nvm->opcode_bits);
-       e1000_shift_out_eec_bits(hw, (u16)(offset*2), nvm->address_bits);
-
-       /*
-        * Read the data.  SPI NVMs increment the address with each byte
-        * read and will roll over if reading beyond the end.  This allows
-        * us to read the whole NVM from any offset
-        */
-       for (i = 0; i < words; i++) {
-               word_in = e1000_shift_in_eec_bits(hw, 16);
-               data[i] = (word_in >> 8) | (word_in << 8);
-       }
-
-release:
-       nvm->ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_read_nvm_microwire - Reads EEPROM's using microwire
- *  @hw: pointer to the HW structure
- *  @offset: offset of word in the EEPROM to read
- *  @words: number of words to read
- *  @data: word read from the EEPROM
- *
- *  Reads a 16 bit word from the EEPROM.
- **/
-s32 e1000_read_nvm_microwire(struct e1000_hw *hw, u16 offset, u16 words,
-                             u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 i = 0;
-       s32 ret_val;
-       u8 read_opcode = NVM_READ_OPCODE_MICROWIRE;
-
-       DEBUGFUNC("e1000_read_nvm_microwire");
-
-       /*
-        * A check for invalid values:  offset too large, too many words,
-        * and not enough words.
-        */
-       if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-           (words == 0)) {
-               DEBUGOUT("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       ret_val = nvm->ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000_ready_nvm_eeprom(hw);
-       if (ret_val)
-               goto release;
-
-       for (i = 0; i < words; i++) {
-               /* Send the READ command (opcode + addr) */
-               e1000_shift_out_eec_bits(hw, read_opcode, nvm->opcode_bits);
-               e1000_shift_out_eec_bits(hw, (u16)(offset + i),
-                                       nvm->address_bits);
-
-               /*
-                * Read the data.  For microwire, each word requires the
-                * overhead of setup and tear-down.
-                */
-               data[i] = e1000_shift_in_eec_bits(hw, 16);
-               e1000_standby_nvm(hw);
-       }
-
-release:
-       nvm->ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_read_nvm_eerd - Reads EEPROM using EERD register
- *  @hw: pointer to the HW structure
- *  @offset: offset of word in the EEPROM to read
- *  @words: number of words to read
- *  @data: word read from the EEPROM
- *
- *  Reads a 16 bit word from the EEPROM using the EERD register.
- **/
-s32 e1000_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 i, eerd = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_read_nvm_eerd");
-
-       /*
-        * A check for invalid values:  offset too large, too many words,
-        * too many words for the offset, and not enough words.
-        */
-       if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-           (words == 0)) {
-               DEBUGOUT("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       for (i = 0; i < words; i++) {
-               eerd = ((offset+i) << E1000_NVM_RW_ADDR_SHIFT) +
-                      E1000_NVM_RW_REG_START;
-
-               E1000_WRITE_REG(hw, E1000_EERD, eerd);
-               ret_val = e1000_poll_eerd_eewr_done(hw, E1000_NVM_POLL_READ);
-               if (ret_val)
-                       break;
-
-               data[i] = (E1000_READ_REG(hw, E1000_EERD) >>
-                          E1000_NVM_RW_REG_DATA);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_write_nvm_spi - Write to EEPROM using SPI
- *  @hw: pointer to the HW structure
- *  @offset: offset within the EEPROM to be written to
- *  @words: number of words to write
- *  @data: 16 bit word(s) to be written to the EEPROM
- *
- *  Writes data to EEPROM at offset using SPI interface.
- *
- *  If e1000_update_nvm_checksum is not called after this function , the
- *  EEPROM will most likely contain an invalid checksum.
- **/
-s32 e1000_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       s32 ret_val;
-       u16 widx = 0;
-
-       DEBUGFUNC("e1000_write_nvm_spi");
-
-       /*
-        * A check for invalid values:  offset too large, too many words,
-        * and not enough words.
-        */
-       if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-           (words == 0)) {
-               DEBUGOUT("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       ret_val = nvm->ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       while (widx < words) {
-               u8 write_opcode = NVM_WRITE_OPCODE_SPI;
-
-               ret_val = e1000_ready_nvm_eeprom(hw);
-               if (ret_val)
-                       goto release;
-
-               e1000_standby_nvm(hw);
-
-               /* Send the WRITE ENABLE command (8 bit opcode) */
-               e1000_shift_out_eec_bits(hw, NVM_WREN_OPCODE_SPI,
-                                        nvm->opcode_bits);
-
-               e1000_standby_nvm(hw);
-
-               /*
-                * Some SPI eeproms use the 8th address bit embedded in the
-                * opcode
-                */
-               if ((nvm->address_bits == 8) && (offset >= 128))
-                       write_opcode |= NVM_A8_OPCODE_SPI;
-
-               /* Send the Write command (8-bit opcode + addr) */
-               e1000_shift_out_eec_bits(hw, write_opcode, nvm->opcode_bits);
-               e1000_shift_out_eec_bits(hw, (u16)((offset + widx) * 2),
-                                        nvm->address_bits);
-
-               /* Loop to allow for up to whole page write of eeprom */
-               while (widx < words) {
-                       u16 word_out = data[widx];
-                       word_out = (word_out >> 8) | (word_out << 8);
-                       e1000_shift_out_eec_bits(hw, word_out, 16);
-                       widx++;
-
-                       if ((((offset + widx) * 2) % nvm->page_size) == 0) {
-                               e1000_standby_nvm(hw);
-                               break;
-                       }
-               }
-       }
-
-       msec_delay(10);
-release:
-       nvm->ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_write_nvm_microwire - Writes EEPROM using microwire
- *  @hw: pointer to the HW structure
- *  @offset: offset within the EEPROM to be written to
- *  @words: number of words to write
- *  @data: 16 bit word(s) to be written to the EEPROM
- *
- *  Writes data to EEPROM at offset using microwire interface.
- *
- *  If e1000_update_nvm_checksum is not called after this function , the
- *  EEPROM will most likely contain an invalid checksum.
- **/
-s32 e1000_write_nvm_microwire(struct e1000_hw *hw, u16 offset, u16 words,
-                              u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       s32  ret_val;
-       u32 eecd;
-       u16 words_written = 0;
-       u16 widx = 0;
-
-       DEBUGFUNC("e1000_write_nvm_microwire");
-
-       /*
-        * A check for invalid values:  offset too large, too many words,
-        * and not enough words.
-        */
-       if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-           (words == 0)) {
-               DEBUGOUT("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       ret_val = nvm->ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000_ready_nvm_eeprom(hw);
-       if (ret_val)
-               goto release;
-
-       e1000_shift_out_eec_bits(hw, NVM_EWEN_OPCODE_MICROWIRE,
-                                (u16)(nvm->opcode_bits + 2));
-
-       e1000_shift_out_eec_bits(hw, 0, (u16)(nvm->address_bits - 2));
-
-       e1000_standby_nvm(hw);
-
-       while (words_written < words) {
-               e1000_shift_out_eec_bits(hw, NVM_WRITE_OPCODE_MICROWIRE,
-                                        nvm->opcode_bits);
-
-               e1000_shift_out_eec_bits(hw, (u16)(offset + words_written),
-                                        nvm->address_bits);
-
-               e1000_shift_out_eec_bits(hw, data[words_written], 16);
-
-               e1000_standby_nvm(hw);
-
-               for (widx = 0; widx < 200; widx++) {
-                       eecd = E1000_READ_REG(hw, E1000_EECD);
-                       if (eecd & E1000_EECD_DO)
-                               break;
-                       usec_delay(50);
-               }
-
-               if (widx == 200) {
-                       DEBUGOUT("NVM Write did not complete\n");
-                       ret_val = -E1000_ERR_NVM;
-                       goto release;
-               }
-
-               e1000_standby_nvm(hw);
-
-               words_written++;
-       }
-
-       e1000_shift_out_eec_bits(hw, NVM_EWDS_OPCODE_MICROWIRE,
-                                (u16)(nvm->opcode_bits + 2));
-
-       e1000_shift_out_eec_bits(hw, 0, (u16)(nvm->address_bits - 2));
-
-release:
-       nvm->ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_read_pba_num_generic - Read device part number
- *  @hw: pointer to the HW structure
- *  @pba_num: pointer to device part number
- *
- *  Reads the product board assembly (PBA) number from the EEPROM and stores
- *  the value in pba_num.
- **/
-s32 e1000_read_pba_num_generic(struct e1000_hw *hw, u32 *pba_num)
-{
-       s32  ret_val;
-       u16 nvm_data;
-
-       DEBUGFUNC("e1000_read_pba_num_generic");
-
-       ret_val = hw->nvm.ops.read(hw, NVM_PBA_OFFSET_0, 1, &nvm_data);
-       if (ret_val) {
-               DEBUGOUT("NVM Read Error\n");
-               goto out;
-       }
-       *pba_num = (u32)(nvm_data << 16);
-
-       ret_val = hw->nvm.ops.read(hw, NVM_PBA_OFFSET_1, 1, &nvm_data);
-       if (ret_val) {
-               DEBUGOUT("NVM Read Error\n");
-               goto out;
-       }
-       *pba_num |= nvm_data;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_read_mac_addr_generic - Read device MAC address
- *  @hw: pointer to the HW structure
- *
- *  Reads the device MAC address from the EEPROM and stores the value.
- *  Since devices with two ports use the same EEPROM, we increment the
- *  last bit in the MAC address for the second port.
- **/
-s32 e1000_read_mac_addr_generic(struct e1000_hw *hw)
-{
-       u32 rar_high;
-       u32 rar_low;
-       u16 i;
-
-       rar_high = E1000_READ_REG(hw, E1000_RAH(0));
-       rar_low = E1000_READ_REG(hw, E1000_RAL(0));
-
-       for (i = 0; i < E1000_RAL_MAC_ADDR_LEN; i++)
-               hw->mac.perm_addr[i] = (u8)(rar_low >> (i*8));
-
-       for (i = 0; i < E1000_RAH_MAC_ADDR_LEN; i++)
-               hw->mac.perm_addr[i+4] = (u8)(rar_high >> (i*8));
-
-       for (i = 0; i < ETH_ADDR_LEN; i++)
-               hw->mac.addr[i] = hw->mac.perm_addr[i];
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_validate_nvm_checksum_generic - Validate EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Calculates the EEPROM checksum by reading/adding each word of the EEPROM
- *  and then verifies that the sum of the EEPROM is equal to 0xBABA.
- **/
-s32 e1000_validate_nvm_checksum_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 checksum = 0;
-       u16 i, nvm_data;
-
-       DEBUGFUNC("e1000_validate_nvm_checksum_generic");
-
-       for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
-               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       DEBUGOUT("NVM Read Error\n");
-                       goto out;
-               }
-               checksum += nvm_data;
-       }
-
-       if (checksum != (u16) NVM_SUM) {
-               DEBUGOUT("NVM Checksum Invalid\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_update_nvm_checksum_generic - Update EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Updates the EEPROM checksum by reading/adding each word of the EEPROM
- *  up to the checksum.  Then calculates the EEPROM checksum and writes the
- *  value to the EEPROM.
- **/
-s32 e1000_update_nvm_checksum_generic(struct e1000_hw *hw)
-{
-       s32  ret_val;
-       u16 checksum = 0;
-       u16 i, nvm_data;
-
-       DEBUGFUNC("e1000_update_nvm_checksum");
-
-       for (i = 0; i < NVM_CHECKSUM_REG; i++) {
-               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       DEBUGOUT("NVM Read Error while updating checksum.\n");
-                       goto out;
-               }
-               checksum += nvm_data;
-       }
-       checksum = (u16) NVM_SUM - checksum;
-       ret_val = hw->nvm.ops.write(hw, NVM_CHECKSUM_REG, 1, &checksum);
-       if (ret_val)
-               DEBUGOUT("NVM Write Error while updating checksum.\n");
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_reload_nvm_generic - Reloads EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Reloads the EEPROM by setting the "Reinitialize from EEPROM" bit in the
- *  extended control register.
- **/
-static void e1000_reload_nvm_generic(struct e1000_hw *hw)
-{
-       u32 ctrl_ext;
-
-       DEBUGFUNC("e1000_reload_nvm_generic");
-
-       usec_delay(10);
-       ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
-       ctrl_ext |= E1000_CTRL_EXT_EE_RST;
-       E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
-       E1000_WRITE_FLUSH(hw);
-}
diff --git a/src/drivers/net/e1000/e1000_nvm.h b/src/drivers/net/e1000/e1000_nvm.h
deleted file mode 100644 (file)
index 1585417..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000_NVM_H_
-#define _E1000_NVM_H_
-
-void e1000_init_nvm_ops_generic(struct e1000_hw *hw);
-s32  e1000_null_read_nvm(struct e1000_hw *hw, u16 a, u16 b, u16 *c);
-void e1000_null_nvm_generic(struct e1000_hw *hw);
-s32  e1000_null_led_default(struct e1000_hw *hw, u16 *data);
-s32  e1000_null_write_nvm(struct e1000_hw *hw, u16 a, u16 b, u16 *c);
-s32  e1000_acquire_nvm_generic(struct e1000_hw *hw);
-
-s32  e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);
-s32  e1000_read_mac_addr_generic(struct e1000_hw *hw);
-s32  e1000_read_pba_num_generic(struct e1000_hw *hw, u32 *pba_num);
-s32  e1000_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
-s32  e1000_read_nvm_microwire(struct e1000_hw *hw, u16 offset,
-                              u16 words, u16 *data);
-s32  e1000_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words,
-                         u16 *data);
-s32  e1000_valid_led_default_generic(struct e1000_hw *hw, u16 *data);
-s32  e1000_validate_nvm_checksum_generic(struct e1000_hw *hw);
-s32  e1000_write_nvm_eewr(struct e1000_hw *hw, u16 offset,
-                          u16 words, u16 *data);
-s32  e1000_write_nvm_microwire(struct e1000_hw *hw, u16 offset,
-                               u16 words, u16 *data);
-s32  e1000_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words,
-                         u16 *data);
-s32  e1000_update_nvm_checksum_generic(struct e1000_hw *hw);
-void e1000_stop_nvm(struct e1000_hw *hw);
-void e1000_release_nvm_generic(struct e1000_hw *hw);
-
-#define E1000_STM_OPCODE  0xDB00
-
-#endif
diff --git a/src/drivers/net/e1000/e1000_osdep.h b/src/drivers/net/e1000/e1000_osdep.h
deleted file mode 100644 (file)
index 5cd8e39..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/* glue for the OS-dependent part of e1000
- * includes register access macros
- */
-
-#ifndef _E1000_OSDEP_H_
-#define _E1000_OSDEP_H_
-
-#define u8         unsigned char
-#define bool       boolean_t
-#define dma_addr_t unsigned long
-#define __le16     uint16_t
-#define __le32     uint32_t
-#define __le64     uint64_t
-
-#define __iomem
-
-#define ETH_FCS_LEN 4
-
-typedef int spinlock_t;
-typedef enum {
-    false = 0,
-    true = 1
-} boolean_t;
-
-#define usec_delay(x) udelay(x)
-#define msec_delay(x) mdelay(x)
-#define msec_delay_irq(x) mdelay(x)
-
-#define PCI_COMMAND_REGISTER   PCI_COMMAND
-#define CMD_MEM_WRT_INVALIDATE PCI_COMMAND_INVALIDATE
-#define ETH_ADDR_LEN           ETH_ALEN
-
-#define DEBUGFUNC(F) DBG(F "\n")
-
-#define DEBUGOUT(S)             DBG(S)
-#define DEBUGOUT1(S, A...)      DBG(S, A)
-
-#define DEBUGOUT2 DEBUGOUT1
-#define DEBUGOUT3 DEBUGOUT2
-#define DEBUGOUT7 DEBUGOUT3
-
-#define E1000_REGISTER(a, reg) (((a)->mac.type >= e1000_82543) \
-                               ? reg                           \
-                               : e1000_translate_register_82542(reg))
-
-#define E1000_WRITE_REG(a, reg, value) \
-    writel((value), ((a)->hw_addr + E1000_REGISTER(a, reg)))
-
-#define E1000_READ_REG(a, reg) (readl((a)->hw_addr + E1000_REGISTER(a, reg)))
-
-#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) \
-    writel((value), ((a)->hw_addr + E1000_REGISTER(a, reg) + ((offset) << 2)))
-
-#define E1000_READ_REG_ARRAY(a, reg, offset) ( \
-    readl((a)->hw_addr + E1000_REGISTER(a, reg) + ((offset) << 2)))
-
-#define E1000_READ_REG_ARRAY_DWORD E1000_READ_REG_ARRAY
-#define E1000_WRITE_REG_ARRAY_DWORD E1000_WRITE_REG_ARRAY
-
-#define E1000_WRITE_REG_ARRAY_WORD(a, reg, offset, value) ( \
-    writew((value), ((a)->hw_addr + E1000_REGISTER(a, reg) + ((offset) << 1))))
-
-#define E1000_READ_REG_ARRAY_WORD(a, reg, offset) ( \
-    readw((a)->hw_addr + E1000_REGISTER(a, reg) + ((offset) << 1)))
-
-#define E1000_WRITE_REG_ARRAY_BYTE(a, reg, offset, value) ( \
-    writeb((value), ((a)->hw_addr + E1000_REGISTER(a, reg) + (offset))))
-
-#define E1000_READ_REG_ARRAY_BYTE(a, reg, offset) ( \
-    readb((a)->hw_addr + E1000_REGISTER(a, reg) + (offset)))
-
-#define E1000_WRITE_REG_IO(a, reg, offset) do { \
-    outl(reg, ((a)->io_base));                  \
-    outl(offset, ((a)->io_base + 4));      } while(0)
-
-#define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, E1000_STATUS)
-
-#define E1000_WRITE_FLASH_REG(a, reg, value) ( \
-    writel((value), ((a)->flash_address + reg)))
-
-#define E1000_WRITE_FLASH_REG16(a, reg, value) ( \
-    writew((value), ((a)->flash_address + reg)))
-
-#define E1000_READ_FLASH_REG(a, reg) (readl((a)->flash_address + reg))
-
-#define E1000_READ_FLASH_REG16(a, reg) (readw((a)->flash_address + reg))
-
-#endif /* _E1000_OSDEP_H_ */
diff --git a/src/drivers/net/e1000/e1000_phy.c b/src/drivers/net/e1000/e1000_phy.c
deleted file mode 100644 (file)
index b3cad48..0000000
+++ /dev/null
@@ -1,2308 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include "e1000_api.h"
-
-#if 0
-/* Cable length tables */
-static const u16 e1000_m88_cable_length_table[] =
-       { 0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };
-#define M88E1000_CABLE_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_m88_cable_length_table) / \
-                 sizeof(e1000_m88_cable_length_table[0]))
-
-static const u16 e1000_igp_2_cable_length_table[] =
-    { 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21,
-      0, 0, 0, 3, 6, 10, 13, 16, 19, 23, 26, 29, 32, 35, 38, 41,
-      6, 10, 14, 18, 22, 26, 30, 33, 37, 41, 44, 48, 51, 54, 58, 61,
-      21, 26, 31, 35, 40, 44, 49, 53, 57, 61, 65, 68, 72, 75, 79, 82,
-      40, 45, 51, 56, 61, 66, 70, 75, 79, 83, 87, 91, 94, 98, 101, 104,
-      60, 66, 72, 77, 82, 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121,
-      83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,
-      104, 109, 114, 118, 121, 124};
-#define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_igp_2_cable_length_table) / \
-                 sizeof(e1000_igp_2_cable_length_table[0]))
-#endif
-
-/**
- *  e1000_init_phy_ops_generic - Initialize PHY function pointers
- *  @hw: pointer to the HW structure
- *
- *  Setups up the function pointers to no-op functions
- **/
-void e1000_init_phy_ops_generic(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       DEBUGFUNC("e1000_init_phy_ops_generic");
-
-       /* Initialize function pointers */
-       phy->ops.init_params = e1000_null_ops_generic;
-       phy->ops.acquire = e1000_null_ops_generic;
-       phy->ops.check_polarity = e1000_null_ops_generic;
-       phy->ops.check_reset_block = e1000_null_ops_generic;
-       phy->ops.commit = e1000_null_ops_generic;
-#if 0
-       phy->ops.force_speed_duplex = e1000_null_ops_generic;
-#endif
-       phy->ops.get_cfg_done = e1000_null_ops_generic;
-#if 0
-       phy->ops.get_cable_length = e1000_null_ops_generic;
-#endif
-       phy->ops.get_info = e1000_null_ops_generic;
-       phy->ops.read_reg = e1000_null_read_reg;
-       phy->ops.release = e1000_null_phy_generic;
-       phy->ops.reset = e1000_null_ops_generic;
-       phy->ops.set_d0_lplu_state = e1000_null_lplu_state;
-       phy->ops.set_d3_lplu_state = e1000_null_lplu_state;
-       phy->ops.write_reg = e1000_null_write_reg;
-       phy->ops.power_up = e1000_null_phy_generic;
-       phy->ops.power_down = e1000_null_phy_generic;
-}
-
-/**
- *  e1000_null_read_reg - No-op function, return 0
- *  @hw: pointer to the HW structure
- **/
-s32 e1000_null_read_reg(struct e1000_hw *hw __unused, u32 offset __unused,
-                        u16 *data __unused)
-{
-       DEBUGFUNC("e1000_null_read_reg");
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_null_phy_generic - No-op function, return void
- *  @hw: pointer to the HW structure
- **/
-void e1000_null_phy_generic(struct e1000_hw *hw __unused)
-{
-       DEBUGFUNC("e1000_null_phy_generic");
-       return;
-}
-
-/**
- *  e1000_null_lplu_state - No-op function, return 0
- *  @hw: pointer to the HW structure
- **/
-s32 e1000_null_lplu_state(struct e1000_hw *hw __unused, bool active __unused)
-{
-       DEBUGFUNC("e1000_null_lplu_state");
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_null_write_reg - No-op function, return 0
- *  @hw: pointer to the HW structure
- **/
-s32 e1000_null_write_reg(struct e1000_hw *hw __unused, u32 offset __unused,
-                         u16 data __unused)
-{
-       DEBUGFUNC("e1000_null_write_reg");
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_check_reset_block_generic - Check if PHY reset is blocked
- *  @hw: pointer to the HW structure
- *
- *  Read the PHY management control register and check whether a PHY reset
- *  is blocked.  If a reset is not blocked return E1000_SUCCESS, otherwise
- *  return E1000_BLK_PHY_RESET (12).
- **/
-s32 e1000_check_reset_block_generic(struct e1000_hw *hw)
-{
-       u32 manc;
-
-       DEBUGFUNC("e1000_check_reset_block");
-
-       manc = E1000_READ_REG(hw, E1000_MANC);
-
-       return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ?
-              E1000_BLK_PHY_RESET : E1000_SUCCESS;
-}
-
-/**
- *  e1000_get_phy_id - Retrieve the PHY ID and revision
- *  @hw: pointer to the HW structure
- *
- *  Reads the PHY registers and stores the PHY ID and possibly the PHY
- *  revision in the hardware structure.
- **/
-s32 e1000_get_phy_id(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_id;
-
-       DEBUGFUNC("e1000_get_phy_id");
-
-       if (!(phy->ops.read_reg))
-               goto out;
-
-               ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
-               if (ret_val)
-                       goto out;
-
-               phy->id = (u32)(phy_id << 16);
-               usec_delay(20);
-               ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id);
-               if (ret_val)
-                       goto out;
-
-               phy->id |= (u32)(phy_id & PHY_REVISION_MASK);
-               phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_phy_reset_dsp_generic - Reset PHY DSP
- *  @hw: pointer to the HW structure
- *
- *  Reset the digital signal processor.
- **/
-s32 e1000_phy_reset_dsp_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_phy_reset_dsp_generic");
-
-       if (!(hw->phy.ops.write_reg))
-               goto out;
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xC1);
-       if (ret_val)
-               goto out;
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_read_phy_reg_mdic - Read MDI control register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Reads the MDI control register in the PHY at offset and stores the
- *  information read to data.
- **/
-s32 e1000_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 i, mdic = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_read_phy_reg_mdic");
-
-       /*
-        * Set up Op-code, Phy Address, and register offset in the MDI
-        * Control register.  The MAC will take care of interfacing with the
-        * PHY to retrieve the desired data.
-        */
-       mdic = ((offset << E1000_MDIC_REG_SHIFT) |
-               (phy->addr << E1000_MDIC_PHY_SHIFT) |
-               (E1000_MDIC_OP_READ));
-
-       E1000_WRITE_REG(hw, E1000_MDIC, mdic);
-
-       /*
-        * Poll the ready bit to see if the MDI read completed
-        * Increasing the time out as testing showed failures with
-        * the lower time out
-        */
-       for (i = 0; i < (E1000_GEN_POLL_TIMEOUT * 3); i++) {
-               usec_delay(50);
-               mdic = E1000_READ_REG(hw, E1000_MDIC);
-               if (mdic & E1000_MDIC_READY)
-                       break;
-       }
-       if (!(mdic & E1000_MDIC_READY)) {
-               DEBUGOUT("MDI Read did not complete\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-       if (mdic & E1000_MDIC_ERROR) {
-               DEBUGOUT("MDI Error\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-       *data = (u16) mdic;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_write_phy_reg_mdic - Write MDI control register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write to register at offset
- *
- *  Writes data to MDI control register in the PHY at offset.
- **/
-s32 e1000_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 i, mdic = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_write_phy_reg_mdic");
-
-       /*
-        * Set up Op-code, Phy Address, and register offset in the MDI
-        * Control register.  The MAC will take care of interfacing with the
-        * PHY to retrieve the desired data.
-        */
-       mdic = (((u32)data) |
-               (offset << E1000_MDIC_REG_SHIFT) |
-               (phy->addr << E1000_MDIC_PHY_SHIFT) |
-               (E1000_MDIC_OP_WRITE));
-
-       E1000_WRITE_REG(hw, E1000_MDIC, mdic);
-
-       /*
-        * Poll the ready bit to see if the MDI read completed
-        * Increasing the time out as testing showed failures with
-        * the lower time out
-        */
-       for (i = 0; i < (E1000_GEN_POLL_TIMEOUT * 3); i++) {
-               usec_delay(50);
-               mdic = E1000_READ_REG(hw, E1000_MDIC);
-               if (mdic & E1000_MDIC_READY)
-                       break;
-       }
-       if (!(mdic & E1000_MDIC_READY)) {
-               DEBUGOUT("MDI Write did not complete\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-       if (mdic & E1000_MDIC_ERROR) {
-               DEBUGOUT("MDI Error\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_read_phy_reg_m88 - Read m88 PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore, if necessary, then reads the PHY register at offset
- *  and storing the retrieved information in data.  Release any acquired
- *  semaphores before exiting.
- **/
-s32 e1000_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_read_phy_reg_m88");
-
-       if (!(hw->phy.ops.acquire))
-               goto out;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                         data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_write_phy_reg_m88 - Write m88 PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore, if necessary, then writes the data to PHY register
- *  at the offset.  Release any acquired semaphores before exiting.
- **/
-s32 e1000_write_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_write_phy_reg_m88");
-
-       if (!(hw->phy.ops.acquire))
-               goto out;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_read_phy_reg_igp - Read igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore, if necessary, then reads the PHY register at offset
- *  and storing the retrieved information in data.  Release any acquired
- *  semaphores before exiting.
- **/
-s32 e1000_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_read_phy_reg_igp");
-
-       if (!(hw->phy.ops.acquire))
-               goto out;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-               ret_val = e1000_write_phy_reg_mdic(hw,
-                                                  IGP01E1000_PHY_PAGE_SELECT,
-                                                  (u16)offset);
-               if (ret_val) {
-                       hw->phy.ops.release(hw);
-                       goto out;
-               }
-       }
-
-       ret_val = e1000_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                         data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_write_phy_reg_igp - Write igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore, if necessary, then writes the data to PHY register
- *  at the offset.  Release any acquired semaphores before exiting.
- **/
-s32 e1000_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_write_phy_reg_igp");
-
-       if (!(hw->phy.ops.acquire))
-               goto out;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-               ret_val = e1000_write_phy_reg_mdic(hw,
-                                                  IGP01E1000_PHY_PAGE_SELECT,
-                                                  (u16)offset);
-               if (ret_val) {
-                       hw->phy.ops.release(hw);
-                       goto out;
-               }
-       }
-
-       ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_read_kmrn_reg_generic - Read kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore, if necessary.  Then reads the PHY register at offset
- *  using the kumeran interface.  The information retrieved is stored in data.
- *  Release any acquired semaphores before exiting.
- **/
-s32 e1000_read_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_read_kmrn_reg_generic");
-
-       if (!(hw->phy.ops.acquire))
-               goto out;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
-       E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta);
-
-       usec_delay(2);
-
-       kmrnctrlsta = E1000_READ_REG(hw, E1000_KMRNCTRLSTA);
-       *data = (u16)kmrnctrlsta;
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_write_kmrn_reg_generic - Write kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore, if necessary.  Then write the data to PHY register
- *  at the offset using the kumeran interface.  Release any acquired semaphores
- *  before exiting.
- **/
-s32 e1000_write_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("e1000_write_kmrn_reg_generic");
-
-       if (!(hw->phy.ops.acquire))
-               goto out;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | data;
-       E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta);
-
-       usec_delay(2);
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_copper_link_setup_m88 - Setup m88 PHY's for copper link
- *  @hw: pointer to the HW structure
- *
- *  Sets up MDI/MDI-X and polarity for m88 PHY's.  If necessary, transmit clock
- *  and downshift values are set also.
- **/
-s32 e1000_copper_link_setup_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-
-       DEBUGFUNC("e1000_copper_link_setup_m88");
-
-       if (phy->reset_disable) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       /* Enable CRS on TX. This must be set for half-duplex operation. */
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-
-       /*
-        * Options:
-        *   MDI/MDI-X = 0 (default)
-        *   0 - Auto for all speeds
-        *   1 - MDI mode
-        *   2 - MDI-X mode
-        *   3 - Auto for 1000Base-T only (MDI-X for 10/100Base-T modes)
-        */
-       phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-
-       switch (phy->mdix) {
-       case 1:
-               phy_data |= M88E1000_PSCR_MDI_MANUAL_MODE;
-               break;
-       case 2:
-               phy_data |= M88E1000_PSCR_MDIX_MANUAL_MODE;
-               break;
-       case 3:
-               phy_data |= M88E1000_PSCR_AUTO_X_1000T;
-               break;
-       case 0:
-       default:
-               phy_data |= M88E1000_PSCR_AUTO_X_MODE;
-               break;
-       }
-
-       /*
-        * Options:
-        *   disable_polarity_correction = 0 (default)
-        *       Automatic Correction for Reversed Cable Polarity
-        *   0 - Disabled
-        *   1 - Enabled
-        */
-       phy_data &= ~M88E1000_PSCR_POLARITY_REVERSAL;
-       if (phy->disable_polarity_correction == 1)
-               phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
-
-       ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       if (phy->revision < E1000_REVISION_4) {
-               /*
-                * Force TX_CLK in the Extended PHY Specific Control Register
-                * to 25MHz clock.
-                */
-               ret_val = phy->ops.read_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                            &phy_data);
-               if (ret_val)
-                       goto out;
-
-               phy_data |= M88E1000_EPSCR_TX_CLK_25;
-
-               if ((phy->revision == E1000_REVISION_2) &&
-                   (phy->id == M88E1111_I_PHY_ID)) {
-                       /* 82573L PHY - set the downshift counter to 5x. */
-                       phy_data &= ~M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK;
-                       phy_data |= M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X;
-               } else {
-                       /* Configure Master and Slave downshift values */
-                       phy_data &= ~(M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK |
-                                    M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK);
-                       phy_data |= (M88E1000_EPSCR_MASTER_DOWNSHIFT_1X |
-                                    M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X);
-               }
-               ret_val = phy->ops.write_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                            phy_data);
-               if (ret_val)
-                       goto out;
-       }
-
-       /* Commit the changes. */
-       ret_val = phy->ops.commit(hw);
-       if (ret_val) {
-               DEBUGOUT("Error committing the PHY changes\n");
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_copper_link_setup_igp - Setup igp PHY's for copper link
- *  @hw: pointer to the HW structure
- *
- *  Sets up LPLU, MDI/MDI-X, polarity, Smartspeed and Master/Slave config for
- *  igp PHY's.
- **/
-s32 e1000_copper_link_setup_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-       DEBUGFUNC("e1000_copper_link_setup_igp");
-
-       if (phy->reset_disable) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       ret_val = hw->phy.ops.reset(hw);
-       if (ret_val) {
-               DEBUGOUT("Error resetting the PHY.\n");
-               goto out;
-       }
-
-       /*
-        * Wait 100ms for MAC to configure PHY from NVM settings, to avoid
-        * timeout issues when LFS is enabled.
-        */
-       msec_delay(100);
-
-       /*
-        * The NVM settings will configure LPLU in D3 for
-        * non-IGP1 PHYs.
-        */
-       if (phy->type == e1000_phy_igp) {
-               /* disable lplu d3 during driver init */
-               ret_val = hw->phy.ops.set_d3_lplu_state(hw, false);
-               if (ret_val) {
-                       DEBUGOUT("Error Disabling LPLU D3\n");
-                       goto out;
-               }
-       }
-
-       /* disable lplu d0 during driver init */
-       if (hw->phy.ops.set_d0_lplu_state) {
-               ret_val = hw->phy.ops.set_d0_lplu_state(hw, false);
-               if (ret_val) {
-                       DEBUGOUT("Error Disabling LPLU D0\n");
-                       goto out;
-               }
-       }
-       /* Configure mdi-mdix settings */
-       ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CTRL, &data);
-       if (ret_val)
-               goto out;
-
-       data &= ~IGP01E1000_PSCR_AUTO_MDIX;
-
-       switch (phy->mdix) {
-       case 1:
-               data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
-               break;
-       case 2:
-               data |= IGP01E1000_PSCR_FORCE_MDI_MDIX;
-               break;
-       case 0:
-       default:
-               data |= IGP01E1000_PSCR_AUTO_MDIX;
-               break;
-       }
-       ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CTRL, data);
-       if (ret_val)
-               goto out;
-
-       /* set auto-master slave resolution settings */
-       if (hw->mac.autoneg) {
-               /*
-                * when autonegotiation advertisement is only 1000Mbps then we
-                * should disable SmartSpeed and enable Auto MasterSlave
-                * resolution as hardware default.
-                */
-               if (phy->autoneg_advertised == ADVERTISE_1000_FULL) {
-                       /* Disable SmartSpeed */
-                       ret_val = phy->ops.read_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-
-                       /* Set auto Master/Slave resolution process */
-                       ret_val = phy->ops.read_reg(hw, PHY_1000T_CTRL, &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~CR_1000T_MS_ENABLE;
-                       ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL, data);
-                       if (ret_val)
-                               goto out;
-               }
-
-               ret_val = phy->ops.read_reg(hw, PHY_1000T_CTRL, &data);
-               if (ret_val)
-                       goto out;
-
-               /* load defaults for future use */
-               phy->original_ms_type = (data & CR_1000T_MS_ENABLE) ?
-                       ((data & CR_1000T_MS_VALUE) ?
-                       e1000_ms_force_master :
-                       e1000_ms_force_slave) :
-                       e1000_ms_auto;
-
-               switch (phy->ms_type) {
-               case e1000_ms_force_master:
-                       data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
-                       break;
-               case e1000_ms_force_slave:
-                       data |= CR_1000T_MS_ENABLE;
-                       data &= ~(CR_1000T_MS_VALUE);
-                       break;
-               case e1000_ms_auto:
-                       data &= ~CR_1000T_MS_ENABLE;
-               default:
-                       break;
-               }
-               ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL, data);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_copper_link_autoneg - Setup/Enable autoneg for copper link
- *  @hw: pointer to the HW structure
- *
- *  Performs initial bounds checking on autoneg advertisement parameter, then
- *  configure to advertise the full capability.  Setup the PHY to autoneg
- *  and restart the negotiation process between the link partner.  If
- *  autoneg_wait_to_complete, then wait for autoneg to complete before exiting.
- **/
-s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_ctrl;
-
-       DEBUGFUNC("e1000_copper_link_autoneg");
-
-       /*
-        * Perform some bounds checking on the autoneg advertisement
-        * parameter.
-        */
-       phy->autoneg_advertised &= phy->autoneg_mask;
-
-       /*
-        * If autoneg_advertised is zero, we assume it was not defaulted
-        * by the calling code so we set to advertise full capability.
-        */
-       if (phy->autoneg_advertised == 0)
-               phy->autoneg_advertised = phy->autoneg_mask;
-
-       DEBUGOUT("Reconfiguring auto-neg advertisement params\n");
-       ret_val = e1000_phy_setup_autoneg(hw);
-       if (ret_val) {
-               DEBUGOUT("Error Setting up Auto-Negotiation\n");
-               goto out;
-       }
-       DEBUGOUT("Restarting Auto-Neg\n");
-
-       /*
-        * Restart auto-negotiation by setting the Auto Neg Enable bit and
-        * the Auto Neg Restart bit in the PHY control register.
-        */
-       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       phy_ctrl |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
-       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Does the user want to wait for Auto-Neg to complete here, or
-        * check at a later time (for example, callback routine).
-        */
-       if (phy->autoneg_wait_to_complete) {
-               ret_val = hw->mac.ops.wait_autoneg(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error while waiting for "
-                                "autoneg to complete\n");
-                       goto out;
-               }
-       }
-
-       hw->mac.get_link_status = true;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_phy_setup_autoneg - Configure PHY for auto-negotiation
- *  @hw: pointer to the HW structure
- *
- *  Reads the MII auto-neg advertisement register and/or the 1000T control
- *  register and if the PHY is already setup for auto-negotiation, then
- *  return successful.  Otherwise, setup advertisement and flow control to
- *  the appropriate values for the wanted auto-negotiation.
- **/
-s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 mii_autoneg_adv_reg;
-       u16 mii_1000t_ctrl_reg = 0;
-
-       DEBUGFUNC("e1000_phy_setup_autoneg");
-
-       phy->autoneg_advertised &= phy->autoneg_mask;
-
-       /* Read the MII Auto-Neg Advertisement Register (Address 4). */
-       ret_val = phy->ops.read_reg(hw, PHY_AUTONEG_ADV, &mii_autoneg_adv_reg);
-       if (ret_val)
-               goto out;
-
-       if (phy->autoneg_mask & ADVERTISE_1000_FULL) {
-               /* Read the MII 1000Base-T Control Register (Address 9). */
-               ret_val = phy->ops.read_reg(hw, PHY_1000T_CTRL,
-                                           &mii_1000t_ctrl_reg);
-               if (ret_val)
-                       goto out;
-       }
-
-       /*
-        * Need to parse both autoneg_advertised and fc and set up
-        * the appropriate PHY registers.  First we will parse for
-        * autoneg_advertised software override.  Since we can advertise
-        * a plethora of combinations, we need to check each bit
-        * individually.
-        */
-
-       /*
-        * First we clear all the 10/100 mb speed bits in the Auto-Neg
-        * Advertisement Register (Address 4) and the 1000 mb speed bits in
-        * the  1000Base-T Control Register (Address 9).
-        */
-       mii_autoneg_adv_reg &= ~(NWAY_AR_100TX_FD_CAPS |
-                                NWAY_AR_100TX_HD_CAPS |
-                                NWAY_AR_10T_FD_CAPS   |
-                                NWAY_AR_10T_HD_CAPS);
-       mii_1000t_ctrl_reg &= ~(CR_1000T_HD_CAPS | CR_1000T_FD_CAPS);
-
-       DEBUGOUT1("autoneg_advertised %x\n", phy->autoneg_advertised);
-
-       /* Do we want to advertise 10 Mb Half Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_10_HALF) {
-               DEBUGOUT("Advertise 10mb Half duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_10T_HD_CAPS;
-       }
-
-       /* Do we want to advertise 10 Mb Full Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_10_FULL) {
-               DEBUGOUT("Advertise 10mb Full duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_10T_FD_CAPS;
-       }
-
-       /* Do we want to advertise 100 Mb Half Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_100_HALF) {
-               DEBUGOUT("Advertise 100mb Half duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_100TX_HD_CAPS;
-       }
-
-       /* Do we want to advertise 100 Mb Full Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_100_FULL) {
-               DEBUGOUT("Advertise 100mb Full duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_100TX_FD_CAPS;
-       }
-
-       /* We do not allow the Phy to advertise 1000 Mb Half Duplex */
-       if (phy->autoneg_advertised & ADVERTISE_1000_HALF)
-               DEBUGOUT("Advertise 1000mb Half duplex request denied!\n");
-
-       /* Do we want to advertise 1000 Mb Full Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_1000_FULL) {
-               DEBUGOUT("Advertise 1000mb Full duplex\n");
-               mii_1000t_ctrl_reg |= CR_1000T_FD_CAPS;
-       }
-
-       /*
-        * Check for a software override of the flow control settings, and
-        * setup the PHY advertisement registers accordingly.  If
-        * auto-negotiation is enabled, then software will have to set the
-        * "PAUSE" bits to the correct value in the Auto-Negotiation
-        * Advertisement Register (PHY_AUTONEG_ADV) and re-start auto-
-        * negotiation.
-        *
-        * The possible values of the "fc" parameter are:
-        *      0:  Flow control is completely disabled
-        *      1:  Rx flow control is enabled (we can receive pause frames
-        *          but not send pause frames).
-        *      2:  Tx flow control is enabled (we can send pause frames
-        *          but we do not support receiving pause frames).
-        *      3:  Both Rx and Tx flow control (symmetric) are enabled.
-        *  other:  No software override.  The flow control configuration
-        *          in the EEPROM is used.
-        */
-       switch (hw->fc.current_mode) {
-       case e1000_fc_none:
-               /*
-                * Flow control (Rx & Tx) is completely disabled by a
-                * software over-ride.
-                */
-               mii_autoneg_adv_reg &= ~(NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-               break;
-       case e1000_fc_rx_pause:
-               /*
-                * Rx Flow control is enabled, and Tx Flow control is
-                * disabled, by a software over-ride.
-                *
-                * Since there really isn't a way to advertise that we are
-                * capable of Rx Pause ONLY, we will advertise that we
-                * support both symmetric and asymmetric Rx PAUSE.  Later
-                * (in e1000_config_fc_after_link_up) we will disable the
-                * hw's ability to send PAUSE frames.
-                */
-               mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-               break;
-       case e1000_fc_tx_pause:
-               /*
-                * Tx Flow control is enabled, and Rx Flow control is
-                * disabled, by a software over-ride.
-                */
-               mii_autoneg_adv_reg |= NWAY_AR_ASM_DIR;
-               mii_autoneg_adv_reg &= ~NWAY_AR_PAUSE;
-               break;
-       case e1000_fc_full:
-               /*
-                * Flow control (both Rx and Tx) is enabled by a software
-                * over-ride.
-                */
-               mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-               break;
-       default:
-               DEBUGOUT("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ret_val = phy->ops.write_reg(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);
-       if (ret_val)
-               goto out;
-
-       DEBUGOUT1("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);
-
-       if (phy->autoneg_mask & ADVERTISE_1000_FULL) {
-               ret_val = phy->ops.write_reg(hw,
-                                             PHY_1000T_CTRL,
-                                             mii_1000t_ctrl_reg);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_setup_copper_link_generic - Configure copper link settings
- *  @hw: pointer to the HW structure
- *
- *  Calls the appropriate function to configure the link for auto-neg or forced
- *  speed and duplex.  Then we check for link, once link is established calls
- *  to configure collision distance and flow control are called.  If link is
- *  not established, we return -E1000_ERR_PHY (-2).
- **/
-s32 e1000_setup_copper_link_generic(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       bool link;
-
-       DEBUGFUNC("e1000_setup_copper_link_generic");
-
-       if (hw->mac.autoneg) {
-               /*
-                * Setup autoneg and flow control advertisement and perform
-                * autonegotiation.
-                */
-               ret_val = e1000_copper_link_autoneg(hw);
-               if (ret_val)
-                       goto out;
-       } else {
-#if 0
-               /*
-                * PHY will be set to 10H, 10F, 100H or 100F
-                * depending on user settings.
-                */
-               DEBUGOUT("Forcing Speed and Duplex\n");
-               ret_val = hw->phy.ops.force_speed_duplex(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error Forcing Speed and Duplex\n");
-                       goto out;
-               }
-#endif
-       }
-
-       /*
-        * Check link status. Wait up to 100 microseconds for link to become
-        * valid.
-        */
-       ret_val = e1000_phy_has_link_generic(hw,
-                                            COPPER_LINK_UP_LIMIT,
-                                            10,
-                                            &link);
-       if (ret_val)
-               goto out;
-
-       if (link) {
-               DEBUGOUT("Valid link established!!!\n");
-               e1000_config_collision_dist_generic(hw);
-               ret_val = e1000_config_fc_after_link_up_generic(hw);
-       } else {
-               DEBUGOUT("Unable to establish link!!!\n");
-       }
-
-out:
-       return ret_val;
-}
-
-#if 0
-/**
- *  e1000_phy_force_speed_duplex_igp - Force speed/duplex for igp PHY
- *  @hw: pointer to the HW structure
- *
- *  Calls the PHY setup function to force speed and duplex.  Clears the
- *  auto-crossover to force MDI manually.  Waits for link and returns
- *  successful if link up is successful, else -E1000_ERR_PHY (-2).
- **/
-s32 e1000_phy_force_speed_duplex_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-       bool link;
-
-       DEBUGFUNC("e1000_phy_force_speed_duplex_igp");
-
-       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       e1000_phy_force_speed_duplex_setup(hw, &phy_data);
-
-       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Clear Auto-Crossover to force MDI manually.  IGP requires MDI
-        * forced whenever speed and duplex are forced.
-        */
-       ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
-       phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
-
-       ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       DEBUGOUT1("IGP PSCR: %X\n", phy_data);
-
-       usec_delay(1);
-
-       if (phy->autoneg_wait_to_complete) {
-               DEBUGOUT("Waiting for forced speed/duplex link on IGP phy.\n");
-
-               ret_val = e1000_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link)
-                       DEBUGOUT("Link taking longer than expected.\n");
-
-               /* Try once more */
-               ret_val = e1000_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_phy_force_speed_duplex_m88 - Force speed/duplex for m88 PHY
- *  @hw: pointer to the HW structure
- *
- *  Calls the PHY setup function to force speed and duplex.  Clears the
- *  auto-crossover to force MDI manually.  Resets the PHY to commit the
- *  changes.  If time expires while waiting for link up, we reset the DSP.
- *  After reset, TX_CLK and CRS on Tx must be set.  Return successful upon
- *  successful completion, else return corresponding error code.
- **/
-s32 e1000_phy_force_speed_duplex_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-       bool link;
-
-       DEBUGFUNC("e1000_phy_force_speed_duplex_m88");
-
-       /*
-        * Clear Auto-Crossover to force MDI manually.  M88E1000 requires MDI
-        * forced whenever speed and duplex are forced.
-        */
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-       ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       DEBUGOUT1("M88E1000 PSCR: %X\n", phy_data);
-
-       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       e1000_phy_force_speed_duplex_setup(hw, &phy_data);
-
-       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /* Reset the phy to commit changes. */
-       ret_val = hw->phy.ops.commit(hw);
-       if (ret_val)
-               goto out;
-
-       if (phy->autoneg_wait_to_complete) {
-               DEBUGOUT("Waiting for forced speed/duplex link on M88 phy.\n");
-
-               ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link) {
-                       /*
-                        * We didn't get link.
-                        * Reset the DSP and cross our fingers.
-                        */
-                       ret_val = phy->ops.write_reg(hw,
-                                                     M88E1000_PHY_PAGE_SELECT,
-                                                     0x001d);
-                       if (ret_val)
-                               goto out;
-                       ret_val = e1000_phy_reset_dsp_generic(hw);
-                       if (ret_val)
-                               goto out;
-               }
-
-               /* Try once more */
-               ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = phy->ops.read_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Resetting the phy means we need to re-force TX_CLK in the
-        * Extended PHY Specific Control Register to 25MHz clock from
-        * the reset value of 2.5MHz.
-        */
-       phy_data |= M88E1000_EPSCR_TX_CLK_25;
-       ret_val = phy->ops.write_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * In addition, we must re-enable CRS on Tx for both half and full
-        * duplex.
-        */
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-       ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_phy_force_speed_duplex_ife - Force PHY speed & duplex
- *  @hw: pointer to the HW structure
- *
- *  Forces the speed and duplex settings of the PHY.
- *  This is a function pointer entry point only called by
- *  PHY setup routines.
- **/
-s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-       bool link;
-
-       DEBUGFUNC("e1000_phy_force_speed_duplex_ife");
-
-       if (phy->type != e1000_phy_ife) {
-               ret_val = e1000_phy_force_speed_duplex_igp(hw);
-               goto out;
-       }
-
-       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &data);
-       if (ret_val)
-               goto out;
-
-       e1000_phy_force_speed_duplex_setup(hw, &data);
-
-       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, data);
-       if (ret_val)
-               goto out;
-
-       /* Disable MDI-X support for 10/100 */
-       ret_val = phy->ops.read_reg(hw, IFE_PHY_MDIX_CONTROL, &data);
-       if (ret_val)
-               goto out;
-
-       data &= ~IFE_PMC_AUTO_MDIX;
-       data &= ~IFE_PMC_FORCE_MDIX;
-
-       ret_val = phy->ops.write_reg(hw, IFE_PHY_MDIX_CONTROL, data);
-       if (ret_val)
-               goto out;
-
-       DEBUGOUT1("IFE PMC: %X\n", data);
-
-       usec_delay(1);
-
-       if (phy->autoneg_wait_to_complete) {
-               DEBUGOUT("Waiting for forced speed/duplex link on IFE phy.\n");
-
-               ret_val = e1000_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link)
-                       DEBUGOUT("Link taking longer than expected.\n");
-
-               /* Try once more */
-               ret_val = e1000_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_phy_force_speed_duplex_setup - Configure forced PHY speed/duplex
- *  @hw: pointer to the HW structure
- *  @phy_ctrl: pointer to current value of PHY_CONTROL
- *
- *  Forces speed and duplex on the PHY by doing the following: disable flow
- *  control, force speed/duplex on the MAC, disable auto speed detection,
- *  disable auto-negotiation, configure duplex, configure speed, configure
- *  the collision distance, write configuration to CTRL register.  The
- *  caller must write to the PHY_CONTROL register for these settings to
- *  take affect.
- **/
-void e1000_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 ctrl;
-
-       DEBUGFUNC("e1000_phy_force_speed_duplex_setup");
-
-       /* Turn off flow control when forcing speed/duplex */
-       hw->fc.current_mode = e1000_fc_none;
-
-       /* Force speed/duplex on the mac */
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       ctrl &= ~E1000_CTRL_SPD_SEL;
-
-       /* Disable Auto Speed Detection */
-       ctrl &= ~E1000_CTRL_ASDE;
-
-       /* Disable autoneg on the phy */
-       *phy_ctrl &= ~MII_CR_AUTO_NEG_EN;
-
-       /* Forcing Full or Half Duplex? */
-       if (mac->forced_speed_duplex & E1000_ALL_HALF_DUPLEX) {
-               ctrl &= ~E1000_CTRL_FD;
-               *phy_ctrl &= ~MII_CR_FULL_DUPLEX;
-               DEBUGOUT("Half Duplex\n");
-       } else {
-               ctrl |= E1000_CTRL_FD;
-               *phy_ctrl |= MII_CR_FULL_DUPLEX;
-               DEBUGOUT("Full Duplex\n");
-       }
-
-       /* Forcing 10mb or 100mb? */
-       if (mac->forced_speed_duplex & E1000_ALL_100_SPEED) {
-               ctrl |= E1000_CTRL_SPD_100;
-               *phy_ctrl |= MII_CR_SPEED_100;
-               *phy_ctrl &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_10);
-               DEBUGOUT("Forcing 100mb\n");
-       } else {
-               ctrl &= ~(E1000_CTRL_SPD_1000 | E1000_CTRL_SPD_100);
-               *phy_ctrl |= MII_CR_SPEED_10;
-               *phy_ctrl &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_100);
-               DEBUGOUT("Forcing 10mb\n");
-       }
-
-       e1000_config_collision_dist_generic(hw);
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-}
-#endif
-
-/**
- *  e1000_set_d3_lplu_state_generic - Sets low power link up state for D3
- *  @hw: pointer to the HW structure
- *  @active: boolean used to enable/disable lplu
- *
- *  Success returns 0, Failure returns 1
- *
- *  The low power link up (lplu) state is set to the power management level D3
- *  and SmartSpeed is disabled when active is true, else clear lplu for D3
- *  and enable Smartspeed.  LPLU and Smartspeed are mutually exclusive.  LPLU
- *  is used during Dx states where the power conservation is most important.
- *  During driver activity, SmartSpeed should be enabled so performance is
- *  maintained.
- **/
-s32 e1000_set_d3_lplu_state_generic(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       DEBUGFUNC("e1000_set_d3_lplu_state_generic");
-
-       if (!(hw->phy.ops.read_reg))
-               goto out;
-
-       ret_val = phy->ops.read_reg(hw, IGP02E1000_PHY_POWER_MGMT, &data);
-       if (ret_val)
-               goto out;
-
-       if (!active) {
-               data &= ~IGP02E1000_PM_D3_LPLU;
-               ret_val = phy->ops.write_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                            data);
-               if (ret_val)
-                       goto out;
-               /*
-                * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
-                * during Dx states where the power conservation is most
-                * important.  During driver activity we should enable
-                * SmartSpeed, so performance is maintained.
-                */
-               if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = phy->ops.read_reg(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = phy->ops.read_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               }
-       } else if ((phy->autoneg_advertised == E1000_ALL_SPEED_DUPLEX) ||
-                  (phy->autoneg_advertised == E1000_ALL_NOT_GIG) ||
-                  (phy->autoneg_advertised == E1000_ALL_10_SPEED)) {
-               data |= IGP02E1000_PM_D3_LPLU;
-               ret_val = phy->ops.write_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                             data);
-               if (ret_val)
-                       goto out;
-
-               /* When LPLU is enabled, we should disable SmartSpeed */
-               ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                            &data);
-               if (ret_val)
-                       goto out;
-
-               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-               ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                             data);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_check_downshift_generic - Checks whether a downshift in speed occurred
- *  @hw: pointer to the HW structure
- *
- *  Success returns 0, Failure returns 1
- *
- *  A downshift is detected by querying the PHY link health.
- **/
-s32 e1000_check_downshift_generic(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, offset, mask;
-
-       DEBUGFUNC("e1000_check_downshift_generic");
-
-       switch (phy->type) {
-       case e1000_phy_m88:
-       case e1000_phy_gg82563:
-               offset  = M88E1000_PHY_SPEC_STATUS;
-               mask    = M88E1000_PSSR_DOWNSHIFT;
-               break;
-       case e1000_phy_igp_2:
-       case e1000_phy_igp:
-       case e1000_phy_igp_3:
-               offset  = IGP01E1000_PHY_LINK_HEALTH;
-               mask    = IGP01E1000_PLHR_SS_DOWNGRADE;
-               break;
-       default:
-               /* speed downshift not supported */
-               phy->speed_downgraded = false;
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       ret_val = phy->ops.read_reg(hw, offset, &phy_data);
-
-       if (!ret_val)
-               phy->speed_downgraded = (phy_data & mask) ? true : false;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_check_polarity_m88 - Checks the polarity.
- *  @hw: pointer to the HW structure
- *
- *  Success returns 0, Failure returns -E1000_ERR_PHY (-2)
- *
- *  Polarity is determined based on the PHY specific status register.
- **/
-s32 e1000_check_polarity_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-       DEBUGFUNC("e1000_check_polarity_m88");
-
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_STATUS, &data);
-
-       if (!ret_val)
-               phy->cable_polarity = (data & M88E1000_PSSR_REV_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
-
-       return ret_val;
-}
-
-/**
- *  e1000_check_polarity_igp - Checks the polarity.
- *  @hw: pointer to the HW structure
- *
- *  Success returns 0, Failure returns -E1000_ERR_PHY (-2)
- *
- *  Polarity is determined based on the PHY port status register, and the
- *  current speed (since there is no polarity at 100Mbps).
- **/
-s32 e1000_check_polarity_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data, offset, mask;
-
-       DEBUGFUNC("e1000_check_polarity_igp");
-
-       /*
-        * Polarity is determined based on the speed of
-        * our connection.
-        */
-       ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_STATUS, &data);
-       if (ret_val)
-               goto out;
-
-       if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
-           IGP01E1000_PSSR_SPEED_1000MBPS) {
-               offset  = IGP01E1000_PHY_PCS_INIT_REG;
-               mask    = IGP01E1000_PHY_POLARITY_MASK;
-       } else {
-               /*
-                * This really only applies to 10Mbps since
-                * there is no polarity for 100Mbps (always 0).
-                */
-               offset  = IGP01E1000_PHY_PORT_STATUS;
-               mask    = IGP01E1000_PSSR_POLARITY_REVERSED;
-       }
-
-       ret_val = phy->ops.read_reg(hw, offset, &data);
-
-       if (!ret_val)
-               phy->cable_polarity = (data & mask)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_check_polarity_ife - Check cable polarity for IFE PHY
- *  @hw: pointer to the HW structure
- *
- *  Polarity is determined on the polarity reversal feature being enabled.
- **/
-s32 e1000_check_polarity_ife(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, offset, mask;
-
-       DEBUGFUNC("e1000_check_polarity_ife");
-
-       /*
-        * Polarity is determined based on the reversal feature being enabled.
-        */
-       if (phy->polarity_correction) {
-               offset = IFE_PHY_EXTENDED_STATUS_CONTROL;
-               mask = IFE_PESC_POLARITY_REVERSED;
-       } else {
-               offset = IFE_PHY_SPECIAL_CONTROL;
-               mask = IFE_PSC_FORCE_POLARITY;
-       }
-
-       ret_val = phy->ops.read_reg(hw, offset, &phy_data);
-
-       if (!ret_val)
-               phy->cable_polarity = (phy_data & mask)
-                                      ? e1000_rev_polarity_reversed
-                                      : e1000_rev_polarity_normal;
-
-       return ret_val;
-}
-
-/**
- *  e1000_wait_autoneg_generic - Wait for auto-neg completion
- *  @hw: pointer to the HW structure
- *
- *  Waits for auto-negotiation to complete or for the auto-negotiation time
- *  limit to expire, which ever happens first.
- **/
-s32 e1000_wait_autoneg_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 i, phy_status;
-
-       DEBUGFUNC("e1000_wait_autoneg_generic");
-
-       if (!(hw->phy.ops.read_reg))
-               return E1000_SUCCESS;
-
-       /* Break after autoneg completes or PHY_AUTO_NEG_LIMIT expires. */
-       for (i = PHY_AUTO_NEG_LIMIT; i > 0; i--) {
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
-               if (ret_val)
-                       break;
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
-               if (ret_val)
-                       break;
-               if (phy_status & MII_SR_AUTONEG_COMPLETE)
-                       break;
-               msec_delay(100);
-       }
-
-       /*
-        * PHY_AUTO_NEG_TIME expiration doesn't guarantee auto-negotiation
-        * has completed.
-        */
-       return ret_val;
-}
-
-/**
- *  e1000_phy_has_link_generic - Polls PHY for link
- *  @hw: pointer to the HW structure
- *  @iterations: number of times to poll for link
- *  @usec_interval: delay between polling attempts
- *  @success: pointer to whether polling was successful or not
- *
- *  Polls the PHY status register for link, 'iterations' number of times.
- **/
-s32 e1000_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
-                               u32 usec_interval, bool *success)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 i, phy_status;
-
-       DEBUGFUNC("e1000_phy_has_link_generic");
-
-       if (!(hw->phy.ops.read_reg))
-               return E1000_SUCCESS;
-
-       for (i = 0; i < iterations; i++) {
-               /*
-                * Some PHYs require the PHY_STATUS register to be read
-                * twice due to the link bit being sticky.  No harm doing
-                * it across the board.
-                */
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
-               if (ret_val) {
-                       /*
-                        * If the first read fails, another entity may have
-                        * ownership of the resources, wait and try again to
-                        * see if they have relinquished the resources yet.
-                        */
-                       usec_delay(usec_interval);
-               }
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
-               if (ret_val)
-                       break;
-               if (phy_status & MII_SR_LINK_STATUS)
-                       break;
-               if (usec_interval >= 1000)
-                       msec_delay_irq(usec_interval/1000);
-               else
-                       usec_delay(usec_interval);
-       }
-
-       *success = (i < iterations) ? true : false;
-
-       return ret_val;
-}
-
-#if 0
-/**
- *  e1000_get_cable_length_m88 - Determine cable length for m88 PHY
- *  @hw: pointer to the HW structure
- *
- *  Reads the PHY specific status register to retrieve the cable length
- *  information.  The cable length is determined by averaging the minimum and
- *  maximum values to get the "average" cable length.  The m88 PHY has four
- *  possible cable length values, which are:
- *     Register Value          Cable Length
- *     0                       < 50 meters
- *     1                       50 - 80 meters
- *     2                       80 - 110 meters
- *     3                       110 - 140 meters
- *     4                       > 140 meters
- **/
-s32 e1000_get_cable_length_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, index;
-
-       DEBUGFUNC("e1000_get_cable_length_m88");
-
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-       if (ret_val)
-               goto out;
-
-       index = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
-               M88E1000_PSSR_CABLE_LENGTH_SHIFT;
-       if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE + 1) {
-               ret_val = E1000_ERR_PHY;
-               goto out;
-       }
-
-       phy->min_cable_length = e1000_m88_cable_length_table[index];
-       phy->max_cable_length = e1000_m88_cable_length_table[index+1];
-
-       phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_get_cable_length_igp_2 - Determine cable length for igp2 PHY
- *  @hw: pointer to the HW structure
- *
- *  The automatic gain control (agc) normalizes the amplitude of the
- *  received signal, adjusting for the attenuation produced by the
- *  cable.  By reading the AGC registers, which represent the
- *  combination of coarse and fine gain value, the value can be put
- *  into a lookup table to obtain the approximate cable length
- *  for each channel.
- **/
-s32 e1000_get_cable_length_igp_2(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_data, i, agc_value = 0;
-       u16 cur_agc_index, max_agc_index = 0;
-       u16 min_agc_index = IGP02E1000_CABLE_LENGTH_TABLE_SIZE - 1;
-       u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] =
-                                                        {IGP02E1000_PHY_AGC_A,
-                                                         IGP02E1000_PHY_AGC_B,
-                                                         IGP02E1000_PHY_AGC_C,
-                                                         IGP02E1000_PHY_AGC_D};
-
-       DEBUGFUNC("e1000_get_cable_length_igp_2");
-
-       /* Read the AGC registers for all channels */
-       for (i = 0; i < IGP02E1000_PHY_CHANNEL_NUM; i++) {
-               ret_val = phy->ops.read_reg(hw, agc_reg_array[i], &phy_data);
-               if (ret_val)
-                       goto out;
-
-               /*
-                * Getting bits 15:9, which represent the combination of
-                * coarse and fine gain values.  The result is a number
-                * that can be put into the lookup table to obtain the
-                * approximate cable length.
-                */
-               cur_agc_index = (phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
-                               IGP02E1000_AGC_LENGTH_MASK;
-
-               /* Array index bound check. */
-               if ((cur_agc_index >= IGP02E1000_CABLE_LENGTH_TABLE_SIZE) ||
-                   (cur_agc_index == 0)) {
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-               }
-
-               /* Remove min & max AGC values from calculation. */
-               if (e1000_igp_2_cable_length_table[min_agc_index] >
-                   e1000_igp_2_cable_length_table[cur_agc_index])
-                       min_agc_index = cur_agc_index;
-               if (e1000_igp_2_cable_length_table[max_agc_index] <
-                   e1000_igp_2_cable_length_table[cur_agc_index])
-                       max_agc_index = cur_agc_index;
-
-               agc_value += e1000_igp_2_cable_length_table[cur_agc_index];
-       }
-
-       agc_value -= (e1000_igp_2_cable_length_table[min_agc_index] +
-                     e1000_igp_2_cable_length_table[max_agc_index]);
-       agc_value /= (IGP02E1000_PHY_CHANNEL_NUM - 2);
-
-       /* Calculate cable length with the error range of +/- 10 meters. */
-       phy->min_cable_length = ((agc_value - IGP02E1000_AGC_RANGE) > 0) ?
-                                (agc_value - IGP02E1000_AGC_RANGE) : 0;
-       phy->max_cable_length = agc_value + IGP02E1000_AGC_RANGE;
-
-       phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
-
-out:
-       return ret_val;
-}
-#endif
-
-/**
- *  e1000_get_phy_info_m88 - Retrieve PHY information
- *  @hw: pointer to the HW structure
- *
- *  Valid for only copper links.  Read the PHY status register (sticky read)
- *  to verify that link is up.  Read the PHY special control register to
- *  determine the polarity and 10base-T extended distance.  Read the PHY
- *  special status register to determine MDI/MDIx and current speed.  If
- *  speed is 1000, then determine cable length, local and remote receiver.
- **/
-s32 e1000_get_phy_info_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32  ret_val;
-       u16 phy_data;
-       bool link;
-
-       DEBUGFUNC("e1000_get_phy_info_m88");
-
-       if (hw->phy.media_type != e1000_media_type_copper) {
-               DEBUGOUT("Phy info is only valid for copper media\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               DEBUGOUT("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy->polarity_correction = (phy_data & M88E1000_PSCR_POLARITY_REVERSAL)
-                                  ? true : false;
-
-       ret_val = e1000_check_polarity_m88(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy->is_mdix = (phy_data & M88E1000_PSSR_MDIX) ? true : false;
-
-       if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
-#if 0
-               ret_val = hw->phy.ops.get_cable_length(hw);
-#endif
-               ret_val = -E1000_ERR_CONFIG;
-               if (ret_val)
-                       goto out;
-
-               ret_val = phy->ops.read_reg(hw, PHY_1000T_STATUS, &phy_data);
-               if (ret_val)
-                       goto out;
-
-               phy->local_rx = (phy_data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
-
-               phy->remote_rx = (phy_data & SR_1000T_REMOTE_RX_STATUS)
-                                ? e1000_1000t_rx_status_ok
-                                : e1000_1000t_rx_status_not_ok;
-       } else {
-               /* Set values to "undefined" */
-               phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
-               phy->local_rx = e1000_1000t_rx_status_undefined;
-               phy->remote_rx = e1000_1000t_rx_status_undefined;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_get_phy_info_igp - Retrieve igp PHY information
- *  @hw: pointer to the HW structure
- *
- *  Read PHY status to determine if link is up.  If link is up, then
- *  set/determine 10base-T extended distance and polarity correction.  Read
- *  PHY port status to determine MDI/MDIx and speed.  Based on the speed,
- *  determine on the cable length, local and remote receiver.
- **/
-s32 e1000_get_phy_info_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-       bool link;
-
-       DEBUGFUNC("e1000_get_phy_info_igp");
-
-       ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               DEBUGOUT("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       phy->polarity_correction = true;
-
-       ret_val = e1000_check_polarity_igp(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_STATUS, &data);
-       if (ret_val)
-               goto out;
-
-       phy->is_mdix = (data & IGP01E1000_PSSR_MDIX) ? true : false;
-
-#if 0
-       if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
-           IGP01E1000_PSSR_SPEED_1000MBPS) {
-               ret_val = hw->phy.ops.get_cable_length(hw);
-               if (ret_val)
-                       goto out;
-
-               ret_val = phy->ops.read_reg(hw, PHY_1000T_STATUS, &data);
-               if (ret_val)
-                       goto out;
-
-               phy->local_rx = (data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
-
-               phy->remote_rx = (data & SR_1000T_REMOTE_RX_STATUS)
-                                ? e1000_1000t_rx_status_ok
-                                : e1000_1000t_rx_status_not_ok;
-       } else {
-#endif
-               phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
-               phy->local_rx = e1000_1000t_rx_status_undefined;
-               phy->remote_rx = e1000_1000t_rx_status_undefined;
-#if 0
-       }
-#endif
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_phy_sw_reset_generic - PHY software reset
- *  @hw: pointer to the HW structure
- *
- *  Does a software reset of the PHY by reading the PHY control register and
- *  setting/write the control register reset bit to the PHY.
- **/
-s32 e1000_phy_sw_reset_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_ctrl;
-
-       DEBUGFUNC("e1000_phy_sw_reset_generic");
-
-       if (!(hw->phy.ops.read_reg))
-               goto out;
-
-       ret_val = hw->phy.ops.read_reg(hw, PHY_CONTROL, &phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       phy_ctrl |= MII_CR_RESET;
-       ret_val = hw->phy.ops.write_reg(hw, PHY_CONTROL, phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       usec_delay(1);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_phy_hw_reset_generic - PHY hardware reset
- *  @hw: pointer to the HW structure
- *
- *  Verify the reset block is not blocking us from resetting.  Acquire
- *  semaphore (if necessary) and read/set/write the device control reset
- *  bit in the PHY.  Wait the appropriate delay time for the device to
- *  reset and release the semaphore (if necessary).
- **/
-s32 e1000_phy_hw_reset_generic(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u32 ctrl;
-
-       DEBUGFUNC("e1000_phy_hw_reset_generic");
-
-       ret_val = phy->ops.check_reset_block(hw);
-       if (ret_val) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       ret_val = phy->ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_PHY_RST);
-       E1000_WRITE_FLUSH(hw);
-
-       usec_delay(phy->reset_delay_us);
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-       E1000_WRITE_FLUSH(hw);
-
-       usec_delay(150);
-
-       phy->ops.release(hw);
-
-       ret_val = phy->ops.get_cfg_done(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_get_cfg_done_generic - Generic configuration done
- *  @hw: pointer to the HW structure
- *
- *  Generic function to wait 10 milli-seconds for configuration to complete
- *  and return success.
- **/
-s32 e1000_get_cfg_done_generic(struct e1000_hw *hw __unused)
-{
-       DEBUGFUNC("e1000_get_cfg_done_generic");
-
-       msec_delay_irq(10);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_phy_init_script_igp3 - Inits the IGP3 PHY
- *  @hw: pointer to the HW structure
- *
- *  Initializes a Intel Gigabit PHY3 when an EEPROM is not present.
- **/
-s32 e1000_phy_init_script_igp3(struct e1000_hw *hw)
-{
-       DEBUGOUT("Running IGP 3 PHY init script\n");
-
-       /* PHY init IGP 3 */
-       /* Enable rise/fall, 10-mode work in class-A */
-       hw->phy.ops.write_reg(hw, 0x2F5B, 0x9018);
-       /* Remove all caps from Replica path filter */
-       hw->phy.ops.write_reg(hw, 0x2F52, 0x0000);
-       /* Bias trimming for ADC, AFE and Driver (Default) */
-       hw->phy.ops.write_reg(hw, 0x2FB1, 0x8B24);
-       /* Increase Hybrid poly bias */
-       hw->phy.ops.write_reg(hw, 0x2FB2, 0xF8F0);
-       /* Add 4% to Tx amplitude in Gig mode */
-       hw->phy.ops.write_reg(hw, 0x2010, 0x10B0);
-       /* Disable trimming (TTT) */
-       hw->phy.ops.write_reg(hw, 0x2011, 0x0000);
-       /* Poly DC correction to 94.6% + 2% for all channels */
-       hw->phy.ops.write_reg(hw, 0x20DD, 0x249A);
-       /* ABS DC correction to 95.9% */
-       hw->phy.ops.write_reg(hw, 0x20DE, 0x00D3);
-       /* BG temp curve trim */
-       hw->phy.ops.write_reg(hw, 0x28B4, 0x04CE);
-       /* Increasing ADC OPAMP stage 1 currents to max */
-       hw->phy.ops.write_reg(hw, 0x2F70, 0x29E4);
-       /* Force 1000 ( required for enabling PHY regs configuration) */
-       hw->phy.ops.write_reg(hw, 0x0000, 0x0140);
-       /* Set upd_freq to 6 */
-       hw->phy.ops.write_reg(hw, 0x1F30, 0x1606);
-       /* Disable NPDFE */
-       hw->phy.ops.write_reg(hw, 0x1F31, 0xB814);
-       /* Disable adaptive fixed FFE (Default) */
-       hw->phy.ops.write_reg(hw, 0x1F35, 0x002A);
-       /* Enable FFE hysteresis */
-       hw->phy.ops.write_reg(hw, 0x1F3E, 0x0067);
-       /* Fixed FFE for short cable lengths */
-       hw->phy.ops.write_reg(hw, 0x1F54, 0x0065);
-       /* Fixed FFE for medium cable lengths */
-       hw->phy.ops.write_reg(hw, 0x1F55, 0x002A);
-       /* Fixed FFE for long cable lengths */
-       hw->phy.ops.write_reg(hw, 0x1F56, 0x002A);
-       /* Enable Adaptive Clip Threshold */
-       hw->phy.ops.write_reg(hw, 0x1F72, 0x3FB0);
-       /* AHT reset limit to 1 */
-       hw->phy.ops.write_reg(hw, 0x1F76, 0xC0FF);
-       /* Set AHT master delay to 127 msec */
-       hw->phy.ops.write_reg(hw, 0x1F77, 0x1DEC);
-       /* Set scan bits for AHT */
-       hw->phy.ops.write_reg(hw, 0x1F78, 0xF9EF);
-       /* Set AHT Preset bits */
-       hw->phy.ops.write_reg(hw, 0x1F79, 0x0210);
-       /* Change integ_factor of channel A to 3 */
-       hw->phy.ops.write_reg(hw, 0x1895, 0x0003);
-       /* Change prop_factor of channels BCD to 8 */
-       hw->phy.ops.write_reg(hw, 0x1796, 0x0008);
-       /* Change cg_icount + enable integbp for channels BCD */
-       hw->phy.ops.write_reg(hw, 0x1798, 0xD008);
-       /*
-        * Change cg_icount + enable integbp + change prop_factor_master
-        * to 8 for channel A
-        */
-       hw->phy.ops.write_reg(hw, 0x1898, 0xD918);
-       /* Disable AHT in Slave mode on channel A */
-       hw->phy.ops.write_reg(hw, 0x187A, 0x0800);
-       /*
-        * Enable LPLU and disable AN to 1000 in non-D0a states,
-        * Enable SPD+B2B
-        */
-       hw->phy.ops.write_reg(hw, 0x0019, 0x008D);
-       /* Enable restart AN on an1000_dis change */
-       hw->phy.ops.write_reg(hw, 0x001B, 0x2080);
-       /* Enable wh_fifo read clock in 10/100 modes */
-       hw->phy.ops.write_reg(hw, 0x0014, 0x0045);
-       /* Restart AN, Speed selection is 1000 */
-       hw->phy.ops.write_reg(hw, 0x0000, 0x1340);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_get_phy_type_from_id - Get PHY type from id
- *  @phy_id: phy_id read from the phy
- *
- *  Returns the phy type from the id.
- **/
-enum e1000_phy_type e1000_get_phy_type_from_id(u32 phy_id)
-{
-       enum e1000_phy_type phy_type = e1000_phy_unknown;
-
-       switch (phy_id) {
-       case M88E1000_I_PHY_ID:
-       case M88E1000_E_PHY_ID:
-       case M88E1111_I_PHY_ID:
-       case M88E1011_I_PHY_ID:
-               phy_type = e1000_phy_m88;
-               break;
-       case IGP01E1000_I_PHY_ID: /* IGP 1 & 2 share this */
-               phy_type = e1000_phy_igp_2;
-               break;
-       case GG82563_E_PHY_ID:
-               phy_type = e1000_phy_gg82563;
-               break;
-       case IGP03E1000_E_PHY_ID:
-               phy_type = e1000_phy_igp_3;
-               break;
-       case IFE_E_PHY_ID:
-       case IFE_PLUS_E_PHY_ID:
-       case IFE_C_E_PHY_ID:
-               phy_type = e1000_phy_ife;
-               break;
-       default:
-               phy_type = e1000_phy_unknown;
-               break;
-       }
-       return phy_type;
-}
-
-/**
- *  e1000_determine_phy_address - Determines PHY address.
- *  @hw: pointer to the HW structure
- *
- *  This uses a trial and error method to loop through possible PHY
- *  addresses. It tests each by reading the PHY ID registers and
- *  checking for a match.
- **/
-s32 e1000_determine_phy_address(struct e1000_hw *hw)
-{
-       s32 ret_val = -E1000_ERR_PHY_TYPE;
-       u32 phy_addr = 0;
-       u32 i;
-       enum e1000_phy_type phy_type = e1000_phy_unknown;
-
-       hw->phy.id = phy_type;
-
-       for (phy_addr = 0; phy_addr < E1000_MAX_PHY_ADDR; phy_addr++) {
-               hw->phy.addr = phy_addr;
-               i = 0;
-
-               do {
-                       e1000_get_phy_id(hw);
-                       phy_type = e1000_get_phy_type_from_id(hw->phy.id);
-
-                       /*
-                        * If phy_type is valid, break - we found our
-                        * PHY address
-                        */
-                       if (phy_type  != e1000_phy_unknown) {
-                               ret_val = E1000_SUCCESS;
-                               goto out;
-                       }
-                       msec_delay(1);
-                       i++;
-               } while (i < 10);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- * e1000_power_up_phy_copper - Restore copper link in case of PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, restore the link to previous
- * settings.
- **/
-void e1000_power_up_phy_copper(struct e1000_hw *hw)
-{
-       u16 mii_reg = 0;
-
-       /* The PHY will retain its settings across a power down/up cycle */
-       hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
-       mii_reg &= ~MII_CR_POWER_DOWN;
-       hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
-}
-
-/**
- * e1000_power_down_phy_copper - Restore copper link in case of PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, restore the link to previous
- * settings.
- **/
-void e1000_power_down_phy_copper(struct e1000_hw *hw)
-{
-       u16 mii_reg = 0;
-
-       /* The PHY will retain its settings across a power down/up cycle */
-       hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
-       mii_reg |= MII_CR_POWER_DOWN;
-       hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
-       msec_delay(1);
-}
diff --git a/src/drivers/net/e1000/e1000_phy.h b/src/drivers/net/e1000/e1000_phy.h
deleted file mode 100644 (file)
index 93bd7a1..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000_PHY_H_
-#define _E1000_PHY_H_
-
-void e1000_init_phy_ops_generic(struct e1000_hw *hw);
-s32  e1000_null_read_reg(struct e1000_hw *hw, u32 offset, u16 *data);
-void e1000_null_phy_generic(struct e1000_hw *hw);
-s32  e1000_null_lplu_state(struct e1000_hw *hw, bool active);
-s32  e1000_null_write_reg(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000_check_downshift_generic(struct e1000_hw *hw);
-s32  e1000_check_polarity_m88(struct e1000_hw *hw);
-s32  e1000_check_polarity_igp(struct e1000_hw *hw);
-s32  e1000_check_polarity_ife(struct e1000_hw *hw);
-s32  e1000_check_reset_block_generic(struct e1000_hw *hw);
-s32  e1000_copper_link_autoneg(struct e1000_hw *hw);
-s32  e1000_copper_link_setup_igp(struct e1000_hw *hw);
-s32  e1000_copper_link_setup_m88(struct e1000_hw *hw);
-#if 0
-s32  e1000_phy_force_speed_duplex_igp(struct e1000_hw *hw);
-s32  e1000_phy_force_speed_duplex_m88(struct e1000_hw *hw);
-s32  e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw);
-#endif
-#if 0
-s32  e1000_get_cable_length_m88(struct e1000_hw *hw);
-s32  e1000_get_cable_length_igp_2(struct e1000_hw *hw);
-#endif
-s32  e1000_get_cfg_done_generic(struct e1000_hw *hw);
-s32  e1000_get_phy_id(struct e1000_hw *hw);
-s32  e1000_get_phy_info_igp(struct e1000_hw *hw);
-s32  e1000_get_phy_info_m88(struct e1000_hw *hw);
-s32  e1000_phy_sw_reset_generic(struct e1000_hw *hw);
-#if 0
-void e1000_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);
-#endif
-s32  e1000_phy_hw_reset_generic(struct e1000_hw *hw);
-s32  e1000_phy_reset_dsp_generic(struct e1000_hw *hw);
-s32  e1000_phy_setup_autoneg(struct e1000_hw *hw);
-s32  e1000_read_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000_set_d3_lplu_state_generic(struct e1000_hw *hw, bool active);
-s32  e1000_setup_copper_link_generic(struct e1000_hw *hw);
-s32  e1000_wait_autoneg_generic(struct e1000_hw *hw);
-s32  e1000_write_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000_write_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000_phy_reset_dsp(struct e1000_hw *hw);
-s32  e1000_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
-                                u32 usec_interval, bool *success);
-s32  e1000_phy_init_script_igp3(struct e1000_hw *hw);
-enum e1000_phy_type e1000_get_phy_type_from_id(u32 phy_id);
-s32  e1000_determine_phy_address(struct e1000_hw *hw);
-void e1000_power_up_phy_copper(struct e1000_hw *hw);
-void e1000_power_down_phy_copper(struct e1000_hw *hw);
-s32  e1000_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data);
-
-#define E1000_MAX_PHY_ADDR                4
-
-/* IGP01E1000 Specific Registers */
-#define IGP01E1000_PHY_PORT_CONFIG        0x10 /* Port Config */
-#define IGP01E1000_PHY_PORT_STATUS        0x11 /* Status */
-#define IGP01E1000_PHY_PORT_CTRL          0x12 /* Control */
-#define IGP01E1000_PHY_LINK_HEALTH        0x13 /* PHY Link Health */
-#define IGP01E1000_GMII_FIFO              0x14 /* GMII FIFO */
-#define IGP01E1000_PHY_CHANNEL_QUALITY    0x15 /* PHY Channel Quality */
-#define IGP02E1000_PHY_POWER_MGMT         0x19 /* Power Management */
-#define IGP01E1000_PHY_PAGE_SELECT        0x1F /* Page Select */
-#define BM_PHY_PAGE_SELECT                22   /* Page Select for BM */
-#define IGP_PAGE_SHIFT                    5
-#define PHY_REG_MASK                      0x1F
-
-#define IGP01E1000_PHY_PCS_INIT_REG       0x00B4
-#define IGP01E1000_PHY_POLARITY_MASK      0x0078
-
-#define IGP01E1000_PSCR_AUTO_MDIX         0x1000
-#define IGP01E1000_PSCR_FORCE_MDI_MDIX    0x2000 /* 0=MDI, 1=MDIX */
-
-#define IGP01E1000_PSCFR_SMART_SPEED      0x0080
-
-/* Enable flexible speed on link-up */
-#define IGP01E1000_GMII_FLEX_SPD          0x0010
-#define IGP01E1000_GMII_SPD               0x0020 /* Enable SPD */
-
-#define IGP02E1000_PM_SPD                 0x0001 /* Smart Power Down */
-#define IGP02E1000_PM_D0_LPLU             0x0002 /* For D0a states */
-#define IGP02E1000_PM_D3_LPLU             0x0004 /* For all other states */
-
-#define IGP01E1000_PLHR_SS_DOWNGRADE      0x8000
-
-#define IGP01E1000_PSSR_POLARITY_REVERSED 0x0002
-#define IGP01E1000_PSSR_MDIX              0x0800
-#define IGP01E1000_PSSR_SPEED_MASK        0xC000
-#define IGP01E1000_PSSR_SPEED_1000MBPS    0xC000
-
-#define IGP02E1000_PHY_CHANNEL_NUM        4
-#define IGP02E1000_PHY_AGC_A              0x11B1
-#define IGP02E1000_PHY_AGC_B              0x12B1
-#define IGP02E1000_PHY_AGC_C              0x14B1
-#define IGP02E1000_PHY_AGC_D              0x18B1
-
-#define IGP02E1000_AGC_LENGTH_SHIFT       9   /* Course - 15:13, Fine - 12:9 */
-#define IGP02E1000_AGC_LENGTH_MASK        0x7F
-#define IGP02E1000_AGC_RANGE              15
-
-#define IGP03E1000_PHY_MISC_CTRL          0x1B
-#define IGP03E1000_PHY_MISC_DUPLEX_MANUAL_SET  0x1000 /* Manually Set Duplex */
-
-#define E1000_CABLE_LENGTH_UNDEFINED      0xFF
-
-#define E1000_KMRNCTRLSTA_OFFSET          0x001F0000
-#define E1000_KMRNCTRLSTA_OFFSET_SHIFT    16
-#define E1000_KMRNCTRLSTA_REN             0x00200000
-#define E1000_KMRNCTRLSTA_DIAG_OFFSET     0x3    /* Kumeran Diagnostic */
-#define E1000_KMRNCTRLSTA_TIMEOUTS        0x4    /* Kumeran Timeouts */
-#define E1000_KMRNCTRLSTA_INBAND_PARAM    0x9    /* Kumeran InBand Parameters */
-#define E1000_KMRNCTRLSTA_DIAG_NELPBK     0x1000 /* Nearend Loopback mode */
-
-#define IFE_PHY_EXTENDED_STATUS_CONTROL 0x10
-#define IFE_PHY_SPECIAL_CONTROL     0x11 /* 100BaseTx PHY Special Control */
-#define IFE_PHY_SPECIAL_CONTROL_LED 0x1B /* PHY Special and LED Control */
-#define IFE_PHY_MDIX_CONTROL        0x1C /* MDI/MDI-X Control */
-
-/* IFE PHY Extended Status Control */
-#define IFE_PESC_POLARITY_REVERSED    0x0100
-
-/* IFE PHY Special Control */
-#define IFE_PSC_AUTO_POLARITY_DISABLE      0x0010
-#define IFE_PSC_FORCE_POLARITY             0x0020
-#define IFE_PSC_DISABLE_DYNAMIC_POWER_DOWN 0x0100
-
-/* IFE PHY Special Control and LED Control */
-#define IFE_PSCL_PROBE_MODE            0x0020
-#define IFE_PSCL_PROBE_LEDS_OFF        0x0006 /* Force LEDs 0 and 2 off */
-#define IFE_PSCL_PROBE_LEDS_ON         0x0007 /* Force LEDs 0 and 2 on */
-
-/* IFE PHY MDIX Control */
-#define IFE_PMC_MDIX_STATUS      0x0020 /* 1=MDI-X, 0=MDI */
-#define IFE_PMC_FORCE_MDIX       0x0040 /* 1=force MDI-X, 0=force MDI */
-#define IFE_PMC_AUTO_MDIX        0x0080 /* 1=enable auto MDI/MDI-X, 0=disable */
-
-#endif
diff --git a/src/drivers/net/e1000/e1000_regs.h b/src/drivers/net/e1000/e1000_regs.h
deleted file mode 100644 (file)
index 579c070..0000000
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000_REGS_H_
-#define _E1000_REGS_H_
-
-#define E1000_CTRL     0x00000  /* Device Control - RW */
-#define E1000_CTRL_DUP 0x00004  /* Device Control Duplicate (Shadow) - RW */
-#define E1000_STATUS   0x00008  /* Device Status - RO */
-#define E1000_EECD     0x00010  /* EEPROM/Flash Control - RW */
-#define E1000_EERD     0x00014  /* EEPROM Read - RW */
-#define E1000_CTRL_EXT 0x00018  /* Extended Device Control - RW */
-#define E1000_FLA      0x0001C  /* Flash Access - RW */
-#define E1000_MDIC     0x00020  /* MDI Control - RW */
-#define E1000_SCTL     0x00024  /* SerDes Control - RW */
-#define E1000_FCAL     0x00028  /* Flow Control Address Low - RW */
-#define E1000_FCAH     0x0002C  /* Flow Control Address High -RW */
-#define E1000_FEXT     0x0002C  /* Future Extended - RW */
-#define E1000_FEXTNVM  0x00028  /* Future Extended NVM - RW */
-#define E1000_FCT      0x00030  /* Flow Control Type - RW */
-#define E1000_CONNSW   0x00034  /* Copper/Fiber switch control - RW */
-#define E1000_VET      0x00038  /* VLAN Ether Type - RW */
-#define E1000_ICR      0x000C0  /* Interrupt Cause Read - R/clr */
-#define E1000_ITR      0x000C4  /* Interrupt Throttling Rate - RW */
-#define E1000_ICS      0x000C8  /* Interrupt Cause Set - WO */
-#define E1000_IMS      0x000D0  /* Interrupt Mask Set - RW */
-#define E1000_IMC      0x000D8  /* Interrupt Mask Clear - WO */
-#define E1000_IAM      0x000E0  /* Interrupt Acknowledge Auto Mask */
-#define E1000_RCTL     0x00100  /* Rx Control - RW */
-#define E1000_FCTTV    0x00170  /* Flow Control Transmit Timer Value - RW */
-#define E1000_TXCW     0x00178  /* Tx Configuration Word - RW */
-#define E1000_RXCW     0x00180  /* Rx Configuration Word - RO */
-#define E1000_TCTL     0x00400  /* Tx Control - RW */
-#define E1000_TCTL_EXT 0x00404  /* Extended Tx Control - RW */
-#define E1000_TIPG     0x00410  /* Tx Inter-packet gap -RW */
-#define E1000_TBT      0x00448  /* Tx Burst Timer - RW */
-#define E1000_AIT      0x00458  /* Adaptive Interframe Spacing Throttle - RW */
-#define E1000_LEDCTL   0x00E00  /* LED Control - RW */
-#define E1000_EXTCNF_CTRL  0x00F00  /* Extended Configuration Control */
-#define E1000_EXTCNF_SIZE  0x00F08  /* Extended Configuration Size */
-#define E1000_PHY_CTRL     0x00F10  /* PHY Control Register in CSR */
-#define E1000_PBA      0x01000  /* Packet Buffer Allocation - RW */
-#define E1000_PBS      0x01008  /* Packet Buffer Size */
-#define E1000_EEMNGCTL 0x01010  /* MNG EEprom Control */
-#define E1000_EEARBC   0x01024  /* EEPROM Auto Read Bus Control */
-#define E1000_FLASHT   0x01028  /* FLASH Timer Register */
-#define E1000_EEWR     0x0102C  /* EEPROM Write Register - RW */
-#define E1000_FLSWCTL  0x01030  /* FLASH control register */
-#define E1000_FLSWDATA 0x01034  /* FLASH data register */
-#define E1000_FLSWCNT  0x01038  /* FLASH Access Counter */
-#define E1000_FLOP     0x0103C  /* FLASH Opcode Register */
-#define E1000_I2CCMD   0x01028  /* SFPI2C Command Register - RW */
-#define E1000_I2CPARAMS 0x0102C /* SFPI2C Parameters Register - RW */
-#define E1000_WDSTP    0x01040  /* Watchdog Setup - RW */
-#define E1000_SWDSTS   0x01044  /* SW Device Status - RW */
-#define E1000_FRTIMER  0x01048  /* Free Running Timer - RW */
-#define E1000_ERT      0x02008  /* Early Rx Threshold - RW */
-#define E1000_FCRTL    0x02160  /* Flow Control Receive Threshold Low - RW */
-#define E1000_FCRTH    0x02168  /* Flow Control Receive Threshold High - RW */
-#define E1000_PSRCTL   0x02170  /* Packet Split Receive Control - RW */
-#define E1000_RDFPCQ(_n)  (0x02430 + (0x4 * (_n)))
-#define E1000_PBRTH    0x02458  /* PB Rx Arbitration Threshold - RW */
-#define E1000_FCRTV    0x02460  /* Flow Control Refresh Timer Value - RW */
-/* Split and Replication Rx Control - RW */
-#define E1000_RDPUMB   0x025CC  /* DMA Rx Descriptor uC Mailbox - RW */
-#define E1000_RDPUAD   0x025D0  /* DMA Rx Descriptor uC Addr Command - RW */
-#define E1000_RDPUWD   0x025D4  /* DMA Rx Descriptor uC Data Write - RW */
-#define E1000_RDPURD   0x025D8  /* DMA Rx Descriptor uC Data Read - RW */
-#define E1000_RDPUCTL  0x025DC  /* DMA Rx Descriptor uC Control - RW */
-#define E1000_RXCTL(_n)   (0x0C014 + (0x40 * (_n)))
-#define E1000_RQDPC(_n)   (0x0C030 + (0x40 * (_n)))
-#define E1000_RDTR     0x02820  /* Rx Delay Timer - RW */
-#define E1000_RADV     0x0282C  /* Rx Interrupt Absolute Delay Timer - RW */
-/*
- * Convenience macros
- *
- * Note: "_n" is the queue number of the register to be written to.
- *
- * Example usage:
- * E1000_RDBAL_REG(current_rx_queue)
- */
-#define E1000_RDBAL(_n)      ((_n) < 4 ? (0x02800 + ((_n) * 0x100)) : \
-                                         (0x0C000 + ((_n) * 0x40)))
-#define E1000_RDBAH(_n)      ((_n) < 4 ? (0x02804 + ((_n) * 0x100)) : \
-                                         (0x0C004 + ((_n) * 0x40)))
-#define E1000_RDLEN(_n)      ((_n) < 4 ? (0x02808 + ((_n) * 0x100)) : \
-                                         (0x0C008 + ((_n) * 0x40)))
-#define E1000_SRRCTL(_n)     ((_n) < 4 ? (0x0280C + ((_n) * 0x100)) : \
-                                         (0x0C00C + ((_n) * 0x40)))
-#define E1000_RDH(_n)        ((_n) < 4 ? (0x02810 + ((_n) * 0x100)) : \
-                                         (0x0C010 + ((_n) * 0x40)))
-#define E1000_RDT(_n)        ((_n) < 4 ? (0x02818 + ((_n) * 0x100)) : \
-                                         (0x0C018 + ((_n) * 0x40)))
-#define E1000_RXDCTL(_n)     ((_n) < 4 ? (0x02828 + ((_n) * 0x100)) : \
-                                         (0x0C028 + ((_n) * 0x40)))
-#define E1000_TDBAL(_n)      ((_n) < 4 ? (0x03800 + ((_n) * 0x100)) : \
-                                         (0x0E000 + ((_n) * 0x40)))
-#define E1000_TDBAH(_n)      ((_n) < 4 ? (0x03804 + ((_n) * 0x100)) : \
-                                         (0x0E004 + ((_n) * 0x40)))
-#define E1000_TDLEN(_n)      ((_n) < 4 ? (0x03808 + ((_n) * 0x100)) : \
-                                         (0x0E008 + ((_n) * 0x40)))
-#define E1000_TDH(_n)        ((_n) < 4 ? (0x03810 + ((_n) * 0x100)) : \
-                                         (0x0E010 + ((_n) * 0x40)))
-#define E1000_TDT(_n)        ((_n) < 4 ? (0x03818 + ((_n) * 0x100)) : \
-                                         (0x0E018 + ((_n) * 0x40)))
-#define E1000_TXDCTL(_n)     ((_n) < 4 ? (0x03828 + ((_n) * 0x100)) : \
-                                         (0x0E028 + ((_n) * 0x40)))
-#define E1000_TARC(_n)       (0x03840 + (_n << 8))
-#define E1000_DCA_TXCTRL(_n) (0x03814 + (_n << 8))
-#define E1000_DCA_RXCTRL(_n) (0x02814 + (_n << 8))
-#define E1000_TDWBAL(_n)     ((_n) < 4 ? (0x03838 + ((_n) * 0x100)) : \
-                                         (0x0E038 + ((_n) * 0x40)))
-#define E1000_TDWBAH(_n)     ((_n) < 4 ? (0x0383C + ((_n) * 0x100)) : \
-                                         (0x0E03C + ((_n) * 0x40)))
-#define E1000_RSRPD    0x02C00  /* Rx Small Packet Detect - RW */
-#define E1000_RAID     0x02C08  /* Receive Ack Interrupt Delay - RW */
-#define E1000_TXDMAC   0x03000  /* Tx DMA Control - RW */
-#define E1000_KABGTXD  0x03004  /* AFE Band Gap Transmit Ref Data */
-#define E1000_PSRTYPE(_i)       (0x05480 + ((_i) * 4))
-#define E1000_RAL(_i)  (((_i) <= 15) ? (0x05400 + ((_i) * 8)) : \
-                                       (0x054E0 + ((_i - 16) * 8)))
-#define E1000_RAH(_i)  (((_i) <= 15) ? (0x05404 + ((_i) * 8)) : \
-                                       (0x054E4 + ((_i - 16) * 8)))
-#define E1000_IP4AT_REG(_i)     (0x05840 + ((_i) * 8))
-#define E1000_IP6AT_REG(_i)     (0x05880 + ((_i) * 4))
-#define E1000_WUPM_REG(_i)      (0x05A00 + ((_i) * 4))
-#define E1000_FFMT_REG(_i)      (0x09000 + ((_i) * 8))
-#define E1000_FFVT_REG(_i)      (0x09800 + ((_i) * 8))
-#define E1000_FFLT_REG(_i)      (0x05F00 + ((_i) * 8))
-#define E1000_TDFH     0x03410  /* Tx Data FIFO Head - RW */
-#define E1000_TDFT     0x03418  /* Tx Data FIFO Tail - RW */
-#define E1000_TDFHS    0x03420  /* Tx Data FIFO Head Saved - RW */
-#define E1000_TDFTS    0x03428  /* Tx Data FIFO Tail Saved - RW */
-#define E1000_TDFPC    0x03430  /* Tx Data FIFO Packet Count - RW */
-#define E1000_TDPUMB   0x0357C  /* DMA Tx Descriptor uC Mail Box - RW */
-#define E1000_TDPUAD   0x03580  /* DMA Tx Descriptor uC Addr Command - RW */
-#define E1000_TDPUWD   0x03584  /* DMA Tx Descriptor uC Data Write - RW */
-#define E1000_TDPURD   0x03588  /* DMA Tx Descriptor uC Data  Read  - RW */
-#define E1000_TDPUCTL  0x0358C  /* DMA Tx Descriptor uC Control - RW */
-#define E1000_DTXCTL   0x03590  /* DMA Tx Control - RW */
-#define E1000_TIDV     0x03820  /* Tx Interrupt Delay Value - RW */
-#define E1000_TADV     0x0382C  /* Tx Interrupt Absolute Delay Val - RW */
-#define E1000_TSPMT    0x03830  /* TCP Segmentation PAD & Min Threshold - RW */
-#define E1000_CRCERRS  0x04000  /* CRC Error Count - R/clr */
-#define E1000_ALGNERRC 0x04004  /* Alignment Error Count - R/clr */
-#define E1000_SYMERRS  0x04008  /* Symbol Error Count - R/clr */
-#define E1000_RXERRC   0x0400C  /* Receive Error Count - R/clr */
-#define E1000_MPC      0x04010  /* Missed Packet Count - R/clr */
-#define E1000_SCC      0x04014  /* Single Collision Count - R/clr */
-#define E1000_ECOL     0x04018  /* Excessive Collision Count - R/clr */
-#define E1000_MCC      0x0401C  /* Multiple Collision Count - R/clr */
-#define E1000_LATECOL  0x04020  /* Late Collision Count - R/clr */
-#define E1000_COLC     0x04028  /* Collision Count - R/clr */
-#define E1000_DC       0x04030  /* Defer Count - R/clr */
-#define E1000_TNCRS    0x04034  /* Tx-No CRS - R/clr */
-#define E1000_SEC      0x04038  /* Sequence Error Count - R/clr */
-#define E1000_CEXTERR  0x0403C  /* Carrier Extension Error Count - R/clr */
-#define E1000_RLEC     0x04040  /* Receive Length Error Count - R/clr */
-#define E1000_XONRXC   0x04048  /* XON Rx Count - R/clr */
-#define E1000_XONTXC   0x0404C  /* XON Tx Count - R/clr */
-#define E1000_XOFFRXC  0x04050  /* XOFF Rx Count - R/clr */
-#define E1000_XOFFTXC  0x04054  /* XOFF Tx Count - R/clr */
-#define E1000_FCRUC    0x04058  /* Flow Control Rx Unsupported Count- R/clr */
-#define E1000_PRC64    0x0405C  /* Packets Rx (64 bytes) - R/clr */
-#define E1000_PRC127   0x04060  /* Packets Rx (65-127 bytes) - R/clr */
-#define E1000_PRC255   0x04064  /* Packets Rx (128-255 bytes) - R/clr */
-#define E1000_PRC511   0x04068  /* Packets Rx (255-511 bytes) - R/clr */
-#define E1000_PRC1023  0x0406C  /* Packets Rx (512-1023 bytes) - R/clr */
-#define E1000_PRC1522  0x04070  /* Packets Rx (1024-1522 bytes) - R/clr */
-#define E1000_GPRC     0x04074  /* Good Packets Rx Count - R/clr */
-#define E1000_BPRC     0x04078  /* Broadcast Packets Rx Count - R/clr */
-#define E1000_MPRC     0x0407C  /* Multicast Packets Rx Count - R/clr */
-#define E1000_GPTC     0x04080  /* Good Packets Tx Count - R/clr */
-#define E1000_GORCL    0x04088  /* Good Octets Rx Count Low - R/clr */
-#define E1000_GORCH    0x0408C  /* Good Octets Rx Count High - R/clr */
-#define E1000_GOTCL    0x04090  /* Good Octets Tx Count Low - R/clr */
-#define E1000_GOTCH    0x04094  /* Good Octets Tx Count High - R/clr */
-#define E1000_RNBC     0x040A0  /* Rx No Buffers Count - R/clr */
-#define E1000_RUC      0x040A4  /* Rx Undersize Count - R/clr */
-#define E1000_RFC      0x040A8  /* Rx Fragment Count - R/clr */
-#define E1000_ROC      0x040AC  /* Rx Oversize Count - R/clr */
-#define E1000_RJC      0x040B0  /* Rx Jabber Count - R/clr */
-#define E1000_MGTPRC   0x040B4  /* Management Packets Rx Count - R/clr */
-#define E1000_MGTPDC   0x040B8  /* Management Packets Dropped Count - R/clr */
-#define E1000_MGTPTC   0x040BC  /* Management Packets Tx Count - R/clr */
-#define E1000_TORL     0x040C0  /* Total Octets Rx Low - R/clr */
-#define E1000_TORH     0x040C4  /* Total Octets Rx High - R/clr */
-#define E1000_TOTL     0x040C8  /* Total Octets Tx Low - R/clr */
-#define E1000_TOTH     0x040CC  /* Total Octets Tx High - R/clr */
-#define E1000_TPR      0x040D0  /* Total Packets Rx - R/clr */
-#define E1000_TPT      0x040D4  /* Total Packets Tx - R/clr */
-#define E1000_PTC64    0x040D8  /* Packets Tx (64 bytes) - R/clr */
-#define E1000_PTC127   0x040DC  /* Packets Tx (65-127 bytes) - R/clr */
-#define E1000_PTC255   0x040E0  /* Packets Tx (128-255 bytes) - R/clr */
-#define E1000_PTC511   0x040E4  /* Packets Tx (256-511 bytes) - R/clr */
-#define E1000_PTC1023  0x040E8  /* Packets Tx (512-1023 bytes) - R/clr */
-#define E1000_PTC1522  0x040EC  /* Packets Tx (1024-1522 Bytes) - R/clr */
-#define E1000_MPTC     0x040F0  /* Multicast Packets Tx Count - R/clr */
-#define E1000_BPTC     0x040F4  /* Broadcast Packets Tx Count - R/clr */
-#define E1000_TSCTC    0x040F8  /* TCP Segmentation Context Tx - R/clr */
-#define E1000_TSCTFC   0x040FC  /* TCP Segmentation Context Tx Fail - R/clr */
-#define E1000_IAC      0x04100  /* Interrupt Assertion Count */
-#define E1000_ICRXPTC  0x04104  /* Interrupt Cause Rx Pkt Timer Expire Count */
-#define E1000_ICRXATC  0x04108  /* Interrupt Cause Rx Abs Timer Expire Count */
-#define E1000_ICTXPTC  0x0410C  /* Interrupt Cause Tx Pkt Timer Expire Count */
-#define E1000_ICTXATC  0x04110  /* Interrupt Cause Tx Abs Timer Expire Count */
-#define E1000_ICTXQEC  0x04118  /* Interrupt Cause Tx Queue Empty Count */
-#define E1000_ICTXQMTC 0x0411C  /* Interrupt Cause Tx Queue Min Thresh Count */
-#define E1000_ICRXDMTC 0x04120  /* Interrupt Cause Rx Desc Min Thresh Count */
-#define E1000_ICRXOC   0x04124  /* Interrupt Cause Receiver Overrun Count */
-
-#define E1000_PCS_CFG0    0x04200  /* PCS Configuration 0 - RW */
-#define E1000_PCS_LCTL    0x04208  /* PCS Link Control - RW */
-#define E1000_PCS_LSTAT   0x0420C  /* PCS Link Status - RO */
-#define E1000_CBTMPC      0x0402C  /* Circuit Breaker Tx Packet Count */
-#define E1000_HTDPMC      0x0403C  /* Host Transmit Discarded Packets */
-#define E1000_CBRDPC      0x04044  /* Circuit Breaker Rx Dropped Count */
-#define E1000_CBRMPC      0x040FC  /* Circuit Breaker Rx Packet Count */
-#define E1000_RPTHC       0x04104  /* Rx Packets To Host */
-#define E1000_HGPTC       0x04118  /* Host Good Packets Tx Count */
-#define E1000_HTCBDPC     0x04124  /* Host Tx Circuit Breaker Dropped Count */
-#define E1000_HGORCL      0x04128  /* Host Good Octets Received Count Low */
-#define E1000_HGORCH      0x0412C  /* Host Good Octets Received Count High */
-#define E1000_HGOTCL      0x04130  /* Host Good Octets Transmit Count Low */
-#define E1000_HGOTCH      0x04134  /* Host Good Octets Transmit Count High */
-#define E1000_LENERRS     0x04138  /* Length Errors Count */
-#define E1000_SCVPC       0x04228  /* SerDes/SGMII Code Violation Pkt Count */
-#define E1000_HRMPC       0x0A018  /* Header Redirection Missed Packet Count */
-#define E1000_PCS_ANADV   0x04218  /* AN advertisement - RW */
-#define E1000_PCS_LPAB    0x0421C  /* Link Partner Ability - RW */
-#define E1000_PCS_NPTX    0x04220  /* AN Next Page Transmit - RW */
-#define E1000_PCS_LPABNP  0x04224  /* Link Partner Ability Next Page - RW */
-#define E1000_1GSTAT_RCV  0x04228  /* 1GSTAT Code Violation Packet Count - RW */
-#define E1000_RXCSUM   0x05000  /* Rx Checksum Control - RW */
-#define E1000_RLPML    0x05004  /* Rx Long Packet Max Length */
-#define E1000_RFCTL    0x05008  /* Receive Filter Control*/
-#define E1000_MTA      0x05200  /* Multicast Table Array - RW Array */
-#define E1000_RA       0x05400  /* Receive Address - RW Array */
-#define E1000_VFTA     0x05600  /* VLAN Filter Table Array - RW Array */
-#define E1000_VT_CTL   0x0581C  /* VMDq Control - RW */
-#define E1000_VFQA0    0x0B000  /* VLAN Filter Queue Array 0 - RW Array */
-#define E1000_VFQA1    0x0B200  /* VLAN Filter Queue Array 1 - RW Array */
-#define E1000_WUC      0x05800  /* Wakeup Control - RW */
-#define E1000_WUFC     0x05808  /* Wakeup Filter Control - RW */
-#define E1000_WUS      0x05810  /* Wakeup Status - RO */
-#define E1000_MANC     0x05820  /* Management Control - RW */
-#define E1000_IPAV     0x05838  /* IP Address Valid - RW */
-#define E1000_IP4AT    0x05840  /* IPv4 Address Table - RW Array */
-#define E1000_IP6AT    0x05880  /* IPv6 Address Table - RW Array */
-#define E1000_WUPL     0x05900  /* Wakeup Packet Length - RW */
-#define E1000_WUPM     0x05A00  /* Wakeup Packet Memory - RO A */
-#define E1000_PBACL    0x05B68  /* MSIx PBA Clear - Read/Write 1's to clear */
-#define E1000_FFLT     0x05F00  /* Flexible Filter Length Table - RW Array */
-#define E1000_HOST_IF  0x08800  /* Host Interface */
-#define E1000_FFMT     0x09000  /* Flexible Filter Mask Table - RW Array */
-#define E1000_FFVT     0x09800  /* Flexible Filter Value Table - RW Array */
-
-#define E1000_KMRNCTRLSTA 0x00034 /* MAC-PHY interface - RW */
-#define E1000_MDPHYA      0x0003C /* PHY address - RW */
-#define E1000_MANC2H      0x05860 /* Management Control To Host - RW */
-#define E1000_SW_FW_SYNC  0x05B5C /* Software-Firmware Synchronization - RW */
-#define E1000_CCMCTL      0x05B48 /* CCM Control Register */
-#define E1000_GIOCTL      0x05B44 /* GIO Analog Control Register */
-#define E1000_SCCTL       0x05B4C /* PCIc PLL Configuration Register */
-#define E1000_GCR         0x05B00 /* PCI-Ex Control */
-#define E1000_GCR2        0x05B64 /* PCI-Ex Control #2 */
-#define E1000_GSCL_1    0x05B10 /* PCI-Ex Statistic Control #1 */
-#define E1000_GSCL_2    0x05B14 /* PCI-Ex Statistic Control #2 */
-#define E1000_GSCL_3    0x05B18 /* PCI-Ex Statistic Control #3 */
-#define E1000_GSCL_4    0x05B1C /* PCI-Ex Statistic Control #4 */
-#define E1000_FACTPS    0x05B30 /* Function Active and Power State to MNG */
-#define E1000_SWSM      0x05B50 /* SW Semaphore */
-#define E1000_FWSM      0x05B54 /* FW Semaphore */
-#define E1000_SWSM2     0x05B58 /* Driver-only SW semaphore (not used by BOOT agents) */
-#define E1000_DCA_ID    0x05B70 /* DCA Requester ID Information - RO */
-#define E1000_DCA_CTRL  0x05B74 /* DCA Control - RW */
-#define E1000_FFLT_DBG  0x05F04 /* Debug Register */
-#define E1000_HICR      0x08F00 /* Host Interface Control */
-
-/* RSS registers */
-#define E1000_CPUVEC    0x02C10 /* CPU Vector Register - RW */
-#define E1000_MRQC      0x05818 /* Multiple Receive Control - RW */
-#define E1000_IMIR(_i)      (0x05A80 + ((_i) * 4))  /* Immediate Interrupt */
-#define E1000_IMIREXT(_i)   (0x05AA0 + ((_i) * 4))  /* Immediate Interrupt Ext*/
-#define E1000_IMIRVP    0x05AC0 /* Immediate Interrupt Rx VLAN Priority - RW */
-#define E1000_MSIXBM(_i)    (0x01600 + ((_i) * 4)) /* MSI-X Allocation Register
-                                                    * (_i) - RW */
-#define E1000_MSIXTADD(_i)  (0x0C000 + ((_i) * 0x10)) /* MSI-X Table entry addr
-                                                       * low reg - RW */
-#define E1000_MSIXTUADD(_i) (0x0C004 + ((_i) * 0x10)) /* MSI-X Table entry addr
-                                                       * upper reg - RW */
-#define E1000_MSIXTMSG(_i)  (0x0C008 + ((_i) * 0x10)) /* MSI-X Table entry
-                                                       * message reg - RW */
-#define E1000_MSIXVCTRL(_i) (0x0C00C + ((_i) * 0x10)) /* MSI-X Table entry
-                                                       * vector ctrl reg - RW */
-#define E1000_MSIXPBA    0x0E000 /* MSI-X Pending bit array */
-#define E1000_RETA(_i)  (0x05C00 + ((_i) * 4)) /* Redirection Table - RW */
-#define E1000_RSSRK(_i) (0x05C80 + ((_i) * 4)) /* RSS Random Key - RW */
-#define E1000_RSSIM     0x05864 /* RSS Interrupt Mask */
-#define E1000_RSSIR     0x05868 /* RSS Interrupt Request */
-
-#endif
diff --git a/src/drivers/net/e1000e/e1000e.c b/src/drivers/net/e1000e/e1000e.c
deleted file mode 100644 (file)
index b7318b7..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-REQUIRE_OBJECT(e1000e_main);
-REQUIRE_OBJECT(e1000e_80003es2lan);
-REQUIRE_OBJECT(e1000e_82571);
-REQUIRE_OBJECT(e1000e_ich8lan);
diff --git a/src/drivers/net/e1000e/e1000e.h b/src/drivers/net/e1000e/e1000e.h
deleted file mode 100644 (file)
index 0e53793..0000000
+++ /dev/null
@@ -1,534 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/* Linux PRO/1000 Ethernet Driver main header file */
-
-#ifndef _E1000E_H_
-#define _E1000E_H_
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <ipxe/io.h>
-#include <errno.h>
-#include <byteswap.h>
-#include <ipxe/pci.h>
-#include <ipxe/malloc.h>
-#include <ipxe/if_ether.h>
-#include <ipxe/ethernet.h>
-#include <ipxe/iobuf.h>
-#include <ipxe/netdevice.h>
-
-/* Begin OS Dependencies */
-
-#define u8         unsigned char
-#define bool       boolean_t
-#define dma_addr_t unsigned long
-#define __le16     uint16_t
-#define __le32     uint32_t
-#define __le64     uint64_t
-
-#define __iomem
-
-#define msleep(x) mdelay(x)
-
-#define ETH_FCS_LEN 4
-
-typedef int spinlock_t;
-typedef enum {
-    false = 0,
-    true = 1
-} boolean_t;
-
-/* End OS Dependencies */
-
-#include "e1000e_hw.h"
-
-#define E1000_TX_FLAGS_CSUM            0x00000001
-#define E1000_TX_FLAGS_VLAN            0x00000002
-#define E1000_TX_FLAGS_TSO             0x00000004
-#define E1000_TX_FLAGS_IPV4            0x00000008
-#define E1000_TX_FLAGS_VLAN_MASK       0xffff0000
-#define E1000_TX_FLAGS_VLAN_SHIFT      16
-
-#define E1000_MAX_PER_TXD      8192
-#define E1000_MAX_TXD_PWR      12
-
-#define MINIMUM_DHCP_PACKET_SIZE 282
-
-struct e1000_info;
-
-#define e_dbg(arg...) if (0) { printf (arg); };
-
-#ifdef CONFIG_E1000E_MSIX
-/* Interrupt modes, as used by the IntMode paramter */
-#define E1000E_INT_MODE_LEGACY         0
-#define E1000E_INT_MODE_MSI            1
-#define E1000E_INT_MODE_MSIX           2
-
-#endif /* CONFIG_E1000E_MSIX */
-#ifndef CONFIG_E1000E_NAPI
-#define E1000_MAX_INTR 10
-
-#endif /* CONFIG_E1000E_NAPI */
-/* Tx/Rx descriptor defines */
-#define E1000_DEFAULT_TXD              256
-#define E1000_MAX_TXD                  4096
-#define E1000_MIN_TXD                  64
-
-#define E1000_DEFAULT_RXD              256
-#define E1000_MAX_RXD                  4096
-#define E1000_MIN_RXD                  64
-
-#define E1000_MIN_ITR_USECS            10 /* 100000 irq/sec */
-#define E1000_MAX_ITR_USECS            10000 /* 100    irq/sec */
-
-/* Early Receive defines */
-#define E1000_ERT_2048                 0x100
-
-#define E1000_FC_PAUSE_TIME            0x0680 /* 858 usec */
-
-/* How many Tx Descriptors do we need to call netif_wake_queue ? */
-/* How many Rx Buffers do we bundle into one write to the hardware ? */
-#define E1000_RX_BUFFER_WRITE          16 /* Must be power of 2 */
-
-#define AUTO_ALL_MODES                 0
-#define E1000_EEPROM_APME              0x0400
-
-#define E1000_MNG_VLAN_NONE            (-1)
-
-/* Number of packet split data buffers (not including the header buffer) */
-#define PS_PAGE_BUFFERS                        (MAX_PS_BUFFERS - 1)
-
-#define MAXIMUM_ETHERNET_VLAN_SIZE     1522
-
-#define DEFAULT_JUMBO                  9234
-
-enum e1000_boards {
-       board_82571,
-       board_82572,
-       board_82573,
-       board_82574,
-       board_80003es2lan,
-       board_ich8lan,
-       board_ich9lan,
-       board_ich10lan,
-       board_pchlan,
-       board_pch2lan,
-       board_82583,
-};
-
-/* board specific private data structure */
-struct e1000_adapter {
-       const struct e1000_info *ei;
-
-       /* OS defined structs */
-       struct net_device *netdev;
-       struct pci_device *pdev;
-       struct net_device_stats net_stats;
-
-       /* structs defined in e1000_hw.h */
-       struct e1000_hw hw;
-
-       struct e1000_phy_info phy_info;
-
-       u32 wol;
-       u32 pba;
-       u32 max_hw_frame_size;
-
-       bool fc_autoneg;
-
-       unsigned int flags;
-       unsigned int flags2;
-
-#define NUM_TX_DESC    8
-#define NUM_RX_DESC    8
-
-       struct io_buffer *tx_iobuf[NUM_TX_DESC];
-       struct io_buffer *rx_iobuf[NUM_RX_DESC];
-
-       struct e1000_tx_desc *tx_base;
-       struct e1000_rx_desc *rx_base;
-
-       uint32_t tx_ring_size;
-       uint32_t rx_ring_size;
-
-       uint32_t tx_head;
-       uint32_t tx_tail;
-       uint32_t tx_fill_ctr;
-
-       uint32_t rx_curr;
-
-       uint32_t ioaddr;
-       uint32_t irqno;
-
-        uint32_t tx_int_delay;
-        uint32_t tx_abs_int_delay;
-        uint32_t txd_cmd;
-};
-
-struct e1000_info {
-       enum e1000_mac_type     mac;
-       unsigned int            flags;
-       unsigned int            flags2;
-       u32                     pba;
-       u32                     max_hw_frame_size;
-       s32                     (*get_variants)(struct e1000_adapter *);
-       void                    (*init_ops)(struct e1000_hw *);
-};
-
-/* hardware capability, feature, and workaround flags */
-#define FLAG_HAS_AMT                      (1 << 0)
-#define FLAG_HAS_FLASH                    (1 << 1)
-#define FLAG_HAS_HW_VLAN_FILTER           (1 << 2)
-#define FLAG_HAS_WOL                      (1 << 3)
-#define FLAG_HAS_ERT                      (1 << 4)
-#define FLAG_HAS_CTRLEXT_ON_LOAD          (1 << 5)
-#define FLAG_HAS_SWSM_ON_LOAD             (1 << 6)
-#define FLAG_HAS_JUMBO_FRAMES             (1 << 7)
-#define FLAG_IS_ICH                       (1 << 9)
-#ifdef CONFIG_E1000E_MSIX
-#define FLAG_HAS_MSIX                     (1 << 10)
-#endif
-#define FLAG_HAS_SMART_POWER_DOWN         (1 << 11)
-#define FLAG_IS_QUAD_PORT_A               (1 << 12)
-#define FLAG_IS_QUAD_PORT                 (1 << 13)
-#define FLAG_TIPG_MEDIUM_FOR_80003ESLAN   (1 << 14)
-#define FLAG_APME_IN_WUC                  (1 << 15)
-#define FLAG_APME_IN_CTRL3                (1 << 16)
-#define FLAG_APME_CHECK_PORT_B            (1 << 17)
-#define FLAG_DISABLE_FC_PAUSE_TIME        (1 << 18)
-#define FLAG_NO_WAKE_UCAST                (1 << 19)
-#define FLAG_MNG_PT_ENABLED               (1 << 20)
-#define FLAG_RESET_OVERWRITES_LAA         (1 << 21)
-#define FLAG_TARC_SPEED_MODE_BIT          (1 << 22)
-#define FLAG_TARC_SET_BIT_ZERO            (1 << 23)
-#define FLAG_RX_NEEDS_RESTART             (1 << 24)
-#define FLAG_LSC_GIG_SPEED_DROP           (1 << 25)
-#define FLAG_SMART_POWER_DOWN             (1 << 26)
-#define FLAG_MSI_ENABLED                  (1 << 27)
-#define FLAG_RX_CSUM_ENABLED              (1 << 28)
-#define FLAG_TSO_FORCE                    (1 << 29)
-#define FLAG_RX_RESTART_NOW               (1 << 30)
-#define FLAG_MSI_TEST_FAILED              (1 << 31)
-
-/* CRC Stripping defines */
-#define FLAG2_CRC_STRIPPING               (1 << 0)
-#define FLAG2_HAS_PHY_WAKEUP              (1 << 1)
-
-#define E1000_RX_DESC_PS(R, i)     \
-       (&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
-#define E1000_GET_DESC(R, i, type)     (&(((struct type *)((R).desc))[i]))
-#define E1000_RX_DESC(R, i)            E1000_GET_DESC(R, i, e1000_rx_desc)
-#define E1000_TX_DESC(R, i)            E1000_GET_DESC(R, i, e1000_tx_desc)
-#define E1000_CONTEXT_DESC(R, i)       E1000_GET_DESC(R, i, e1000_context_desc)
-
-enum e1000_state_t {
-       __E1000E_TESTING,
-       __E1000E_RESETTING,
-       __E1000E_DOWN
-};
-
-enum latency_range {
-       lowest_latency = 0,
-       low_latency = 1,
-       bulk_latency = 2,
-       latency_invalid = 255
-};
-
-extern void e1000e_check_options(struct e1000_adapter *adapter);
-
-extern void e1000e_reset(struct e1000_adapter *adapter);
-extern void e1000e_power_up_phy(struct e1000_adapter *adapter);
-
-extern void e1000e_init_function_pointers_82571(struct e1000_hw *hw)
-                                               __attribute__((weak));
-extern void e1000e_init_function_pointers_80003es2lan(struct e1000_hw *hw)
-                                               __attribute__((weak));
-extern void e1000e_init_function_pointers_ich8lan(struct e1000_hw *hw)
-                                               __attribute__((weak));
-
-extern int e1000e_probe(struct pci_device *pdev);
-
-extern void e1000e_remove(struct pci_device *pdev);
-
-extern s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num);
-
-static inline s32 e1000e_commit_phy(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.commit)
-               return hw->phy.ops.commit(hw);
-
-       return 0;
-}
-
-extern bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw);
-
-extern bool e1000e_get_laa_state_82571(struct e1000_hw *hw);
-extern void e1000e_set_laa_state_82571(struct e1000_hw *hw, bool state);
-
-extern void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
-                                                bool state);
-extern void e1000e_igp3_phy_powerdown_workaround_ich8lan(struct e1000_hw *hw);
-extern void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw);
-extern void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw);
-extern s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable);
-
-extern s32 e1000e_check_for_copper_link(struct e1000_hw *hw);
-extern s32 e1000e_check_for_fiber_link(struct e1000_hw *hw);
-extern s32 e1000e_check_for_serdes_link(struct e1000_hw *hw);
-extern s32 e1000e_cleanup_led_generic(struct e1000_hw *hw);
-extern s32 e1000e_led_on_generic(struct e1000_hw *hw);
-extern s32 e1000e_led_off_generic(struct e1000_hw *hw);
-extern s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw);
-extern s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, u16 *duplex);
-extern s32 e1000e_get_speed_and_duplex_fiber_serdes(struct e1000_hw *hw, u16 *speed, u16 *duplex);
-extern s32 e1000e_disable_pcie_master(struct e1000_hw *hw);
-extern s32 e1000e_get_auto_rd_done(struct e1000_hw *hw);
-extern s32 e1000e_id_led_init(struct e1000_hw *hw);
-extern void e1000e_clear_hw_cntrs_base(struct e1000_hw *hw);
-extern s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw);
-extern s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw);
-extern s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw);
-extern s32 e1000e_setup_link(struct e1000_hw *hw);
-static inline void e1000e_clear_vfta(struct e1000_hw *hw)
-{
-       hw->mac.ops.clear_vfta(hw);
-}
-extern void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);
-extern void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
-                                              u8 *mc_addr_list,
-                                              u32 mc_addr_count);
-extern void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
-extern s32 e1000e_set_fc_watermarks(struct e1000_hw *hw);
-extern void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop);
-extern s32 e1000e_get_hw_semaphore(struct e1000_hw *hw);
-extern s32 e1000e_valid_led_default(struct e1000_hw *hw, u16 *data);
-extern void e1000e_config_collision_dist(struct e1000_hw *hw);
-extern s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw);
-extern s32 e1000e_force_mac_fc(struct e1000_hw *hw);
-extern s32 e1000e_blink_led(struct e1000_hw *hw);
-extern void e1000e_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value);
-static inline void e1000e_write_vfta(struct e1000_hw *hw, u32 offset, u32 value)
-{
-       if (hw->mac.ops.write_vfta)
-               hw->mac.ops.write_vfta(hw, offset, value);
-}
-extern void e1000e_reset_adaptive(struct e1000_hw *hw);
-extern void e1000e_update_adaptive(struct e1000_hw *hw);
-
-extern s32 e1000e_setup_copper_link(struct e1000_hw *hw);
-extern void e1000e_put_hw_semaphore(struct e1000_hw *hw);
-extern s32 e1000e_check_reset_block_generic(struct e1000_hw *hw);
-#if 0
-extern s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw);
-#endif
-#if 0
-extern s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw);
-#endif
-extern s32 e1000e_get_phy_info_igp(struct e1000_hw *hw);
-extern s32 e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);
-extern s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw);
-extern s32 e1000e_set_d3_lplu_state(struct e1000_hw *hw, bool active);
-extern s32 e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data);
-extern s32 e1000e_phy_sw_reset(struct e1000_hw *hw);
-#if 0
-extern s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw);
-#endif
-extern s32 e1000e_get_cfg_done(struct e1000_hw *hw);
-#if 0
-extern s32 e1000e_get_cable_length_m88(struct e1000_hw *hw);
-#endif
-extern s32 e1000e_get_phy_info_m88(struct e1000_hw *hw);
-extern s32 e1000e_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data);
-extern s32 e1000e_write_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 data);
-extern enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id);
-extern s32 e1000e_determine_phy_address(struct e1000_hw *hw);
-extern s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data);
-extern s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data);
-#if 0
-extern void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);
-#endif
-extern s32 e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);
-extern s32 e1000e_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data);
-extern s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
-                              u32 usec_interval, bool *success);
-extern s32 e1000e_phy_reset_dsp(struct e1000_hw *hw);
-extern s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data);
-extern s32 e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data);
-extern s32 e1000e_check_downshift(struct e1000_hw *hw);
-
-static inline s32 e1000e_phy_hw_reset(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.reset)
-               return hw->phy.ops.reset(hw);
-
-       return 0;
-}
-
-static inline s32 e1000e_check_reset_block(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.check_reset_block)
-               return hw->phy.ops.check_reset_block(hw);
-
-       return 0;
-}
-
-static inline s32 e1e_rphy(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       if (hw->phy.ops.read_reg)
-               return hw->phy.ops.read_reg(hw, offset, data);
-
-       return 0;
-}
-
-static inline s32 e1e_wphy(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       if (hw->phy.ops.write_reg)
-               return hw->phy.ops.write_reg(hw, offset, data);
-
-       return 0;
-}
-
-#if 0
-static inline s32 e1000e_get_cable_length(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.get_cable_length)
-               return hw->phy.ops.get_cable_length(hw);
-
-       return 0;
-}
-#endif
-
-extern s32 e1000e_acquire_nvm(struct e1000_hw *hw);
-extern s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
-extern s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);
-extern s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);
-extern s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
-extern s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);
-extern void e1000e_release_nvm(struct e1000_hw *hw);
-
-static inline s32 e1000e_read_mac_addr(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.read_mac_addr)
-               return hw->mac.ops.read_mac_addr(hw);
-
-       return e1000e_read_mac_addr_generic(hw);
-}
-
-static inline s32 e1000e_validate_nvm_checksum(struct e1000_hw *hw)
-{
-       return hw->nvm.ops.validate(hw);
-}
-
-static inline s32 e1000e_update_nvm_checksum(struct e1000_hw *hw)
-{
-       return hw->nvm.ops.update(hw);
-}
-
-static inline s32 e1000e_read_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       return hw->nvm.ops.read(hw, offset, words, data);
-}
-
-static inline s32 e1000e_write_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       return hw->nvm.ops.write(hw, offset, words, data);
-}
-
-static inline s32 e1000e_get_phy_info(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.get_info)
-               return hw->phy.ops.get_info(hw);
-
-       return 0;
-}
-
-extern bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw);
-#if 0
-extern s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length);
-#endif
-
-static inline u32 __er32(struct e1000_hw *hw, unsigned long reg)
-{
-       return readl(hw->hw_addr + reg);
-}
-
-static inline void __ew32(struct e1000_hw *hw, unsigned long reg, u32 val)
-{
-       writel(val, hw->hw_addr + reg);
-}
-
-#define er32(reg)      __er32(hw, E1000_##reg)
-#define ew32(reg, val) __ew32(hw, E1000_##reg, (val))
-#define e1e_flush()    er32(STATUS)
-
-#define E1000_WRITE_REG(a, reg, value)  \
-    writel((value), ((a)->hw_addr + reg))
-
-#define E1000_READ_REG(a, reg) (readl((a)->hw_addr + reg))
-
-#define E1000_WRITE_REG_ARRAY(a, reg, offset, value)  \
-    writel((value), ((a)->hw_addr + reg + ((offset) << 2)))
-
-#define E1000_READ_REG_ARRAY(a, reg, offset) ( \
-    readl((a)->hw_addr + reg + ((offset) << 2)))
-
-#define E1000_READ_REG_ARRAY_DWORD E1000_READ_REG_ARRAY
-#define E1000_WRITE_REG_ARRAY_DWORD E1000_WRITE_REG_ARRAY
-
-static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg)
-{
-       return readw(hw->flash_address + reg);
-}
-
-static inline u32 __er32flash(struct e1000_hw *hw, unsigned long reg)
-{
-       return readl(hw->flash_address + reg);
-}
-
-static inline void __ew16flash(struct e1000_hw *hw, unsigned long reg, u16 val)
-{
-       writew(val, hw->flash_address + reg);
-}
-
-static inline void __ew32flash(struct e1000_hw *hw, unsigned long reg, u32 val)
-{
-       writel(val, hw->flash_address + reg);
-}
-
-#define er16flash(reg)         __er16flash(hw, (reg))
-#define er32flash(reg)         __er32flash(hw, (reg))
-#define ew16flash(reg, val)    __ew16flash(hw, (reg), (val))
-#define ew32flash(reg, val)    __ew32flash(hw, (reg), (val))
-
-#endif /* _E1000E_H_ */
diff --git a/src/drivers/net/e1000e/e1000e_80003es2lan.c b/src/drivers/net/e1000e/e1000e_80003es2lan.c
deleted file mode 100644 (file)
index a3eed9b..0000000
+++ /dev/null
@@ -1,1533 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/*
- * 80003ES2LAN Gigabit Ethernet Controller (Copper)
- * 80003ES2LAN Gigabit Ethernet Controller (Serdes)
- */
-
-#include "e1000e.h"
-
-static s32  e1000e_init_phy_params_80003es2lan(struct e1000_hw *hw);
-static s32  e1000e_init_nvm_params_80003es2lan(struct e1000_hw *hw);
-static s32  e1000e_init_mac_params_80003es2lan(struct e1000_hw *hw);
-static s32  e1000e_acquire_phy_80003es2lan(struct e1000_hw *hw);
-static void e1000e_release_phy_80003es2lan(struct e1000_hw *hw);
-static s32  e1000e_acquire_nvm_80003es2lan(struct e1000_hw *hw);
-static void e1000e_release_nvm_80003es2lan(struct e1000_hw *hw);
-static s32  e1000e_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
-                                                   u32 offset,
-                                                   u16 *data);
-static s32  e1000e_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
-                                                    u32 offset,
-                                                    u16 data);
-static s32  e1000e_write_nvm_80003es2lan(struct e1000_hw *hw, u16 offset,
-                                        u16 words, u16 *data);
-static s32  e1000e_get_cfg_done_80003es2lan(struct e1000_hw *hw);
-#if 0
-static s32  e1000e_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw);
-#endif
-#if 0
-static s32  e1000e_get_cable_length_80003es2lan(struct e1000_hw *hw);
-#endif
-static s32  e1000e_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed,
-                                               u16 *duplex);
-static s32  e1000e_reset_hw_80003es2lan(struct e1000_hw *hw);
-static s32  e1000e_init_hw_80003es2lan(struct e1000_hw *hw);
-static s32  e1000e_setup_copper_link_80003es2lan(struct e1000_hw *hw);
-static void e1000e_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw);
-static s32  e1000e_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask);
-static s32  e1000e_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex);
-static s32  e1000e_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw);
-static s32  e1000e_cfg_on_link_up_80003es2lan(struct e1000_hw *hw);
-static s32  e1000e_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
-                                            u16 *data);
-static s32  e1000e_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
-                                             u16 data);
-static s32  e1000e_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw);
-static void e1000e_initialize_hw_bits_80003es2lan(struct e1000_hw *hw);
-static void e1000e_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask);
-static s32  e1000e_read_mac_addr_80003es2lan(struct e1000_hw *hw);
-static void e1000e_power_down_phy_copper_80003es2lan(struct e1000_hw *hw);
-
-#if 0
-/*
- * A table for the GG82563 cable length where the range is defined
- * with a lower bound at "index" and the upper bound at
- * "index + 5".
- */
-static const u16 e1000_gg82563_cable_length_table[] =
-         { 0, 60, 115, 150, 150, 60, 115, 150, 180, 180, 0xFF };
-#define GG82563_CABLE_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_gg82563_cable_length_table) / \
-                 sizeof(e1000_gg82563_cable_length_table[0]))
-#endif
-
-/**
- *  e1000e_init_phy_params_80003es2lan - Init ESB2 PHY func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000e_init_phy_params_80003es2lan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->phy.media_type != e1000_media_type_copper) {
-               phy->type        = e1000_phy_none;
-               goto out;
-       } else {
-               phy->ops.power_up = e1000e_power_up_phy_copper;
-               phy->ops.power_down = e1000e_power_down_phy_copper_80003es2lan;
-       }
-
-       phy->addr                = 1;
-       phy->autoneg_mask        = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-       phy->reset_delay_us      = 100;
-       phy->type                = e1000_phy_gg82563;
-
-       phy->ops.acquire            = e1000e_acquire_phy_80003es2lan;
-       phy->ops.check_polarity     = e1000e_check_polarity_m88;
-       phy->ops.check_reset_block  = e1000e_check_reset_block_generic;
-       phy->ops.commit             = e1000e_phy_sw_reset;
-       phy->ops.get_cfg_done       = e1000e_get_cfg_done_80003es2lan;
-       phy->ops.get_info           = e1000e_get_phy_info_m88;
-       phy->ops.release            = e1000e_release_phy_80003es2lan;
-       phy->ops.reset              = e1000e_phy_hw_reset_generic;
-       phy->ops.set_d3_lplu_state  = e1000e_set_d3_lplu_state;
-#if 0
-       phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_80003es2lan;
-#endif
-#if 0
-       phy->ops.get_cable_length   = e1000e_get_cable_length_80003es2lan;
-#endif
-       phy->ops.read_reg           = e1000e_read_phy_reg_gg82563_80003es2lan;
-       phy->ops.write_reg          = e1000e_write_phy_reg_gg82563_80003es2lan;
-
-       phy->ops.cfg_on_link_up    = e1000e_cfg_on_link_up_80003es2lan;
-
-       /* This can only be done after all function pointers are setup. */
-       ret_val = e1000e_get_phy_id(hw);
-
-       /* Verify phy id */
-       if (phy->id != GG82563_E_PHY_ID) {
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_init_nvm_params_80003es2lan - Init ESB2 NVM func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000e_init_nvm_params_80003es2lan(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = er32(EECD);
-       u16 size;
-
-       nvm->opcode_bits        = 8;
-       nvm->delay_usec         = 1;
-       switch (nvm->override) {
-       case e1000_nvm_override_spi_large:
-               nvm->page_size    = 32;
-               nvm->address_bits = 16;
-               break;
-       case e1000_nvm_override_spi_small:
-               nvm->page_size    = 8;
-               nvm->address_bits = 8;
-               break;
-       default:
-               nvm->page_size    = eecd & E1000_EECD_ADDR_BITS ? 32 : 8;
-               nvm->address_bits = eecd & E1000_EECD_ADDR_BITS ? 16 : 8;
-               break;
-       }
-
-       nvm->type               = e1000_nvm_eeprom_spi;
-
-       size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
-                         E1000_EECD_SIZE_EX_SHIFT);
-
-       /*
-        * Added to a constant, "size" becomes the left-shift value
-        * for setting word_size.
-        */
-       size += NVM_WORD_SIZE_BASE_SHIFT;
-
-       /* EEPROM access above 16k is unsupported */
-       if (size > 14)
-               size = 14;
-       nvm->word_size  = 1 << size;
-
-       /* Function Pointers */
-       nvm->ops.acquire           = e1000e_acquire_nvm_80003es2lan;
-       nvm->ops.read              = e1000e_read_nvm_eerd;
-       nvm->ops.release           = e1000e_release_nvm_80003es2lan;
-       nvm->ops.update            = e1000e_update_nvm_checksum_generic;
-       nvm->ops.valid_led_default = e1000e_valid_led_default;
-       nvm->ops.validate          = e1000e_validate_nvm_checksum_generic;
-       nvm->ops.write             = e1000e_write_nvm_80003es2lan;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_init_mac_params_80003es2lan - Init ESB2 MAC func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000e_init_mac_params_80003es2lan(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = E1000_SUCCESS;
-
-       /* Set media type */
-       switch (hw->device_id) {
-       case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
-               hw->phy.media_type = e1000_media_type_internal_serdes;
-               break;
-       default:
-               hw->phy.media_type = e1000_media_type_copper;
-               break;
-       }
-
-       /* Set mta register count */
-       mac->mta_reg_count = 128;
-       /* Set rar entry count */
-       mac->rar_entry_count = E1000_RAR_ENTRIES;
-       /* Set if part includes ASF firmware */
-       mac->asf_firmware_present = true;
-       /* Set if manageability features are enabled. */
-       mac->arc_subsystem_valid =
-               (er32(FWSM) & E1000_FWSM_MODE_MASK)
-                       ? true : false;
-
-       /* Function pointers */
-
-       /* bus type/speed/width */
-       mac->ops.get_bus_info = e1000e_get_bus_info_pcie;
-       /* reset */
-       mac->ops.reset_hw = e1000e_reset_hw_80003es2lan;
-       /* hw initialization */
-       mac->ops.init_hw = e1000e_init_hw_80003es2lan;
-       /* link setup */
-       mac->ops.setup_link = e1000e_setup_link;
-       /* physical interface link setup */
-       mac->ops.setup_physical_interface =
-               (hw->phy.media_type == e1000_media_type_copper)
-                       ? e1000e_setup_copper_link_80003es2lan
-                       : e1000e_setup_fiber_serdes_link;
-       /* check for link */
-       switch (hw->phy.media_type) {
-       case e1000_media_type_copper:
-               mac->ops.check_for_link = e1000e_check_for_copper_link;
-               break;
-       case e1000_media_type_fiber:
-               mac->ops.check_for_link = e1000e_check_for_fiber_link;
-               break;
-       case e1000_media_type_internal_serdes:
-               mac->ops.check_for_link = e1000e_check_for_serdes_link;
-               break;
-       default:
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-               break;
-       }
-       /* check management mode */
-#if 0
-       mac->ops.check_mng_mode = e1000e_check_mng_mode_generic;
-#endif
-       /* multicast address update */
-       mac->ops.update_mc_addr_list = e1000e_update_mc_addr_list_generic;
-       /* writing VFTA */
-       mac->ops.write_vfta = e1000e_write_vfta_generic;
-       /* clearing VFTA */
-       mac->ops.clear_vfta = e1000e_clear_vfta_generic;
-       /* setting MTA */
-       mac->ops.mta_set = e1000e_mta_set_generic;
-       /* read mac address */
-       mac->ops.read_mac_addr = e1000e_read_mac_addr_80003es2lan;
-       /* ID LED init */
-       mac->ops.id_led_init = e1000e_id_led_init;
-       /* blink LED */
-       mac->ops.blink_led = e1000e_blink_led;
-       /* setup LED */
-       mac->ops.setup_led = e1000e_setup_led_generic;
-       /* cleanup LED */
-       mac->ops.cleanup_led = e1000e_cleanup_led_generic;
-       /* turn on/off LED */
-       mac->ops.led_on = e1000e_led_on_generic;
-       mac->ops.led_off = e1000e_led_off_generic;
-       /* clear hardware counters */
-       mac->ops.clear_hw_cntrs = e1000e_clear_hw_cntrs_80003es2lan;
-       /* link info */
-       mac->ops.get_link_up_info = e1000e_get_link_up_info_80003es2lan;
-
-       /* set lan id for port to determine which phy lock to use */
-       hw->mac.ops.set_lan_id(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_init_function_pointers_80003es2lan - Init ESB2 func ptrs.
- *  @hw: pointer to the HW structure
- *
- *  Called to initialize all function pointers and parameters.
- **/
-void e1000e_init_function_pointers_80003es2lan(struct e1000_hw *hw)
-{
-       e1000e_init_mac_ops_generic(hw);
-       e1000e_init_nvm_ops_generic(hw);
-       hw->mac.ops.init_params = e1000e_init_mac_params_80003es2lan;
-       hw->nvm.ops.init_params = e1000e_init_nvm_params_80003es2lan;
-       hw->phy.ops.init_params = e1000e_init_phy_params_80003es2lan;
-}
-
-/**
- *  e1000e_acquire_phy_80003es2lan - Acquire rights to access PHY
- *  @hw: pointer to the HW structure
- *
- *  A wrapper to acquire access rights to the correct PHY.
- **/
-static s32 e1000e_acquire_phy_80003es2lan(struct e1000_hw *hw)
-{
-       u16 mask;
-
-       mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM;
-       return e1000e_acquire_swfw_sync_80003es2lan(hw, mask);
-}
-
-/**
- *  e1000e_release_phy_80003es2lan - Release rights to access PHY
- *  @hw: pointer to the HW structure
- *
- *  A wrapper to release access rights to the correct PHY.
- **/
-static void e1000e_release_phy_80003es2lan(struct e1000_hw *hw)
-{
-       u16 mask;
-
-       mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM;
-       e1000e_release_swfw_sync_80003es2lan(hw, mask);
-}
-
-/**
- *  e1000e_acquire_mac_csr_80003es2lan - Acquire rights to access Kumeran register
- *  @hw: pointer to the HW structure
- *
- *  Acquire the semaphore to access the Kumeran interface.
- *
- **/
-static s32 e1000e_acquire_mac_csr_80003es2lan(struct e1000_hw *hw)
-{
-       u16 mask;
-
-       mask = E1000_SWFW_CSR_SM;
-
-       return e1000e_acquire_swfw_sync_80003es2lan(hw, mask);
-}
-
-/**
- *  e1000e_release_mac_csr_80003es2lan - Release rights to access Kumeran Register
- *  @hw: pointer to the HW structure
- *
- *  Release the semaphore used to access the Kumeran interface
- **/
-static void e1000e_release_mac_csr_80003es2lan(struct e1000_hw *hw)
-{
-       u16 mask;
-
-       mask = E1000_SWFW_CSR_SM;
-
-       e1000e_release_swfw_sync_80003es2lan(hw, mask);
-}
-
-/**
- *  e1000e_acquire_nvm_80003es2lan - Acquire rights to access NVM
- *  @hw: pointer to the HW structure
- *
- *  Acquire the semaphore to access the EEPROM.
- **/
-static s32 e1000e_acquire_nvm_80003es2lan(struct e1000_hw *hw)
-{
-       s32 ret_val;
-
-       ret_val = e1000e_acquire_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000e_acquire_nvm(hw);
-
-       if (ret_val)
-               e1000e_release_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_release_nvm_80003es2lan - Relinquish rights to access NVM
- *  @hw: pointer to the HW structure
- *
- *  Release the semaphore used to access the EEPROM.
- **/
-static void e1000e_release_nvm_80003es2lan(struct e1000_hw *hw)
-{
-       e1000e_release_nvm(hw);
-       e1000e_release_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM);
-}
-
-/**
- *  e1000e_acquire_swfw_sync_80003es2lan - Acquire SW/FW semaphore
- *  @hw: pointer to the HW structure
- *  @mask: specifies which semaphore to acquire
- *
- *  Acquire the SW/FW semaphore to access the PHY or NVM.  The mask
- *  will also specify which port we're acquiring the lock for.
- **/
-static s32 e1000e_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
-{
-       u32 swfw_sync;
-       u32 swmask = mask;
-       u32 fwmask = mask << 16;
-       s32 ret_val = E1000_SUCCESS;
-       s32 i = 0, timeout = 50;
-
-       while (i < timeout) {
-               if (e1000e_get_hw_semaphore(hw)) {
-                       ret_val = -E1000_ERR_SWFW_SYNC;
-                       goto out;
-               }
-
-               swfw_sync = er32(SW_FW_SYNC);
-               if (!(swfw_sync & (fwmask | swmask)))
-                       break;
-
-               /*
-                * Firmware currently using resource (fwmask)
-                * or other software thread using resource (swmask)
-                */
-               e1000e_put_hw_semaphore(hw);
-               mdelay(5);
-               i++;
-       }
-
-       if (i == timeout) {
-               e_dbg("Driver can't access resource, SW_FW_SYNC timeout.\n");
-               ret_val = -E1000_ERR_SWFW_SYNC;
-               goto out;
-       }
-
-       swfw_sync |= swmask;
-       ew32(SW_FW_SYNC, swfw_sync);
-
-       e1000e_put_hw_semaphore(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_release_swfw_sync_80003es2lan - Release SW/FW semaphore
- *  @hw: pointer to the HW structure
- *  @mask: specifies which semaphore to acquire
- *
- *  Release the SW/FW semaphore used to access the PHY or NVM.  The mask
- *  will also specify which port we're releasing the lock for.
- **/
-static void e1000e_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
-{
-       u32 swfw_sync;
-
-       while (e1000e_get_hw_semaphore(hw) != E1000_SUCCESS)
-               ; /* Empty */
-
-       swfw_sync = er32(SW_FW_SYNC);
-       swfw_sync &= ~mask;
-       ew32(SW_FW_SYNC, swfw_sync);
-
-       e1000e_put_hw_semaphore(hw);
-}
-
-/**
- *  e1000e_read_phy_reg_gg82563_80003es2lan - Read GG82563 PHY register
- *  @hw: pointer to the HW structure
- *  @offset: offset of the register to read
- *  @data: pointer to the data returned from the operation
- *
- *  Read the GG82563 PHY register.
- **/
-static s32 e1000e_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
-                                                  u32 offset, u16 *data)
-{
-       s32 ret_val;
-       u32 page_select;
-       u16 temp;
-
-       ret_val = e1000e_acquire_phy_80003es2lan(hw);
-       if (ret_val)
-               goto out;
-
-       /* Select Configuration Page */
-       if ((offset & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG) {
-               page_select = GG82563_PHY_PAGE_SELECT;
-       } else {
-               /*
-                * Use Alternative Page Select register to access
-                * registers 30 and 31
-                */
-               page_select = GG82563_PHY_PAGE_SELECT_ALT;
-       }
-
-       temp = (u16)((u16)offset >> GG82563_PAGE_SHIFT);
-       ret_val = e1000e_write_phy_reg_mdic(hw, page_select, temp);
-       if (ret_val) {
-               e1000e_release_phy_80003es2lan(hw);
-               goto out;
-       }
-
-       if (hw->dev_spec._80003es2lan.mdic_wa_enable == true) {
-               /*
-                * The "ready" bit in the MDIC register may be incorrectly set
-                * before the device has completed the "Page Select" MDI
-                * transaction.  So we wait 200us after each MDI command...
-                */
-               udelay(200);
-
-               /* ...and verify the command was successful. */
-               ret_val = e1000e_read_phy_reg_mdic(hw, page_select, &temp);
-
-               if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
-                       ret_val = -E1000_ERR_PHY;
-                       e1000e_release_phy_80003es2lan(hw);
-                       goto out;
-               }
-
-               udelay(200);
-
-               ret_val = e1000e_read_phy_reg_mdic(hw,
-                                                 MAX_PHY_REG_ADDRESS & offset,
-                                                 data);
-
-               udelay(200);
-       } else
-               ret_val = e1000e_read_phy_reg_mdic(hw,
-                                                 MAX_PHY_REG_ADDRESS & offset,
-                                                 data);
-
-       e1000e_release_phy_80003es2lan(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_write_phy_reg_gg82563_80003es2lan - Write GG82563 PHY register
- *  @hw: pointer to the HW structure
- *  @offset: offset of the register to read
- *  @data: value to write to the register
- *
- *  Write to the GG82563 PHY register.
- **/
-static s32 e1000e_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
-                                                   u32 offset, u16 data)
-{
-       s32 ret_val;
-       u32 page_select;
-       u16 temp;
-
-       ret_val = e1000e_acquire_phy_80003es2lan(hw);
-       if (ret_val)
-               goto out;
-
-       /* Select Configuration Page */
-       if ((offset & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG) {
-               page_select = GG82563_PHY_PAGE_SELECT;
-       } else {
-               /*
-                * Use Alternative Page Select register to access
-                * registers 30 and 31
-                */
-               page_select = GG82563_PHY_PAGE_SELECT_ALT;
-       }
-
-       temp = (u16)((u16)offset >> GG82563_PAGE_SHIFT);
-       ret_val = e1000e_write_phy_reg_mdic(hw, page_select, temp);
-       if (ret_val) {
-               e1000e_release_phy_80003es2lan(hw);
-               goto out;
-       }
-
-       if (hw->dev_spec._80003es2lan.mdic_wa_enable == true) {
-               /*
-                * The "ready" bit in the MDIC register may be incorrectly set
-                * before the device has completed the "Page Select" MDI
-                * transaction.  So we wait 200us after each MDI command...
-                */
-               udelay(200);
-
-               /* ...and verify the command was successful. */
-               ret_val = e1000e_read_phy_reg_mdic(hw, page_select, &temp);
-
-               if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
-                       ret_val = -E1000_ERR_PHY;
-                       e1000e_release_phy_80003es2lan(hw);
-                       goto out;
-               }
-
-               udelay(200);
-
-               ret_val = e1000e_write_phy_reg_mdic(hw,
-                                                 MAX_PHY_REG_ADDRESS & offset,
-                                                 data);
-
-               udelay(200);
-       } else
-               ret_val = e1000e_write_phy_reg_mdic(hw,
-                                                 MAX_PHY_REG_ADDRESS & offset,
-               data);
-
-       e1000e_release_phy_80003es2lan(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_write_nvm_80003es2lan - Write to ESB2 NVM
- *  @hw: pointer to the HW structure
- *  @offset: offset of the register to read
- *  @words: number of words to write
- *  @data: buffer of data to write to the NVM
- *
- *  Write "words" of data to the ESB2 NVM.
- **/
-static s32 e1000e_write_nvm_80003es2lan(struct e1000_hw *hw, u16 offset,
-                            u16 words, u16 *data)
-{
-       return e1000e_write_nvm_spi(hw, offset, words, data);
-}
-
-/**
- *  e1000e_get_cfg_done_80003es2lan - Wait for configuration to complete
- *  @hw: pointer to the HW structure
- *
- *  Wait a specific amount of time for manageability processes to complete.
- *  This is a function pointer entry point called by the phy module.
- **/
-static s32 e1000e_get_cfg_done_80003es2lan(struct e1000_hw *hw)
-{
-       s32 timeout = PHY_CFG_TIMEOUT;
-       s32 ret_val = E1000_SUCCESS;
-       u32 mask = E1000_NVM_CFG_DONE_PORT_0;
-
-       if (hw->bus.func == 1)
-               mask = E1000_NVM_CFG_DONE_PORT_1;
-
-       while (timeout) {
-               if (er32(EEMNGCTL) & mask)
-                       break;
-               msleep(1);
-               timeout--;
-       }
-       if (!timeout) {
-               e_dbg("MNG configuration cycle has not completed.\n");
-               ret_val = -E1000_ERR_RESET;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-#if 0
-/**
- *  e1000e_phy_force_speed_duplex_80003es2lan - Force PHY speed and duplex
- *  @hw: pointer to the HW structure
- *
- *  Force the speed and duplex settings onto the PHY.  This is a
- *  function pointer entry point called by the phy module.
- **/
-static s32 e1000e_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_data;
-       bool link;
-
-       if (!(hw->phy.ops.read_reg))
-               goto out;
-
-       /*
-        * Clear Auto-Crossover to force MDI manually.  M88E1000 requires MDI
-        * forced whenever speed and duplex are forced.
-        */
-       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data &= ~GG82563_PSCR_CROSSOVER_MODE_AUTO;
-       ret_val = e1e_wphy(hw, GG82563_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       e_dbg("GG82563 PSCR: %X\n", phy_data);
-
-       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       e1000e_phy_force_speed_duplex_setup(hw, &phy_data);
-
-       /* Reset the phy to commit changes. */
-       phy_data |= MII_CR_RESET;
-
-       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data);
-       if (ret_val)
-               goto out;
-
-       udelay(1);
-
-       if (hw->phy.autoneg_wait_to_complete) {
-               e_dbg("Waiting for forced speed/duplex link "
-                        "on GG82563 phy.\n");
-
-               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link) {
-                       /*
-                        * We didn't get link.
-                        * Reset the DSP and cross our fingers.
-                        */
-                       ret_val = e1000e_phy_reset_dsp(hw);
-                       if (ret_val)
-                               goto out;
-               }
-
-               /* Try once more */
-               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1e_rphy(hw, GG82563_PHY_MAC_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Resetting the phy means we need to verify the TX_CLK corresponds
-        * to the link speed.  10Mbps -> 2.5MHz, else 25MHz.
-        */
-       phy_data &= ~GG82563_MSCR_TX_CLK_MASK;
-       if (hw->mac.forced_speed_duplex & E1000_ALL_10_SPEED)
-               phy_data |= GG82563_MSCR_TX_CLK_10MBPS_2_5;
-       else
-               phy_data |= GG82563_MSCR_TX_CLK_100MBPS_25;
-
-       /*
-        * In addition, we must re-enable CRS on Tx for both half and full
-        * duplex.
-        */
-       phy_data |= GG82563_MSCR_ASSERT_CRS_ON_TX;
-       ret_val = e1e_wphy(hw, GG82563_PHY_MAC_SPEC_CTRL, phy_data);
-
-out:
-       return ret_val;
-}
-#endif
-
-#if 0
-/**
- *  e1000e_get_cable_length_80003es2lan - Set approximate cable length
- *  @hw: pointer to the HW structure
- *
- *  Find the approximate cable length as measured by the GG82563 PHY.
- *  This is a function pointer entry point called by the phy module.
- **/
-static s32 e1000e_get_cable_length_80003es2lan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_data, index;
-
-       if (!(hw->phy.ops.read_reg))
-               goto out;
-
-       ret_val = e1e_rphy(hw, GG82563_PHY_DSP_DISTANCE, &phy_data);
-       if (ret_val)
-               goto out;
-
-       index = phy_data & GG82563_DSPD_CABLE_LENGTH;
-
-       if (index >= GG82563_CABLE_LENGTH_TABLE_SIZE - 5) {
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-       phy->min_cable_length = e1000_gg82563_cable_length_table[index];
-       phy->max_cable_length = e1000_gg82563_cable_length_table[index + 5];
-
-       phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
-
-out:
-       return ret_val;
-}
-#endif
-
-/**
- *  e1000e_get_link_up_info_80003es2lan - Report speed and duplex
- *  @hw: pointer to the HW structure
- *  @speed: pointer to speed buffer
- *  @duplex: pointer to duplex buffer
- *
- *  Retrieve the current speed and duplex configuration.
- **/
-static s32 e1000e_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed,
-                                              u16 *duplex)
-{
-       s32 ret_val;
-
-       if (hw->phy.media_type == e1000_media_type_copper) {
-               ret_val = e1000e_get_speed_and_duplex_copper(hw,
-                                                                   speed,
-                                                                   duplex);
-               hw->phy.ops.cfg_on_link_up(hw);
-       } else {
-               ret_val = e1000e_get_speed_and_duplex_fiber_serdes(hw,
-                                                                 speed,
-                                                                 duplex);
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000e_reset_hw_80003es2lan - Reset the ESB2 controller
- *  @hw: pointer to the HW structure
- *
- *  Perform a global reset to the ESB2 controller.
- **/
-static s32 e1000e_reset_hw_80003es2lan(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val;
-
-       /*
-        * Prevent the PCI-E bus from sticking if there is no TLP connection
-        * on the last TLP read/write transaction when MAC is reset.
-        */
-       ret_val = e1000e_disable_pcie_master(hw);
-       if (ret_val)
-               e_dbg("PCI-E Master disable polling has failed.\n");
-
-       e_dbg("Masking off all interrupts\n");
-       ew32(IMC, 0xffffffff);
-
-       ew32(RCTL, 0);
-       ew32(TCTL, E1000_TCTL_PSP);
-       e1e_flush();
-
-       msleep(10);
-
-       ctrl = er32(CTRL);
-
-       ret_val = e1000e_acquire_phy_80003es2lan(hw);
-       e_dbg("Issuing a global reset to MAC\n");
-       ew32(CTRL, ctrl | E1000_CTRL_RST);
-       e1000e_release_phy_80003es2lan(hw);
-
-       ret_val = e1000e_get_auto_rd_done(hw);
-       if (ret_val)
-               /* We don't want to continue accessing MAC registers. */
-               goto out;
-
-       /* Clear any pending interrupt events. */
-       ew32(IMC, 0xffffffff);
-       er32(ICR);
-
-       ret_val = e1000e_check_alt_mac_addr_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_init_hw_80003es2lan - Initialize the ESB2 controller
- *  @hw: pointer to the HW structure
- *
- *  Initialize the hw bits, LED, VFTA, MTA, link and hw counters.
- **/
-static s32 e1000e_init_hw_80003es2lan(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 reg_data;
-       s32 ret_val;
-       u16 i;
-
-       e1000e_initialize_hw_bits_80003es2lan(hw);
-
-       /* Initialize identification LED */
-       ret_val = mac->ops.id_led_init(hw);
-       if (ret_val) {
-               e_dbg("Error initializing identification LED\n");
-               /* This is not fatal and we should not stop init due to this */
-       }
-
-       /* Disabling VLAN filtering */
-       e_dbg("Initializing the IEEE VLAN\n");
-       e1000e_clear_vfta(hw);
-
-       /* Setup the receive address. */
-       e1000e_init_rx_addrs(hw, mac->rar_entry_count);
-
-       /* Zero out the Multicast HASH table */
-       e_dbg("Zeroing the MTA\n");
-       for (i = 0; i < mac->mta_reg_count; i++)
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
-
-       /* Setup link and flow control */
-       ret_val = mac->ops.setup_link(hw);
-
-       /* Set the transmit descriptor write-back policy */
-       reg_data = er32(TXDCTL(0));
-       reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-                  E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
-       ew32(TXDCTL(0), reg_data);
-
-       /* ...for both queues. */
-       reg_data = er32(TXDCTL(1));
-       reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-                  E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
-       ew32(TXDCTL(1), reg_data);
-
-       /* Enable retransmit on late collisions */
-       reg_data = er32(TCTL);
-       reg_data |= E1000_TCTL_RTLC;
-       ew32(TCTL, reg_data);
-
-       /* Configure Gigabit Carry Extend Padding */
-       reg_data = er32(TCTL_EXT);
-       reg_data &= ~E1000_TCTL_EXT_GCEX_MASK;
-       reg_data |= DEFAULT_TCTL_EXT_GCEX_80003ES2LAN;
-       ew32(TCTL_EXT, reg_data);
-
-       /* Configure Transmit Inter-Packet Gap */
-       reg_data = er32(TIPG);
-       reg_data &= ~E1000_TIPG_IPGT_MASK;
-       reg_data |= DEFAULT_TIPG_IPGT_1000_80003ES2LAN;
-       ew32(TIPG, reg_data);
-
-       reg_data = E1000_READ_REG_ARRAY(hw, E1000_FFLT, 0x0001);
-       reg_data &= ~0x00100000;
-       E1000_WRITE_REG_ARRAY(hw, E1000_FFLT, 0x0001, reg_data);
-
-       /* default to true to enable the MDIC W/A */
-       hw->dev_spec._80003es2lan.mdic_wa_enable = true;
-
-       ret_val = e1000e_read_kmrn_reg_80003es2lan(hw,
-                                     E1000_KMRNCTRLSTA_OFFSET >>
-                                     E1000_KMRNCTRLSTA_OFFSET_SHIFT,
-                                     &i);
-       if (!ret_val) {
-               if ((i & E1000_KMRNCTRLSTA_OPMODE_MASK) ==
-                    E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO)
-                       hw->dev_spec._80003es2lan.mdic_wa_enable = false;
-       }
-
-       /*
-        * Clear all of the statistics registers (clear on read).  It is
-        * important that we do this after we have tried to establish link
-        * because the symbol error count will increment wildly if there
-        * is no link.
-        */
-       e1000e_clear_hw_cntrs_80003es2lan(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000e_initialize_hw_bits_80003es2lan - Init hw bits of ESB2
- *  @hw: pointer to the HW structure
- *
- *  Initializes required hardware-dependent bits needed for normal operation.
- **/
-static void e1000e_initialize_hw_bits_80003es2lan(struct e1000_hw *hw)
-{
-       u32 reg;
-
-       /* Transmit Descriptor Control 0 */
-       reg = er32(TXDCTL(0));
-       reg |= (1 << 22);
-       ew32(TXDCTL(0), reg);
-
-       /* Transmit Descriptor Control 1 */
-       reg = er32(TXDCTL(1));
-       reg |= (1 << 22);
-       ew32(TXDCTL(1), reg);
-
-       /* Transmit Arbitration Control 0 */
-       reg = er32(TARC(0));
-       reg &= ~(0xF << 27); /* 30:27 */
-       if (hw->phy.media_type != e1000_media_type_copper)
-               reg &= ~(1 << 20);
-       ew32(TARC(0), reg);
-
-       /* Transmit Arbitration Control 1 */
-       reg = er32(TARC(1));
-       if (er32(TCTL) & E1000_TCTL_MULR)
-               reg &= ~(1 << 28);
-       else
-               reg |= (1 << 28);
-       ew32(TARC(1), reg);
-
-       return;
-}
-
-/**
- *  e1000e_copper_link_setup_gg82563_80003es2lan - Configure GG82563 Link
- *  @hw: pointer to the HW structure
- *
- *  Setup some GG82563 PHY registers for obtaining link
- **/
-static s32 e1000e_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u32 ctrl_ext;
-       u16 data;
-
-       if (!phy->reset_disable) {
-               ret_val = e1e_rphy(hw, GG82563_PHY_MAC_SPEC_CTRL,
-                                            &data);
-               if (ret_val)
-                       goto out;
-
-               data |= GG82563_MSCR_ASSERT_CRS_ON_TX;
-               /* Use 25MHz for both link down and 1000Base-T for Tx clock. */
-               data |= GG82563_MSCR_TX_CLK_1000MBPS_25;
-
-               ret_val = e1e_wphy(hw, GG82563_PHY_MAC_SPEC_CTRL,
-                                             data);
-               if (ret_val)
-                       goto out;
-
-               /*
-                * Options:
-                *   MDI/MDI-X = 0 (default)
-                *   0 - Auto for all speeds
-                *   1 - MDI mode
-                *   2 - MDI-X mode
-                *   3 - Auto for 1000Base-T only (MDI-X for 10/100Base-T modes)
-                */
-               ret_val = e1e_rphy(hw, GG82563_PHY_SPEC_CTRL, &data);
-               if (ret_val)
-                       goto out;
-
-               data &= ~GG82563_PSCR_CROSSOVER_MODE_MASK;
-
-               switch (phy->mdix) {
-               case 1:
-                       data |= GG82563_PSCR_CROSSOVER_MODE_MDI;
-                       break;
-               case 2:
-                       data |= GG82563_PSCR_CROSSOVER_MODE_MDIX;
-                       break;
-               case 0:
-               default:
-                       data |= GG82563_PSCR_CROSSOVER_MODE_AUTO;
-                       break;
-               }
-
-               /*
-                * Options:
-                *   disable_polarity_correction = 0 (default)
-                *       Automatic Correction for Reversed Cable Polarity
-                *   0 - Disabled
-                *   1 - Enabled
-                */
-               data &= ~GG82563_PSCR_POLARITY_REVERSAL_DISABLE;
-               if (phy->disable_polarity_correction)
-                       data |= GG82563_PSCR_POLARITY_REVERSAL_DISABLE;
-
-               ret_val = e1e_wphy(hw, GG82563_PHY_SPEC_CTRL, data);
-               if (ret_val)
-                       goto out;
-
-               /* SW Reset the PHY so all changes take effect */
-               ret_val = e1000e_commit_phy(hw);
-               if (ret_val) {
-                       e_dbg("Error Resetting the PHY\n");
-                       goto out;
-               }
-
-       }
-
-       /* Bypass Rx and Tx FIFO's */
-       ret_val = e1000e_write_kmrn_reg_80003es2lan(hw,
-                                       E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL,
-                                       E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS |
-                                       E1000_KMRNCTRLSTA_FIFO_CTRL_TX_BYPASS);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000e_read_kmrn_reg_80003es2lan(hw,
-                                     E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE,
-                                     &data);
-       if (ret_val)
-               goto out;
-       data |= E1000_KMRNCTRLSTA_OPMODE_E_IDLE;
-       ret_val = e1000e_write_kmrn_reg_80003es2lan(hw,
-                                      E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE,
-                                      data);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1e_rphy(hw, GG82563_PHY_SPEC_CTRL_2, &data);
-       if (ret_val)
-               goto out;
-
-       data &= ~GG82563_PSCR2_REVERSE_AUTO_NEG;
-       ret_val = e1e_wphy(hw, GG82563_PHY_SPEC_CTRL_2, data);
-       if (ret_val)
-               goto out;
-
-       ctrl_ext = er32(CTRL_EXT);
-       ctrl_ext &= ~(E1000_CTRL_EXT_LINK_MODE_MASK);
-       ew32(CTRL_EXT, ctrl_ext);
-
-       ret_val = e1e_rphy(hw, GG82563_PHY_PWR_MGMT_CTRL, &data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Do not init these registers when the HW is in IAMT mode, since the
-        * firmware will have already initialized them.  We only initialize
-        * them if the HW is not in IAMT mode.
-        */
-       if (!(hw->mac.ops.check_mng_mode(hw))) {
-               /* Enable Electrical Idle on the PHY */
-               data |= GG82563_PMCR_ENABLE_ELECTRICAL_IDLE;
-               ret_val = e1e_wphy(hw, GG82563_PHY_PWR_MGMT_CTRL,
-                                               data);
-               if (ret_val)
-                       goto out;
-
-               ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL,
-                                              &data);
-               if (ret_val)
-                       goto out;
-
-               data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
-               ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL,
-                                               data);
-               if (ret_val)
-                       goto out;
-       }
-
-       /*
-        * Workaround: Disable padding in Kumeran interface in the MAC
-        * and in the PHY to avoid CRC errors.
-        */
-       ret_val = e1e_rphy(hw, GG82563_PHY_INBAND_CTRL, &data);
-       if (ret_val)
-               goto out;
-
-       data |= GG82563_ICR_DIS_PADDING;
-       ret_val = e1e_wphy(hw, GG82563_PHY_INBAND_CTRL, data);
-       if (ret_val)
-               goto out;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_setup_copper_link_80003es2lan - Setup Copper Link for ESB2
- *  @hw: pointer to the HW structure
- *
- *  Essentially a wrapper for setting up all things "copper" related.
- *  This is a function pointer entry point called by the mac module.
- **/
-static s32 e1000e_setup_copper_link_80003es2lan(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val;
-       u16 reg_data;
-
-       ctrl = er32(CTRL);
-       ctrl |= E1000_CTRL_SLU;
-       ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       ew32(CTRL, ctrl);
-
-       /*
-        * Set the mac to wait the maximum time between each
-        * iteration and increase the max iterations when
-        * polling the phy; this fixes erroneous timeouts at 10Mbps.
-        */
-       ret_val = e1000e_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 4),
-                                                  0xFFFF);
-       if (ret_val)
-               goto out;
-       ret_val = e1000e_read_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),
-                                                 &reg_data);
-       if (ret_val)
-               goto out;
-       reg_data |= 0x3F;
-       ret_val = e1000e_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),
-                                                  reg_data);
-       if (ret_val)
-               goto out;
-       ret_val = e1000e_read_kmrn_reg_80003es2lan(hw,
-                                     E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
-                                     &reg_data);
-       if (ret_val)
-               goto out;
-       reg_data |= E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING;
-       ret_val = e1000e_write_kmrn_reg_80003es2lan(hw,
-                                      E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
-                                      reg_data);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000e_copper_link_setup_gg82563_80003es2lan(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000e_setup_copper_link(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_cfg_on_link_up_80003es2lan - es2 link configuration after link-up
- *  @hw: pointer to the HW structure
- *  @duplex: current duplex setting
- *
- *  Configure the KMRN interface by applying last minute quirks for
- *  10/100 operation.
- **/
-static s32 e1000e_cfg_on_link_up_80003es2lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 speed;
-       u16 duplex;
-
-       if (hw->phy.media_type == e1000_media_type_copper) {
-               ret_val = e1000e_get_speed_and_duplex_copper(hw,
-                                                                   &speed,
-                                                                   &duplex);
-               if (ret_val)
-                       goto out;
-
-               if (speed == SPEED_1000)
-                       ret_val = e1000e_cfg_kmrn_1000_80003es2lan(hw);
-               else
-                       ret_val = e1000e_cfg_kmrn_10_100_80003es2lan(hw, duplex);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_cfg_kmrn_10_100_80003es2lan - Apply "quirks" for 10/100 operation
- *  @hw: pointer to the HW structure
- *  @duplex: current duplex setting
- *
- *  Configure the KMRN interface by applying last minute quirks for
- *  10/100 operation.
- **/
-static s32 e1000e_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u32 tipg;
-       u32 i = 0;
-       u16 reg_data, reg_data2;
-
-       reg_data = E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT;
-       ret_val = e1000e_write_kmrn_reg_80003es2lan(hw,
-                                      E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
-                                      reg_data);
-       if (ret_val)
-               goto out;
-
-       /* Configure Transmit Inter-Packet Gap */
-       tipg = er32(TIPG);
-       tipg &= ~E1000_TIPG_IPGT_MASK;
-       tipg |= DEFAULT_TIPG_IPGT_10_100_80003ES2LAN;
-       ew32(TIPG, tipg);
-
-
-       do {
-               ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL,
-                                              &reg_data);
-               if (ret_val)
-                       goto out;
-
-               ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL,
-                                              &reg_data2);
-               if (ret_val)
-                       goto out;
-               i++;
-       } while ((reg_data != reg_data2) && (i < GG82563_MAX_KMRN_RETRY));
-
-       if (duplex == HALF_DUPLEX)
-               reg_data |= GG82563_KMCR_PASS_FALSE_CARRIER;
-       else
-               reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
-
-       ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_cfg_kmrn_1000_80003es2lan - Apply "quirks" for gigabit operation
- *  @hw: pointer to the HW structure
- *
- *  Configure the KMRN interface by applying last minute quirks for
- *  gigabit operation.
- **/
-static s32 e1000e_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 reg_data, reg_data2;
-       u32 tipg;
-       u32 i = 0;
-
-       reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT;
-       ret_val = e1000e_write_kmrn_reg_80003es2lan(hw,
-                                      E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
-                                      reg_data);
-       if (ret_val)
-               goto out;
-
-       /* Configure Transmit Inter-Packet Gap */
-       tipg = er32(TIPG);
-       tipg &= ~E1000_TIPG_IPGT_MASK;
-       tipg |= DEFAULT_TIPG_IPGT_1000_80003ES2LAN;
-       ew32(TIPG, tipg);
-
-
-       do {
-               ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL,
-                                              &reg_data);
-               if (ret_val)
-                       goto out;
-
-               ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL,
-                                              &reg_data2);
-               if (ret_val)
-                       goto out;
-               i++;
-       } while ((reg_data != reg_data2) && (i < GG82563_MAX_KMRN_RETRY));
-
-       reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
-       ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_kmrn_reg_80003es2lan - Read kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquire semaphore, then read the PHY register at offset
- *  using the kumeran interface.  The information retrieved is stored in data.
- *  Release the semaphore before exiting.
- **/
-static s32 e1000e_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
-                                           u16 *data)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = E1000_SUCCESS;
-
-       ret_val = e1000e_acquire_mac_csr_80003es2lan(hw);
-       if (ret_val)
-               goto out;
-
-       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
-       ew32(KMRNCTRLSTA, kmrnctrlsta);
-
-       udelay(2);
-
-       kmrnctrlsta = er32(KMRNCTRLSTA);
-       *data = (u16)kmrnctrlsta;
-
-       e1000e_release_mac_csr_80003es2lan(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_write_kmrn_reg_80003es2lan - Write kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquire semaphore, then write the data to PHY register
- *  at the offset using the kumeran interface.  Release semaphore
- *  before exiting.
- **/
-static s32 e1000e_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
-                                            u16 data)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = E1000_SUCCESS;
-
-       ret_val = e1000e_acquire_mac_csr_80003es2lan(hw);
-       if (ret_val)
-               goto out;
-
-       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | data;
-       ew32(KMRNCTRLSTA, kmrnctrlsta);
-
-       udelay(2);
-
-       e1000e_release_mac_csr_80003es2lan(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_mac_addr_80003es2lan - Read device MAC address
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000e_read_mac_addr_80003es2lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       /*
-        * If there's an alternate MAC address place it in RAR0
-        * so that it will override the Si installed default perm
-        * address.
-        */
-       ret_val = e1000e_check_alt_mac_addr_generic(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000e_read_mac_addr_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- * e1000e_power_down_phy_copper_80003es2lan - Remove link during PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, remove the link.
- **/
-static void e1000e_power_down_phy_copper_80003es2lan(struct e1000_hw *hw)
-{
-       /* If the management interface is not enabled, then power down */
-       if (!(hw->mac.ops.check_mng_mode(hw) ||
-             e1000e_check_reset_block(hw)))
-             e1000e_power_down_phy_copper(hw);
-
-       return;
-}
-
-/**
- *  e1000e_clear_hw_cntrs_80003es2lan - Clear device specific hardware counters
- *  @hw: pointer to the HW structure
- *
- *  Clears the hardware counters by reading the counter registers.
- **/
-static void e1000e_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw __unused)
-{
-#if 0
-       e1000e_clear_hw_cntrs_base(hw);
-
-       er32(PRC64);
-       er32(PRC127);
-       er32(PRC255);
-       er32(PRC511);
-       er32(PRC1023);
-       er32(PRC1522);
-       er32(PTC64);
-       er32(PTC127);
-       er32(PTC255);
-       er32(PTC511);
-       er32(PTC1023);
-       er32(PTC1522);
-
-       er32(ALGNERRC);
-       er32(RXERRC);
-       er32(TNCRS);
-       er32(CEXTERR);
-       er32(TSCTC);
-       er32(TSCTFC);
-
-       er32(MGTPRC);
-       er32(MGTPDC);
-       er32(MGTPTC);
-
-       er32(IAC);
-       er32(ICRXOC);
-
-       er32(ICRXPTC);
-       er32(ICRXATC);
-       er32(ICTXPTC);
-       er32(ICTXATC);
-       er32(ICTXQEC);
-       er32(ICTXQMTC);
-       er32(ICRXDMTC);
-#endif
-}
-
-static struct pci_device_id e1000e_80003es2lan_nics[] = {
-     PCI_ROM(0x8086, 0x1096, "E1000_DEV_ID_80003ES2LAN_COPPER_DPT", "E1000_DEV_ID_80003ES2LAN_COPPER_DPT", board_80003es2lan),
-     PCI_ROM(0x8086, 0x10BA, "E1000_DEV_ID_80003ES2LAN_COPPER_SPT", "E1000_DEV_ID_80003ES2LAN_COPPER_SPT", board_80003es2lan),
-     PCI_ROM(0x8086, 0x1098, "E1000_DEV_ID_80003ES2LAN_SERDES_DPT", "E1000_DEV_ID_80003ES2LAN_SERDES_DPT", board_80003es2lan),
-     PCI_ROM(0x8086, 0x10BB, "E1000_DEV_ID_80003ES2LAN_SERDES_SPT", "E1000_DEV_ID_80003ES2LAN_SERDES_SPT", board_80003es2lan),
-};
-
-struct pci_driver e1000e_80003es2lan_driver __pci_driver = {
-       .ids = e1000e_80003es2lan_nics,
-       .id_count = (sizeof (e1000e_80003es2lan_nics) / sizeof (e1000e_80003es2lan_nics[0])),
-       .probe = e1000e_probe,
-       .remove = e1000e_remove,
-};
diff --git a/src/drivers/net/e1000e/e1000e_80003es2lan.h b/src/drivers/net/e1000e/e1000e_80003es2lan.h
deleted file mode 100644 (file)
index 93430a1..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000E_80003ES2LAN_H_
-#define _E1000E_80003ES2LAN_H_
-
-#define E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL       0x00
-#define E1000_KMRNCTRLSTA_OFFSET_INB_CTRL        0x02
-#define E1000_KMRNCTRLSTA_OFFSET_HD_CTRL         0x10
-#define E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE  0x1F
-
-#define E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS    0x0008
-#define E1000_KMRNCTRLSTA_FIFO_CTRL_TX_BYPASS    0x0800
-#define E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING   0x0010
-
-#define E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT 0x0004
-#define E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT   0x0000
-#define E1000_KMRNCTRLSTA_OPMODE_E_IDLE          0x2000
-
-#define E1000_KMRNCTRLSTA_OPMODE_MASK            0x000C
-#define E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO     0x0004
-
-#define E1000_TCTL_EXT_GCEX_MASK 0x000FFC00 /* Gigabit Carry Extend Padding */
-#define DEFAULT_TCTL_EXT_GCEX_80003ES2LAN        0x00010000
-
-#define DEFAULT_TIPG_IPGT_1000_80003ES2LAN       0x8
-#define DEFAULT_TIPG_IPGT_10_100_80003ES2LAN     0x9
-
-/* GG82563 PHY Specific Status Register (Page 0, Register 16 */
-#define GG82563_PSCR_POLARITY_REVERSAL_DISABLE  0x0002 /* 1=Reversal Disabled */
-#define GG82563_PSCR_CROSSOVER_MODE_MASK        0x0060
-#define GG82563_PSCR_CROSSOVER_MODE_MDI         0x0000 /* 00=Manual MDI */
-#define GG82563_PSCR_CROSSOVER_MODE_MDIX        0x0020 /* 01=Manual MDIX */
-#define GG82563_PSCR_CROSSOVER_MODE_AUTO        0x0060 /* 11=Auto crossover */
-
-/* PHY Specific Control Register 2 (Page 0, Register 26) */
-#define GG82563_PSCR2_REVERSE_AUTO_NEG          0x2000
-                                               /* 1=Reverse Auto-Negotiation */
-
-/* MAC Specific Control Register (Page 2, Register 21) */
-/* Tx clock speed for Link Down and 1000BASE-T for the following speeds */
-#define GG82563_MSCR_TX_CLK_MASK                0x0007
-#define GG82563_MSCR_TX_CLK_10MBPS_2_5          0x0004
-#define GG82563_MSCR_TX_CLK_100MBPS_25          0x0005
-#define GG82563_MSCR_TX_CLK_1000MBPS_2_5        0x0006
-#define GG82563_MSCR_TX_CLK_1000MBPS_25         0x0007
-
-#define GG82563_MSCR_ASSERT_CRS_ON_TX           0x0010 /* 1=Assert */
-
-/* DSP Distance Register (Page 5, Register 26) */
-/*
- * 0 = <50M
- * 1 = 50-80M
- * 2 = 80-100M
- * 3 = 110-140M
- * 4 = >140M
- */
-#define GG82563_DSPD_CABLE_LENGTH               0x0007
-
-/* Kumeran Mode Control Register (Page 193, Register 16) */
-#define GG82563_KMCR_PASS_FALSE_CARRIER         0x0800
-
-/* Max number of times Kumeran read/write should be validated */
-#define GG82563_MAX_KMRN_RETRY                  0x5
-
-/* Power Management Control Register (Page 193, Register 20) */
-#define GG82563_PMCR_ENABLE_ELECTRICAL_IDLE     0x0001
-                                          /* 1=Enable SERDES Electrical Idle */
-
-/* In-Band Control Register (Page 194, Register 18) */
-#define GG82563_ICR_DIS_PADDING                 0x0010 /* Disable Padding */
-
-#endif
diff --git a/src/drivers/net/e1000e/e1000e_82571.c b/src/drivers/net/e1000e/e1000e_82571.c
deleted file mode 100644 (file)
index a061d6d..0000000
+++ /dev/null
@@ -1,1818 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/*
- * 82571EB Gigabit Ethernet Controller
- * 82571EB Gigabit Ethernet Controller (Copper)
- * 82571EB Gigabit Ethernet Controller (Fiber)
- * 82571EB Dual Port Gigabit Mezzanine Adapter
- * 82571EB Quad Port Gigabit Mezzanine Adapter
- * 82571PT Gigabit PT Quad Port Server ExpressModule
- * 82572EI Gigabit Ethernet Controller (Copper)
- * 82572EI Gigabit Ethernet Controller (Fiber)
- * 82572EI Gigabit Ethernet Controller
- * 82573V Gigabit Ethernet Controller (Copper)
- * 82573E Gigabit Ethernet Controller (Copper)
- * 82573L Gigabit Ethernet Controller
- * 82574L Gigabit Network Connection
- * 82574L Gigabit Network Connection
- * 82583V Gigabit Network Connection
- */
-
-#include "e1000e.h"
-
-static s32  e1000e_init_phy_params_82571(struct e1000_hw *hw);
-static s32  e1000e_init_nvm_params_82571(struct e1000_hw *hw);
-static s32  e1000e_init_mac_params_82571(struct e1000_hw *hw);
-static s32  e1000e_acquire_nvm_82571(struct e1000_hw *hw);
-static void e1000e_release_nvm_82571(struct e1000_hw *hw);
-static s32  e1000e_write_nvm_82571(struct e1000_hw *hw, u16 offset,
-                                  u16 words, u16 *data);
-static s32  e1000e_update_nvm_checksum_82571(struct e1000_hw *hw);
-static s32  e1000e_validate_nvm_checksum_82571(struct e1000_hw *hw);
-static s32  e1000e_get_cfg_done_82571(struct e1000_hw *hw);
-static s32  e1000e_set_d0_lplu_state_82571(struct e1000_hw *hw,
-                                          bool active);
-static s32  e1000e_reset_hw_82571(struct e1000_hw *hw);
-static s32  e1000e_init_hw_82571(struct e1000_hw *hw);
-static void e1000e_clear_vfta_82571(struct e1000_hw *hw);
-#if 0
-static bool e1000e_check_mng_mode_82574(struct e1000_hw *hw);
-#endif
-static s32  e1000e_led_on_82574(struct e1000_hw *hw);
-static s32  e1000e_setup_link_82571(struct e1000_hw *hw);
-static s32  e1000e_setup_copper_link_82571(struct e1000_hw *hw);
-static s32  e1000e_check_for_serdes_link_82571(struct e1000_hw *hw);
-static s32  e1000e_setup_fiber_serdes_link_82571(struct e1000_hw *hw);
-static s32  e1000e_valid_led_default_82571(struct e1000_hw *hw, u16 *data);
-static void e1000e_clear_hw_cntrs_82571(struct e1000_hw *hw);
-static s32  e1000e_get_hw_semaphore_82571(struct e1000_hw *hw);
-static s32  e1000e_fix_nvm_checksum_82571(struct e1000_hw *hw);
-static s32  e1000e_get_phy_id_82571(struct e1000_hw *hw);
-static void e1000e_put_hw_semaphore_82571(struct e1000_hw *hw);
-static void e1000e_initialize_hw_bits_82571(struct e1000_hw *hw);
-static s32  e1000e_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
-                                       u16 words, u16 *data);
-static s32  e1000e_read_mac_addr_82571(struct e1000_hw *hw);
-static void e1000e_power_down_phy_copper_82571(struct e1000_hw *hw);
-
-/**
- *  e1000e_init_phy_params_82571 - Init PHY func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000e_init_phy_params_82571(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->phy.media_type != e1000_media_type_copper) {
-               phy->type = e1000_phy_none;
-               goto out;
-       }
-
-       phy->addr                        = 1;
-       phy->autoneg_mask                = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-       phy->reset_delay_us              = 100;
-
-       phy->ops.acquire                 = e1000e_get_hw_semaphore_82571;
-       phy->ops.check_polarity          = e1000e_check_polarity_igp;
-       phy->ops.check_reset_block       = e1000e_check_reset_block_generic;
-       phy->ops.release                 = e1000e_put_hw_semaphore_82571;
-       phy->ops.reset                   = e1000e_phy_hw_reset_generic;
-       phy->ops.set_d0_lplu_state       = e1000e_set_d0_lplu_state_82571;
-       phy->ops.set_d3_lplu_state       = e1000e_set_d3_lplu_state;
-       phy->ops.power_up                = e1000e_power_up_phy_copper;
-       phy->ops.power_down              = e1000e_power_down_phy_copper_82571;
-
-       switch (hw->mac.type) {
-       case e1000_82571:
-       case e1000_82572:
-               phy->type                   = e1000_phy_igp_2;
-               phy->ops.get_cfg_done       = e1000e_get_cfg_done_82571;
-               phy->ops.get_info           = e1000e_get_phy_info_igp;
-#if 0
-               phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_igp;
-#endif
-#if 0
-               phy->ops.get_cable_length   = e1000e_get_cable_length_igp_2;
-#endif
-               phy->ops.read_reg           = e1000e_read_phy_reg_igp;
-               phy->ops.write_reg          = e1000e_write_phy_reg_igp;
-
-               /* This uses above function pointers */
-               ret_val = e1000e_get_phy_id_82571(hw);
-
-               /* Verify PHY ID */
-               if (phy->id != IGP01E1000_I_PHY_ID) {
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-               }
-               break;
-       case e1000_82573:
-               phy->type                   = e1000_phy_m88;
-               phy->ops.get_cfg_done       = e1000e_get_cfg_done;
-               phy->ops.get_info           = e1000e_get_phy_info_m88;
-               phy->ops.commit             = e1000e_phy_sw_reset;
-#if 0
-               phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_m88;
-#endif
-#if 0
-               phy->ops.get_cable_length   = e1000e_get_cable_length_m88;
-#endif
-               phy->ops.read_reg           = e1000e_read_phy_reg_m88;
-               phy->ops.write_reg          = e1000e_write_phy_reg_m88;
-
-               /* This uses above function pointers */
-               ret_val = e1000e_get_phy_id_82571(hw);
-
-               /* Verify PHY ID */
-               if (phy->id != M88E1111_I_PHY_ID) {
-                       ret_val = -E1000_ERR_PHY;
-                       e_dbg("PHY ID unknown: type = 0x%08x\n", phy->id);
-                       goto out;
-               }
-               break;
-       case e1000_82583:
-       case e1000_82574:
-               phy->type                   = e1000_phy_bm;
-               phy->ops.get_cfg_done       = e1000e_get_cfg_done;
-               phy->ops.get_info           = e1000e_get_phy_info_m88;
-               phy->ops.commit             = e1000e_phy_sw_reset;
-#if 0
-               phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_m88;
-#endif
-#if 0
-               phy->ops.get_cable_length   = e1000e_get_cable_length_m88;
-#endif
-               phy->ops.read_reg           = e1000e_read_phy_reg_bm2;
-               phy->ops.write_reg          = e1000e_write_phy_reg_bm2;
-
-               /* This uses above function pointers */
-               ret_val = e1000e_get_phy_id_82571(hw);
-               /* Verify PHY ID */
-               if (phy->id != BME1000_E_PHY_ID_R2) {
-                       ret_val = -E1000_ERR_PHY;
-                       e_dbg("PHY ID unknown: type = 0x%08x\n", phy->id);
-                       goto out;
-               }
-               break;
-       default:
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-               break;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_init_nvm_params_82571 - Init NVM func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000e_init_nvm_params_82571(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = er32(EECD);
-       u16 size;
-
-       nvm->opcode_bits = 8;
-       nvm->delay_usec = 1;
-       switch (nvm->override) {
-       case e1000_nvm_override_spi_large:
-               nvm->page_size = 32;
-               nvm->address_bits = 16;
-               break;
-       case e1000_nvm_override_spi_small:
-               nvm->page_size = 8;
-               nvm->address_bits = 8;
-               break;
-       default:
-               nvm->page_size = eecd & E1000_EECD_ADDR_BITS ? 32 : 8;
-               nvm->address_bits = eecd & E1000_EECD_ADDR_BITS ? 16 : 8;
-               break;
-       }
-
-       switch (hw->mac.type) {
-       case e1000_82573:
-       case e1000_82574:
-       case e1000_82583:
-               if (((eecd >> 15) & 0x3) == 0x3) {
-                       nvm->type = e1000_nvm_flash_hw;
-                       nvm->word_size = 2048;
-                       /*
-                        * Autonomous Flash update bit must be cleared due
-                        * to Flash update issue.
-                        */
-                       eecd &= ~E1000_EECD_AUPDEN;
-                       ew32(EECD, eecd);
-                       break;
-               }
-               /* Fall Through */
-       default:
-               nvm->type = e1000_nvm_eeprom_spi;
-               size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
-                                 E1000_EECD_SIZE_EX_SHIFT);
-               /*
-                * Added to a constant, "size" becomes the left-shift value
-                * for setting word_size.
-                */
-               size += NVM_WORD_SIZE_BASE_SHIFT;
-
-               /* EEPROM access above 16k is unsupported */
-               if (size > 14)
-                       size = 14;
-               nvm->word_size  = 1 << size;
-               break;
-       }
-
-       /* Function Pointers */
-       nvm->ops.acquire       = e1000e_acquire_nvm_82571;
-       nvm->ops.read          = e1000e_read_nvm_eerd;
-       nvm->ops.release       = e1000e_release_nvm_82571;
-       nvm->ops.update        = e1000e_update_nvm_checksum_82571;
-       nvm->ops.validate      = e1000e_validate_nvm_checksum_82571;
-       nvm->ops.valid_led_default = e1000e_valid_led_default_82571;
-       nvm->ops.write         = e1000e_write_nvm_82571;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_init_mac_params_82571 - Init MAC func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000e_init_mac_params_82571(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = E1000_SUCCESS;
-       u32 swsm = 0;
-       u32 swsm2 = 0;
-       bool force_clear_smbi = false;
-
-       /* Set media type */
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82571EB_FIBER:
-       case E1000_DEV_ID_82572EI_FIBER:
-       case E1000_DEV_ID_82571EB_QUAD_FIBER:
-               hw->phy.media_type = e1000_media_type_fiber;
-               break;
-       case E1000_DEV_ID_82571EB_SERDES:
-       case E1000_DEV_ID_82571EB_SERDES_DUAL:
-       case E1000_DEV_ID_82571EB_SERDES_QUAD:
-       case E1000_DEV_ID_82572EI_SERDES:
-               hw->phy.media_type = e1000_media_type_internal_serdes;
-               break;
-       default:
-               hw->phy.media_type = e1000_media_type_copper;
-               break;
-       }
-
-       /* Set mta register count */
-       mac->mta_reg_count = 128;
-       /* Set rar entry count */
-       mac->rar_entry_count = E1000_RAR_ENTRIES;
-       /* Set if part includes ASF firmware */
-       mac->asf_firmware_present = true;
-       /* Set if manageability features are enabled. */
-       mac->arc_subsystem_valid =
-               (er32(FWSM) & E1000_FWSM_MODE_MASK)
-                       ? true : false;
-
-       /* Function pointers */
-
-       /* bus type/speed/width */
-       mac->ops.get_bus_info = e1000e_get_bus_info_pcie;
-       /* function id */
-       switch (hw->mac.type) {
-       case e1000_82573:
-       case e1000_82574:
-       case e1000_82583:
-               mac->ops.set_lan_id = e1000e_set_lan_id_single_port;
-               break;
-       default:
-               break;
-       }
-       /* reset */
-       mac->ops.reset_hw = e1000e_reset_hw_82571;
-       /* hw initialization */
-       mac->ops.init_hw = e1000e_init_hw_82571;
-       /* link setup */
-       mac->ops.setup_link = e1000e_setup_link_82571;
-       /* physical interface link setup */
-       mac->ops.setup_physical_interface =
-               (hw->phy.media_type == e1000_media_type_copper)
-                       ? e1000e_setup_copper_link_82571
-                       : e1000e_setup_fiber_serdes_link_82571;
-       /* check for link */
-       switch (hw->phy.media_type) {
-       case e1000_media_type_copper:
-               mac->ops.check_for_link = e1000e_check_for_copper_link;
-               break;
-       case e1000_media_type_fiber:
-               mac->ops.check_for_link = e1000e_check_for_fiber_link;
-               break;
-       case e1000_media_type_internal_serdes:
-               mac->ops.check_for_link = e1000e_check_for_serdes_link_82571;
-               break;
-       default:
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-               break;
-       }
-       /* check management mode */
-#if 0
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-               mac->ops.check_mng_mode = e1000e_check_mng_mode_82574;
-               break;
-       default:
-               mac->ops.check_mng_mode = e1000e_check_mng_mode_generic;
-               break;
-       }
-#endif
-       /* multicast address update */
-       mac->ops.update_mc_addr_list = e1000e_update_mc_addr_list_generic;
-       /* writing VFTA */
-       mac->ops.write_vfta = e1000e_write_vfta_generic;
-       /* clearing VFTA */
-       mac->ops.clear_vfta = e1000e_clear_vfta_82571;
-       /* setting MTA */
-       mac->ops.mta_set = e1000e_mta_set_generic;
-       /* read mac address */
-       mac->ops.read_mac_addr = e1000e_read_mac_addr_82571;
-       /* ID LED init */
-       mac->ops.id_led_init = e1000e_id_led_init;
-       /* blink LED */
-       mac->ops.blink_led = e1000e_blink_led;
-       /* setup LED */
-       mac->ops.setup_led = e1000e_setup_led_generic;
-       /* cleanup LED */
-       mac->ops.cleanup_led = e1000e_cleanup_led_generic;
-       /* turn on/off LED */
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-               mac->ops.led_on = e1000e_led_on_82574;
-               break;
-       default:
-               mac->ops.led_on = e1000e_led_on_generic;
-               break;
-       }
-       mac->ops.led_off = e1000e_led_off_generic;
-       /* clear hardware counters */
-       mac->ops.clear_hw_cntrs = e1000e_clear_hw_cntrs_82571;
-       /* link info */
-       mac->ops.get_link_up_info =
-               (hw->phy.media_type == e1000_media_type_copper)
-                       ? e1000e_get_speed_and_duplex_copper
-                       : e1000e_get_speed_and_duplex_fiber_serdes;
-
-       /*
-        * Ensure that the inter-port SWSM.SMBI lock bit is clear before
-        * first NVM or PHY acess. This should be done for single-port
-        * devices, and for one port only on dual-port devices so that
-        * for those devices we can still use the SMBI lock to synchronize
-        * inter-port accesses to the PHY & NVM.
-        */
-       switch (hw->mac.type) {
-       case e1000_82571:
-       case e1000_82572:
-               swsm2 = er32(SWSM2);
-
-               if (!(swsm2 & E1000_SWSM2_LOCK)) {
-                       /* Only do this for the first interface on this card */
-                       ew32(SWSM2,
-                           swsm2 | E1000_SWSM2_LOCK);
-                       force_clear_smbi = true;
-               } else
-                       force_clear_smbi = false;
-               break;
-       default:
-               force_clear_smbi = true;
-               break;
-       }
-
-       if (force_clear_smbi) {
-               /* Make sure SWSM.SMBI is clear */
-               swsm = er32(SWSM);
-               if (swsm & E1000_SWSM_SMBI) {
-                       /* This bit should not be set on a first interface, and
-                        * indicates that the bootagent or EFI code has
-                        * improperly left this bit enabled
-                        */
-                       e_dbg("Please update your 82571 Bootagent\n");
-               }
-               ew32(SWSM, swsm & ~E1000_SWSM_SMBI);
-       }
-
-       /*
-        * Initialze device specific counter of SMBI acquisition
-        * timeouts.
-        */
-        hw->dev_spec._82571.smb_counter = 0;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_init_function_pointers_82571 - Init func ptrs.
- *  @hw: pointer to the HW structure
- *
- *  Called to initialize all function pointers and parameters.
- **/
-void e1000e_init_function_pointers_82571(struct e1000_hw *hw)
-{
-       e1000e_init_mac_ops_generic(hw);
-       e1000e_init_nvm_ops_generic(hw);
-       hw->mac.ops.init_params = e1000e_init_mac_params_82571;
-       hw->nvm.ops.init_params = e1000e_init_nvm_params_82571;
-       hw->phy.ops.init_params = e1000e_init_phy_params_82571;
-}
-
-/**
- *  e1000e_get_phy_id_82571 - Retrieve the PHY ID and revision
- *  @hw: pointer to the HW structure
- *
- *  Reads the PHY registers and stores the PHY ID and possibly the PHY
- *  revision in the hardware structure.
- **/
-static s32 e1000e_get_phy_id_82571(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_id = 0;
-
-       switch (hw->mac.type) {
-       case e1000_82571:
-       case e1000_82572:
-               /*
-                * The 82571 firmware may still be configuring the PHY.
-                * In this case, we cannot access the PHY until the
-                * configuration is done.  So we explicitly set the
-                * PHY ID.
-                */
-               phy->id = IGP01E1000_I_PHY_ID;
-               break;
-       case e1000_82573:
-               ret_val = e1000e_get_phy_id(hw);
-               break;
-       case e1000_82574:
-       case e1000_82583:
-               ret_val = e1e_rphy(hw, PHY_ID1, &phy_id);
-               if (ret_val)
-                       goto out;
-
-               phy->id = (u32)(phy_id << 16);
-               udelay(20);
-               ret_val = e1e_rphy(hw, PHY_ID2, &phy_id);
-               if (ret_val)
-                       goto out;
-
-               phy->id |= (u32)(phy_id);
-               phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
-               break;
-       default:
-               ret_val = -E1000_ERR_PHY;
-               break;
-       }
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_get_hw_semaphore_82571 - Acquire hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Acquire the HW semaphore to access the PHY or NVM
- **/
-s32 e1000e_get_hw_semaphore_82571(struct e1000_hw *hw)
-{
-       u32 swsm;
-       s32 ret_val = E1000_SUCCESS;
-       s32 sw_timeout = hw->nvm.word_size + 1;
-       s32 fw_timeout = hw->nvm.word_size + 1;
-       s32 i = 0;
-
-       /*
-        * If we have timedout 3 times on trying to acquire
-        * the inter-port SMBI semaphore, there is old code
-        * operating on the other port, and it is not
-        * releasing SMBI. Modify the number of times that
-        * we try for the semaphore to interwork with this
-        * older code.
-        */
-       if (hw->dev_spec._82571.smb_counter > 2)
-               sw_timeout = 1;
-
-       /* Get the SW semaphore */
-       while (i < sw_timeout) {
-               swsm = er32(SWSM);
-               if (!(swsm & E1000_SWSM_SMBI))
-                       break;
-
-               udelay(50);
-               i++;
-       }
-
-       if (i == sw_timeout) {
-               e_dbg("Driver can't access device - SMBI bit is set.\n");
-               hw->dev_spec._82571.smb_counter++;
-       }
-       /* Get the FW semaphore. */
-       for (i = 0; i < fw_timeout; i++) {
-               swsm = er32(SWSM);
-               ew32(SWSM, swsm | E1000_SWSM_SWESMBI);
-
-               /* Semaphore acquired if bit latched */
-               if (er32(SWSM) & E1000_SWSM_SWESMBI)
-                       break;
-
-               udelay(50);
-       }
-
-       if (i == fw_timeout) {
-               /* Release semaphores */
-               e1000e_put_hw_semaphore_82571(hw);
-               e_dbg("Driver can't access the NVM\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_put_hw_semaphore_82571 - Release hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Release hardware semaphore used to access the PHY or NVM
- **/
-void e1000e_put_hw_semaphore_82571(struct e1000_hw *hw)
-{
-       u32 swsm;
-
-       swsm = er32(SWSM);
-       swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
-       ew32(SWSM, swsm);
-}
-
-/**
- *  e1000e_acquire_nvm_82571 - Request for access to the EEPROM
- *  @hw: pointer to the HW structure
- *
- *  To gain access to the EEPROM, first we must obtain a hardware semaphore.
- *  Then for non-82573 hardware, set the EEPROM access request bit and wait
- *  for EEPROM access grant bit.  If the access grant bit is not set, release
- *  hardware semaphore.
- **/
-static s32 e1000e_acquire_nvm_82571(struct e1000_hw *hw)
-{
-       s32 ret_val;
-
-       ret_val = e1000e_get_hw_semaphore_82571(hw);
-       if (ret_val)
-               goto out;
-
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-       case e1000_82573:
-               break;
-       default:
-               ret_val = e1000e_acquire_nvm(hw);
-               break;
-       }
-
-       if (ret_val)
-               e1000e_put_hw_semaphore_82571(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_release_nvm_82571 - Release exclusive access to EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Stop any current commands to the EEPROM and clear the EEPROM request bit.
- **/
-static void e1000e_release_nvm_82571(struct e1000_hw *hw)
-{
-       e1000e_release_nvm(hw);
-       e1000e_put_hw_semaphore_82571(hw);
-}
-
-/**
- *  e1000e_write_nvm_82571 - Write to EEPROM using appropriate interface
- *  @hw: pointer to the HW structure
- *  @offset: offset within the EEPROM to be written to
- *  @words: number of words to write
- *  @data: 16 bit word(s) to be written to the EEPROM
- *
- *  For non-82573 silicon, write data to EEPROM at offset using SPI interface.
- *
- *  If e1000e_update_nvm_checksum is not called after this function, the
- *  EEPROM will most likely contain an invalid checksum.
- **/
-static s32 e1000e_write_nvm_82571(struct e1000_hw *hw, u16 offset, u16 words,
-                                 u16 *data)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       switch (hw->mac.type) {
-       case e1000_82573:
-       case e1000_82574:
-       case e1000_82583:
-               ret_val = e1000e_write_nvm_eewr_82571(hw, offset, words, data);
-               break;
-       case e1000_82571:
-       case e1000_82572:
-               ret_val = e1000e_write_nvm_spi(hw, offset, words, data);
-               break;
-       default:
-               ret_val = -E1000_ERR_NVM;
-               break;
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000e_update_nvm_checksum_82571 - Update EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Updates the EEPROM checksum by reading/adding each word of the EEPROM
- *  up to the checksum.  Then calculates the EEPROM checksum and writes the
- *  value to the EEPROM.
- **/
-static s32 e1000e_update_nvm_checksum_82571(struct e1000_hw *hw)
-{
-       u32 eecd;
-       s32 ret_val;
-       u16 i;
-
-       ret_val = e1000e_update_nvm_checksum_generic(hw);
-       if (ret_val)
-               goto out;
-
-       /*
-        * If our nvm is an EEPROM, then we're done
-        * otherwise, commit the checksum to the flash NVM.
-        */
-       if (hw->nvm.type != e1000_nvm_flash_hw)
-               goto out;
-
-       /* Check for pending operations. */
-       for (i = 0; i < E1000_FLASH_UPDATES; i++) {
-               msleep(1);
-               if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
-                       break;
-       }
-
-       if (i == E1000_FLASH_UPDATES) {
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       /* Reset the firmware if using STM opcode. */
-       if ((er32(FLOP) & 0xFF00) == E1000_STM_OPCODE) {
-               /*
-                * The enabling of and the actual reset must be done
-                * in two write cycles.
-                */
-               ew32(HICR, E1000_HICR_FW_RESET_ENABLE);
-               e1e_flush();
-               ew32(HICR, E1000_HICR_FW_RESET);
-       }
-
-       /* Commit the write to flash */
-       eecd = er32(EECD) | E1000_EECD_FLUPD;
-       ew32(EECD, eecd);
-
-       for (i = 0; i < E1000_FLASH_UPDATES; i++) {
-               msleep(1);
-               if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
-                       break;
-       }
-
-       if (i == E1000_FLASH_UPDATES) {
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_validate_nvm_checksum_82571 - Validate EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Calculates the EEPROM checksum by reading/adding each word of the EEPROM
- *  and then verifies that the sum of the EEPROM is equal to 0xBABA.
- **/
-static s32 e1000e_validate_nvm_checksum_82571(struct e1000_hw *hw)
-{
-       if (hw->nvm.type == e1000_nvm_flash_hw)
-               e1000e_fix_nvm_checksum_82571(hw);
-
-       return e1000e_validate_nvm_checksum_generic(hw);
-}
-
-/**
- *  e1000e_write_nvm_eewr_82571 - Write to EEPROM for 82573 silicon
- *  @hw: pointer to the HW structure
- *  @offset: offset within the EEPROM to be written to
- *  @words: number of words to write
- *  @data: 16 bit word(s) to be written to the EEPROM
- *
- *  After checking for invalid values, poll the EEPROM to ensure the previous
- *  command has completed before trying to write the next word.  After write
- *  poll for completion.
- *
- *  If e1000e_update_nvm_checksum is not called after this function, the
- *  EEPROM will most likely contain an invalid checksum.
- **/
-static s32 e1000e_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
-                                      u16 words, u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 i, eewr = 0;
-       s32 ret_val = 0;
-
-       /*
-        * A check for invalid values:  offset too large, too many words,
-        * and not enough words.
-        */
-       if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-           (words == 0)) {
-               e_dbg("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       for (i = 0; i < words; i++) {
-               eewr = (data[i] << E1000_NVM_RW_REG_DATA) |
-                      ((offset+i) << E1000_NVM_RW_ADDR_SHIFT) |
-                      E1000_NVM_RW_REG_START;
-
-               ret_val = e1000e_poll_eerd_eewr_done(hw, E1000_NVM_POLL_WRITE);
-               if (ret_val)
-                       break;
-
-               ew32(EEWR, eewr);
-
-               ret_val = e1000e_poll_eerd_eewr_done(hw, E1000_NVM_POLL_WRITE);
-               if (ret_val)
-                       break;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_get_cfg_done_82571 - Poll for configuration done
- *  @hw: pointer to the HW structure
- *
- *  Reads the management control register for the config done bit to be set.
- **/
-static s32 e1000e_get_cfg_done_82571(struct e1000_hw *hw)
-{
-       s32 timeout = PHY_CFG_TIMEOUT;
-       s32 ret_val = E1000_SUCCESS;
-
-       while (timeout) {
-               if (er32(EEMNGCTL) & E1000_NVM_CFG_DONE_PORT_0)
-                       break;
-               msleep(1);
-               timeout--;
-       }
-       if (!timeout) {
-               e_dbg("MNG configuration cycle has not completed.\n");
-               ret_val = -E1000_ERR_RESET;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_set_d0_lplu_state_82571 - Set Low Power Linkup D0 state
- *  @hw: pointer to the HW structure
- *  @active: true to enable LPLU, false to disable
- *
- *  Sets the LPLU D0 state according to the active flag.  When activating LPLU
- *  this function also disables smart speed and vice versa.  LPLU will not be
- *  activated unless the device autonegotiation advertisement meets standards
- *  of either 10 or 10/100 or 10/100/1000 at all duplexes.  This is a function
- *  pointer entry point only called by PHY setup routines.
- **/
-static s32 e1000e_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       if (!(phy->ops.read_reg))
-               goto out;
-
-       ret_val = e1e_rphy(hw, IGP02E1000_PHY_POWER_MGMT, &data);
-       if (ret_val)
-               goto out;
-
-       if (active) {
-               data |= IGP02E1000_PM_D0_LPLU;
-               ret_val = e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT,
-                                            data);
-               if (ret_val)
-                       goto out;
-
-               /* When LPLU is enabled, we should disable SmartSpeed */
-               ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                           &data);
-               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-               ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                            data);
-               if (ret_val)
-                       goto out;
-       } else {
-               data &= ~IGP02E1000_PM_D0_LPLU;
-               ret_val = e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT,
-                                            data);
-               /*
-                * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
-                * during Dx states where the power conservation is most
-                * important.  During driver activity we should enable
-                * SmartSpeed, so performance is maintained.
-                */
-               if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = e1e_rphy(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = e1e_rphy(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_reset_hw_82571 - Reset hardware
- *  @hw: pointer to the HW structure
- *
- *  This resets the hardware into a known state.
- **/
-static s32 e1000e_reset_hw_82571(struct e1000_hw *hw)
-{
-       u32 ctrl, extcnf_ctrl, ctrl_ext;
-       s32 ret_val;
-       u16 i = 0;
-
-       /*
-        * Prevent the PCI-E bus from sticking if there is no TLP connection
-        * on the last TLP read/write transaction when MAC is reset.
-        */
-       ret_val = e1000e_disable_pcie_master(hw);
-       if (ret_val)
-               e_dbg("PCI-E Master disable polling has failed.\n");
-
-       e_dbg("Masking off all interrupts\n");
-       ew32(IMC, 0xffffffff);
-
-       ew32(RCTL, 0);
-       ew32(TCTL, E1000_TCTL_PSP);
-       e1e_flush();
-
-       msleep(10);
-
-       /*
-        * Must acquire the MDIO ownership before MAC reset.
-        * Ownership defaults to firmware after a reset.
-        */
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-       case e1000_82573:
-               extcnf_ctrl = er32(EXTCNF_CTRL);
-               extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
-
-               do {
-                       ew32(EXTCNF_CTRL, extcnf_ctrl);
-                       extcnf_ctrl = er32(EXTCNF_CTRL);
-
-                       if (extcnf_ctrl & E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP)
-                               break;
-
-                       extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
-
-                       msleep(2);
-                       i++;
-               } while (i < MDIO_OWNERSHIP_TIMEOUT);
-               break;
-       default:
-               break;
-       }
-
-       ctrl = er32(CTRL);
-
-       e_dbg("Issuing a global reset to MAC\n");
-       ew32(CTRL, ctrl | E1000_CTRL_RST);
-
-       if (hw->nvm.type == e1000_nvm_flash_hw) {
-               udelay(10);
-               ctrl_ext = er32(CTRL_EXT);
-               ctrl_ext |= E1000_CTRL_EXT_EE_RST;
-               ew32(CTRL_EXT, ctrl_ext);
-               e1e_flush();
-       }
-
-       ret_val = e1000e_get_auto_rd_done(hw);
-       if (ret_val)
-               /* We don't want to continue accessing MAC registers. */
-               goto out;
-
-       /*
-        * Phy configuration from NVM just starts after EECD_AUTO_RD is set.
-        * Need to wait for Phy configuration completion before accessing
-        * NVM and Phy.
-        */
-
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-       case e1000_82573:
-               msleep(25);
-               break;
-       default:
-               break;
-       }
-
-       /* Clear any pending interrupt events. */
-       ew32(IMC, 0xffffffff);
-       er32(ICR);
-
-       /* Install any alternate MAC address into RAR0 */
-       ret_val = e1000e_check_alt_mac_addr_generic(hw);
-       if (ret_val)
-               goto out;
-
-       e1000e_set_laa_state_82571(hw, true);
-
-       /* Reinitialize the 82571 serdes link state machine */
-       if (hw->phy.media_type == e1000_media_type_internal_serdes)
-               hw->mac.serdes_link_state = e1000_serdes_link_down;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_init_hw_82571 - Initialize hardware
- *  @hw: pointer to the HW structure
- *
- *  This inits the hardware readying it for operation.
- **/
-static s32 e1000e_init_hw_82571(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 reg_data;
-       s32 ret_val;
-       u16 i, rar_count = mac->rar_entry_count;
-
-       e1000e_initialize_hw_bits_82571(hw);
-
-       /* Initialize identification LED */
-       ret_val = mac->ops.id_led_init(hw);
-       if (ret_val) {
-               e_dbg("Error initializing identification LED\n");
-               /* This is not fatal and we should not stop init due to this */
-       }
-
-       /* Disabling VLAN filtering */
-       e_dbg("Initializing the IEEE VLAN\n");
-       e1000e_clear_vfta(hw);
-
-       /* Setup the receive address. */
-       /*
-        * If, however, a locally administered address was assigned to the
-        * 82571, we must reserve a RAR for it to work around an issue where
-        * resetting one port will reload the MAC on the other port.
-        */
-       if (e1000e_get_laa_state_82571(hw))
-               rar_count--;
-       e1000e_init_rx_addrs(hw, rar_count);
-
-       /* Zero out the Multicast HASH table */
-       e_dbg("Zeroing the MTA\n");
-       for (i = 0; i < mac->mta_reg_count; i++)
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
-
-       /* Setup link and flow control */
-       ret_val = mac->ops.setup_link(hw);
-
-       /* Set the transmit descriptor write-back policy */
-       reg_data = er32(TXDCTL(0));
-       reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-                  E1000_TXDCTL_FULL_TX_DESC_WB |
-                  E1000_TXDCTL_COUNT_DESC;
-       ew32(TXDCTL(0), reg_data);
-
-       /* ...for both queues. */
-       switch (mac->type) {
-       case e1000_82574:
-       case e1000_82583:
-       case e1000_82573:
-#if 0
-               e1000e_enable_tx_pkt_filtering(hw);
-#endif
-               reg_data = er32(GCR);
-               reg_data |= E1000_GCR_L1_ACT_WITHOUT_L0S_RX;
-               ew32(GCR, reg_data);
-               break;
-       default:
-               reg_data = er32(TXDCTL(1));
-               reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-                                       E1000_TXDCTL_FULL_TX_DESC_WB |
-                                       E1000_TXDCTL_COUNT_DESC;
-               ew32(TXDCTL(1), reg_data);
-               break;
-       }
-
-       /*
-        * Clear all of the statistics registers (clear on read).  It is
-        * important that we do this after we have tried to establish link
-        * because the symbol error count will increment wildly if there
-        * is no link.
-        */
-       e1000e_clear_hw_cntrs_82571(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000e_initialize_hw_bits_82571 - Initialize hardware-dependent bits
- *  @hw: pointer to the HW structure
- *
- *  Initializes required hardware-dependent bits needed for normal operation.
- **/
-static void e1000e_initialize_hw_bits_82571(struct e1000_hw *hw)
-{
-       u32 reg;
-
-       /* Transmit Descriptor Control 0 */
-       reg = er32(TXDCTL(0));
-       reg |= (1 << 22);
-       ew32(TXDCTL(0), reg);
-
-       /* Transmit Descriptor Control 1 */
-       reg = er32(TXDCTL(1));
-       reg |= (1 << 22);
-       ew32(TXDCTL(1), reg);
-
-       /* Transmit Arbitration Control 0 */
-       reg = er32(TARC(0));
-       reg &= ~(0xF << 27); /* 30:27 */
-       switch (hw->mac.type) {
-       case e1000_82571:
-       case e1000_82572:
-               reg |= (1 << 23) | (1 << 24) | (1 << 25) | (1 << 26);
-               break;
-       default:
-               break;
-       }
-       ew32(TARC(0), reg);
-
-       /* Transmit Arbitration Control 1 */
-       reg = er32(TARC(1));
-       switch (hw->mac.type) {
-       case e1000_82571:
-       case e1000_82572:
-               reg &= ~((1 << 29) | (1 << 30));
-               reg |= (1 << 22) | (1 << 24) | (1 << 25) | (1 << 26);
-               if (er32(TCTL) & E1000_TCTL_MULR)
-                       reg &= ~(1 << 28);
-               else
-                       reg |= (1 << 28);
-               ew32(TARC(1), reg);
-               break;
-       default:
-               break;
-       }
-
-       /* Device Control */
-
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-       case e1000_82573:
-               reg = er32(CTRL);
-               reg &= ~(1 << 29);
-               ew32(CTRL, reg);
-               break;
-       default:
-               break;
-       }
-
-       /* Extended Device Control */
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-       case e1000_82573:
-               reg = er32(CTRL_EXT);
-               reg &= ~(1 << 23);
-               reg |= (1 << 22);
-               ew32(CTRL_EXT, reg);
-               break;
-       default:
-               break;
-       }
-
-
-       if (hw->mac.type == e1000_82571) {
-               reg = er32(PBA_ECC);
-               reg |= E1000_PBA_ECC_CORR_EN;
-               ew32(PBA_ECC, reg);
-       }
-
-       /*
-        * Workaround for hardware errata.
-        * Ensure that DMA Dynamic Clock gating is disabled on 82571 and 82572
-        */
-
-       if ((hw->mac.type == e1000_82571) ||
-          (hw->mac.type == e1000_82572)) {
-               reg = er32(CTRL_EXT);
-               reg &= ~E1000_CTRL_EXT_DMA_DYN_CLK_EN;
-               ew32(CTRL_EXT, reg);
-       }
-
-       /* PCI-Ex Control Registers */
-
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-               reg = er32(GCR);
-               reg |= (1 << 22);
-               ew32(GCR, reg);
-               /*
-                * Workaround for hardware errata.
-                * apply workaround for hardware errata documented in errata
-                * docs Fixes issue where some error prone or unreliable PCIe
-                * completions are occurring, particularly with ASPM enabled.
-                * Without fix, issue can cause tx timeouts.
-                */
-               reg = er32(GCR2);
-               reg |= 1;
-               ew32(GCR2, reg);
-               break;
-       default:
-               break;
-       }
-       return;
-}
-
-/**
- *  e1000e_clear_vfta_82571 - Clear VLAN filter table
- *  @hw: pointer to the HW structure
- *
- *  Clears the register array which contains the VLAN filter table by
- *  setting all the values to 0.
- **/
-static void e1000e_clear_vfta_82571(struct e1000_hw *hw)
-{
-       u32 offset;
-       u32 vfta_value = 0;
-       u32 vfta_offset = 0;
-       u32 vfta_bit_in_reg = 0;
-
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-       case e1000_82573:
-               if (hw->mng_cookie.vlan_id != 0) {
-                       /*
-                       *The VFTA is a 4096b bit-field, each identifying
-                       *a single VLAN ID.  The following operations
-                       *determine which 32b entry (i.e. offset) into the
-                       *array we want to set the VLAN ID (i.e. bit) of
-                       *the manageability unit.
-                       */
-                       vfta_offset = (hw->mng_cookie.vlan_id >>
-                               E1000_VFTA_ENTRY_SHIFT) & E1000_VFTA_ENTRY_MASK;
-                       vfta_bit_in_reg = 1 << (hw->mng_cookie.vlan_id &
-                               E1000_VFTA_ENTRY_BIT_SHIFT_MASK);
-               }
-
-               for (offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++) {
-                       /*
-                       *If the offset we want to clear is the same offset of
-                       *the manageability VLAN ID, then clear all bits except
-                       *that of the manageability unit
-                       */
-                       vfta_value = (offset == vfta_offset) ?
-                                                       vfta_bit_in_reg : 0;
-                       E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, offset,
-                               vfta_value);
-                       e1e_flush();
-               }
-               break;
-       default:
-               break;
-       }
-}
-
-#if 0
-/**
- *  e1000e_check_mng_mode_82574 - Check manageability is enabled
- *  @hw: pointer to the HW structure
- *
- *  Reads the NVM Initialization Control Word 2 and returns true
- *  (>0) if any manageability is enabled, else false (0).
- **/
-static bool e1000e_check_mng_mode_82574(struct e1000_hw *hw)
-{
-       u16 data;
-
-       e1000e_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
-       return (data & E1000_NVM_INIT_CTRL2_MNGM) != 0;
-}
-#endif
-
-/**
- *  e1000e_led_on_82574 - Turn LED on
- *  @hw: pointer to the HW structure
- *
- *  Turn LED on.
- **/
-static s32 e1000e_led_on_82574(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ctrl;
-       u32 i;
-
-       ctrl = hw->mac.ledctl_mode2;
-       if (!(E1000_STATUS_LU & er32(STATUS))) {
-               /*
-                * If no link, then turn LED on by setting the invert bit
-                * for each LED that's "on" (0x0E) in ledctl_mode2.
-                */
-               for (i = 0; i < 4; i++)
-                       if (((hw->mac.ledctl_mode2 >> (i * 8)) & 0xFF) ==
-                           E1000_LEDCTL_MODE_LED_ON)
-                               ctrl |= (E1000_LEDCTL_LED0_IVRT << (i * 8));
-       }
-       ew32(LEDCTL, ctrl);
-#endif
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_setup_link_82571 - Setup flow control and link settings
- *  @hw: pointer to the HW structure
- *
- *  Determines which flow control settings to use, then configures flow
- *  control.  Calls the appropriate media-specific link configuration
- *  function.  Assuming the adapter has a valid link partner, a valid link
- *  should be established.  Assumes the hardware has previously been reset
- *  and the transmitter and receiver are not enabled.
- **/
-static s32 e1000e_setup_link_82571(struct e1000_hw *hw)
-{
-       /*
-        * 82573 does not have a word in the NVM to determine
-        * the default flow control setting, so we explicitly
-        * set it to full.
-        */
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-       case e1000_82573:
-               if (hw->fc.requested_mode == e1000_fc_default)
-                       hw->fc.requested_mode = e1000_fc_full;
-               break;
-       default:
-               break;
-       }
-       return e1000e_setup_link(hw);
-}
-
-/**
- *  e1000e_setup_copper_link_82571 - Configure copper link settings
- *  @hw: pointer to the HW structure
- *
- *  Configures the link for auto-neg or forced speed and duplex.  Then we check
- *  for link, once link is established calls to configure collision distance
- *  and flow control are called.
- **/
-static s32 e1000e_setup_copper_link_82571(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32  ret_val;
-
-       ctrl = er32(CTRL);
-       ctrl |= E1000_CTRL_SLU;
-       ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       ew32(CTRL, ctrl);
-
-       switch (hw->phy.type) {
-       case e1000_phy_m88:
-       case e1000_phy_bm:
-               ret_val = e1000e_copper_link_setup_m88(hw);
-               break;
-       case e1000_phy_igp_2:
-               ret_val = e1000e_copper_link_setup_igp(hw);
-               break;
-       default:
-               ret_val = -E1000_ERR_PHY;
-               break;
-       }
-
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000e_setup_copper_link(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_setup_fiber_serdes_link_82571 - Setup link for fiber/serdes
- *  @hw: pointer to the HW structure
- *
- *  Configures collision distance and flow control for fiber and serdes links.
- *  Upon successful setup, poll for link.
- **/
-static s32 e1000e_setup_fiber_serdes_link_82571(struct e1000_hw *hw)
-{
-       switch (hw->mac.type) {
-       case e1000_82571:
-       case e1000_82572:
-               /*
-                * If SerDes loopback mode is entered, there is no form
-                * of reset to take the adapter out of that mode.  So we
-                * have to explicitly take the adapter out of loopback
-                * mode.  This prevents drivers from twiddling their thumbs
-                * if another tool failed to take it out of loopback mode.
-                */
-               ew32(SCTL, E1000_SCTL_DISABLE_SERDES_LOOPBACK);
-               break;
-       default:
-               break;
-       }
-
-       return e1000e_setup_fiber_serdes_link(hw);
-}
-
-/**
- *  e1000e_check_for_serdes_link_82571 - Check for link (Serdes)
- *  @hw: pointer to the HW structure
- *
- *  Reports the link state as up or down.
- *
- *  If autonegotiation is supported by the link partner, the link state is
- *  determined by the result of autongotiation. This is the most likely case.
- *  If autonegotiation is not supported by the link partner, and the link
- *  has a valid signal, force the link up.
- *
- *  The link state is represented internally here by 4 states:
- *
- *  1) down
- *  2) autoneg_progress
- *  3) autoneg_complete (the link sucessfully autonegotiated)
- *  4) forced_up (the link has been forced up, it did not autonegotiate)
- *
- **/
-s32 e1000e_check_for_serdes_link_82571(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 rxcw;
-       u32 ctrl;
-       u32 status;
-       s32 ret_val = E1000_SUCCESS;
-
-       ctrl = er32(CTRL);
-       status = er32(STATUS);
-       rxcw = er32(RXCW);
-
-       if ((rxcw & E1000_RXCW_SYNCH) && !(rxcw & E1000_RXCW_IV)) {
-
-               /* Receiver is synchronized with no invalid bits.  */
-               switch (mac->serdes_link_state) {
-               case e1000_serdes_link_autoneg_complete:
-                       if (!(status & E1000_STATUS_LU)) {
-                               /*
-                                * We have lost link, retry autoneg before
-                                * reporting link failure
-                                */
-                               mac->serdes_link_state =
-                                   e1000_serdes_link_autoneg_progress;
-                               mac->serdes_has_link = false;
-                               e_dbg("AN_UP     -> AN_PROG\n");
-                       }
-               break;
-
-               case e1000_serdes_link_forced_up:
-                       /*
-                        * If we are receiving /C/ ordered sets, re-enable
-                        * auto-negotiation in the TXCW register and disable
-                        * forced link in the Device Control register in an
-                        * attempt to auto-negotiate with our link partner.
-                        */
-                       if (rxcw & E1000_RXCW_C) {
-                               /* Enable autoneg, and unforce link up */
-                               ew32(TXCW, mac->txcw);
-                               ew32(CTRL,
-                                   (ctrl & ~E1000_CTRL_SLU));
-                               mac->serdes_link_state =
-                                   e1000_serdes_link_autoneg_progress;
-                               mac->serdes_has_link = false;
-                               e_dbg("FORCED_UP -> AN_PROG\n");
-                       }
-                       break;
-
-               case e1000_serdes_link_autoneg_progress:
-                       if (rxcw & E1000_RXCW_C) {
-                               /* We received /C/ ordered sets, meaning the
-                                * link partner has autonegotiated, and we can
-                                * trust the Link Up (LU) status bit
-                                */
-                               if (status & E1000_STATUS_LU) {
-                                       mac->serdes_link_state =
-                                           e1000_serdes_link_autoneg_complete;
-                                       e_dbg("AN_PROG   -> AN_UP\n");
-                                       mac->serdes_has_link = true;
-                               } else {
-                                       /* Autoneg completed, but failed */
-                                       mac->serdes_link_state =
-                                           e1000_serdes_link_down;
-                                       e_dbg("AN_PROG   -> DOWN\n");
-                               }
-                       } else {
-                               /* The link partner did not autoneg.
-                                * Force link up and full duplex, and change
-                                * state to forced.
-                                */
-                               ew32(TXCW,
-                               (mac->txcw & ~E1000_TXCW_ANE));
-                               ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FD);
-                               ew32(CTRL, ctrl);
-
-                               /* Configure Flow Control after link up. */
-                               ret_val =
-                                   e1000e_config_fc_after_link_up(hw);
-                               if (ret_val) {
-                                       e_dbg("Error config flow control\n");
-                                       break;
-                               }
-                               mac->serdes_link_state =
-                               e1000_serdes_link_forced_up;
-                               mac->serdes_has_link = true;
-                               e_dbg("AN_PROG   -> FORCED_UP\n");
-                       }
-                       break;
-
-               case e1000_serdes_link_down:
-               default:
-                       /* The link was down but the receiver has now gained
-                        * valid sync, so lets see if we can bring the link
-                        * up. */
-                       ew32(TXCW, mac->txcw);
-                       ew32(CTRL,
-                           (ctrl & ~E1000_CTRL_SLU));
-                       mac->serdes_link_state =
-                           e1000_serdes_link_autoneg_progress;
-                       e_dbg("DOWN      -> AN_PROG\n");
-                       break;
-               }
-       } else {
-               if (!(rxcw & E1000_RXCW_SYNCH)) {
-                       mac->serdes_has_link = false;
-                       mac->serdes_link_state = e1000_serdes_link_down;
-                       e_dbg("ANYSTATE  -> DOWN\n");
-               } else {
-                       /*
-                        * We have sync, and can tolerate one
-                        * invalid (IV) codeword before declaring
-                        * link down, so reread to look again
-                        */
-                       udelay(10);
-                       rxcw = er32(RXCW);
-                       if (rxcw & E1000_RXCW_IV) {
-                               mac->serdes_link_state = e1000_serdes_link_down;
-                               mac->serdes_has_link = false;
-                               e_dbg("ANYSTATE  -> DOWN\n");
-                       }
-               }
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000e_valid_led_default_82571 - Verify a valid default LED config
- *  @hw: pointer to the HW structure
- *  @data: pointer to the NVM (EEPROM)
- *
- *  Read the EEPROM for the current default LED configuration.  If the
- *  LED configuration is not valid, set to a valid LED configuration.
- **/
-static s32 e1000e_valid_led_default_82571(struct e1000_hw *hw, u16 *data)
-{
-       s32 ret_val;
-
-       ret_val = e1000e_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       switch (hw->mac.type) {
-       case e1000_82574:
-       case e1000_82583:
-       case e1000_82573:
-               if(*data == ID_LED_RESERVED_F746)
-                       *data = ID_LED_DEFAULT_82573;
-               break;
-       default:
-               if (*data == ID_LED_RESERVED_0000 ||
-                       *data == ID_LED_RESERVED_FFFF)
-                       *data = ID_LED_DEFAULT;
-               break;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_get_laa_state_82571 - Get locally administered address state
- *  @hw: pointer to the HW structure
- *
- *  Retrieve and return the current locally administered address state.
- **/
-bool e1000e_get_laa_state_82571(struct e1000_hw *hw)
-{
-       if (hw->mac.type != e1000_82571)
-               return false;
-
-       return hw->dev_spec._82571.laa_is_present;
-}
-
-/**
- *  e1000e_set_laa_state_82571 - Set locally administered address state
- *  @hw: pointer to the HW structure
- *  @state: enable/disable locally administered address
- *
- *  Enable/Disable the current locally administered address state.
- **/
-void e1000e_set_laa_state_82571(struct e1000_hw *hw, bool state)
-{
-       if (hw->mac.type != e1000_82571)
-               return;
-
-       hw->dev_spec._82571.laa_is_present = state;
-
-       /* If workaround is activated... */
-       if (state)
-               /*
-                * Hold a copy of the LAA in RAR[14] This is done so that
-                * between the time RAR[0] gets clobbered and the time it
-                * gets fixed, the actual LAA is in one of the RARs and no
-                * incoming packets directed to this port are dropped.
-                * Eventually the LAA will be in RAR[0] and RAR[14].
-                */
-               e1000e_rar_set(hw, hw->mac.addr,
-                                     hw->mac.rar_entry_count - 1);
-       return;
-}
-
-/**
- *  e1000e_fix_nvm_checksum_82571 - Fix EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Verifies that the EEPROM has completed the update.  After updating the
- *  EEPROM, we need to check bit 15 in work 0x23 for the checksum fix.  If
- *  the checksum fix is not implemented, we need to set the bit and update
- *  the checksum.  Otherwise, if bit 15 is set and the checksum is incorrect,
- *  we need to return bad checksum.
- **/
-static s32 e1000e_fix_nvm_checksum_82571(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       if (nvm->type != e1000_nvm_flash_hw)
-               goto out;
-
-       /*
-        * Check bit 4 of word 10h.  If it is 0, firmware is done updating
-        * 10h-12h.  Checksum may need to be fixed.
-        */
-       ret_val = e1000e_read_nvm(hw, 0x10, 1, &data);
-       if (ret_val)
-               goto out;
-
-       if (!(data & 0x10)) {
-               /*
-                * Read 0x23 and check bit 15.  This bit is a 1
-                * when the checksum has already been fixed.  If
-                * the checksum is still wrong and this bit is a
-                * 1, we need to return bad checksum.  Otherwise,
-                * we need to set this bit to a 1 and update the
-                * checksum.
-                */
-               ret_val = e1000e_read_nvm(hw, 0x23, 1, &data);
-               if (ret_val)
-                       goto out;
-
-               if (!(data & 0x8000)) {
-                       data |= 0x8000;
-                       ret_val = e1000e_write_nvm(hw, 0x23, 1, &data);
-                       if (ret_val)
-                               goto out;
-                       ret_val = e1000e_update_nvm_checksum(hw);
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_mac_addr_82571 - Read device MAC address
- *  @hw: pointer to the HW structure
- **/
-static s32 e1000e_read_mac_addr_82571(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       /*
-        * If there's an alternate MAC address place it in RAR0
-        * so that it will override the Si installed default perm
-        * address.
-        */
-       ret_val = e1000e_check_alt_mac_addr_generic(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000e_read_mac_addr_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- * e1000e_power_down_phy_copper_82571 - Remove link during PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, remove the link.
- **/
-static void e1000e_power_down_phy_copper_82571(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       struct e1000_mac_info *mac = &hw->mac;
-
-       if (!(phy->ops.check_reset_block))
-               return;
-
-       /* If the management interface is not enabled, then power down */
-       if (!(mac->ops.check_mng_mode(hw) || e1000e_check_reset_block(hw)))
-               e1000e_power_down_phy_copper(hw);
-
-       return;
-}
-
-/**
- *  e1000e_clear_hw_cntrs_82571 - Clear device specific hardware counters
- *  @hw: pointer to the HW structure
- *
- *  Clears the hardware counters by reading the counter registers.
- **/
-static void e1000e_clear_hw_cntrs_82571(struct e1000_hw *hw __unused)
-{
-#if 0
-       e1000e_clear_hw_cntrs_base(hw);
-
-       er32(PRC64);
-       er32(PRC127);
-       er32(PRC255);
-       er32(PRC511);
-       er32(PRC1023);
-       er32(PRC1522);
-       er32(PTC64);
-       er32(PTC127);
-       er32(PTC255);
-       er32(PTC511);
-       er32(PTC1023);
-       er32(PTC1522);
-
-       er32(ALGNERRC);
-       er32(RXERRC);
-       er32(TNCRS);
-       er32(CEXTERR);
-       er32(TSCTC);
-       er32(TSCTFC);
-
-       er32(MGTPRC);
-       er32(MGTPDC);
-       er32(MGTPTC);
-
-       er32(IAC);
-       er32(ICRXOC);
-
-       er32(ICRXPTC);
-       er32(ICRXATC);
-       er32(ICTXPTC);
-       er32(ICTXATC);
-       er32(ICTXQEC);
-       er32(ICTXQMTC);
-       er32(ICRXDMTC);
-#endif
-}
-
-static struct pci_device_id e1000e_82571_nics[] = {
-     PCI_ROM(0x8086, 0x105E, "E1000_DEV_ID_82571EB_COPPER", "E1000_DEV_ID_82571EB_COPPER", board_82571),
-     PCI_ROM(0x8086, 0x105F, "E1000_DEV_ID_82571EB_FIBER", "E1000_DEV_ID_82571EB_FIBER", board_82571),
-     PCI_ROM(0x8086, 0x10A4, "E1000_DEV_ID_82571EB_QUAD_COPPER", "E1000_DEV_ID_82571EB_QUAD_COPPER", board_82571),
-     PCI_ROM(0x8086, 0x10BC, "E1000_DEV_ID_82571EB_QUAD_COPPER_LP", "E1000_DEV_ID_82571EB_QUAD_COPPER_LP", board_82571),
-     PCI_ROM(0x8086, 0x10A5, "E1000_DEV_ID_82571EB_QUAD_FIBER", "E1000_DEV_ID_82571EB_QUAD_FIBER", board_82571),
-     PCI_ROM(0x8086, 0x1060, "E1000_DEV_ID_82571EB_SERDES", "E1000_DEV_ID_82571EB_SERDES", board_82571),
-     PCI_ROM(0x8086, 0x10D9, "E1000_DEV_ID_82571EB_SERDES_DUAL", "E1000_DEV_ID_82571EB_SERDES_DUAL", board_82571),
-     PCI_ROM(0x8086, 0x10DA, "E1000_DEV_ID_82571EB_SERDES_QUAD", "E1000_DEV_ID_82571EB_SERDES_QUAD", board_82571),
-     PCI_ROM(0x8086, 0x10D5, "E1000_DEV_ID_82571PT_QUAD_COPPER", "E1000_DEV_ID_82571PT_QUAD_COPPER", board_82571),
-     PCI_ROM(0x8086, 0x10B9, "E1000_DEV_ID_82572EI", "E1000_DEV_ID_82572EI", board_82572),
-     PCI_ROM(0x8086, 0x107D, "E1000_DEV_ID_82572EI_COPPER", "E1000_DEV_ID_82572EI_COPPER", board_82572),
-     PCI_ROM(0x8086, 0x107E, "E1000_DEV_ID_82572EI_FIBER", "E1000_DEV_ID_82572EI_FIBER", board_82572),
-     PCI_ROM(0x8086, 0x107F, "E1000_DEV_ID_82572EI_SERDES", "E1000_DEV_ID_82572EI_SERDES", board_82572),
-     PCI_ROM(0x8086, 0x108B, "E1000_DEV_ID_82573E", "E1000_DEV_ID_82573E", board_82573),
-     PCI_ROM(0x8086, 0x108C, "E1000_DEV_ID_82573E_IAMT", "E1000_DEV_ID_82573E_IAMT", board_82573),
-     PCI_ROM(0x8086, 0x109A, "E1000_DEV_ID_82573L", "E1000_DEV_ID_82573L", board_82573),
-     PCI_ROM(0x8086, 0x10D3, "E1000_DEV_ID_82574L", "E1000_DEV_ID_82574L", board_82574),
-     PCI_ROM(0x8086, 0x10F6, "E1000_DEV_ID_82574LA", "E1000_DEV_ID_82574LA", board_82574),
-     PCI_ROM(0x8086, 0x150C, "E1000_DEV_ID_82583V", "E1000_DEV_ID_82583V", board_82583),
-};
-
-struct pci_driver e1000e_82571_driver __pci_driver = {
-       .ids = e1000e_82571_nics,
-       .id_count = (sizeof (e1000e_82571_nics) / sizeof (e1000e_82571_nics[0])),
-       .probe = e1000e_probe,
-       .remove = e1000e_remove,
-};
diff --git a/src/drivers/net/e1000e/e1000e_82571.h b/src/drivers/net/e1000e/e1000e_82571.h
deleted file mode 100644 (file)
index c645e25..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000E_82571_H_
-#define _E1000E_82571_H_
-
-#define ID_LED_RESERVED_F746 0xF746
-#define ID_LED_DEFAULT_82573 ((ID_LED_DEF1_DEF2 << 12) | \
-                              (ID_LED_OFF1_ON2  <<  8) | \
-                              (ID_LED_DEF1_DEF2 <<  4) | \
-                              (ID_LED_DEF1_DEF2))
-
-#define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000
-
-/* Intr Throttling - RW */
-#define E1000_EITR_82574(_n)    (0x000E8 + (0x4 * (_n)))
-
-#define E1000_EIAC_82574        0x000DC /* Ext. Interrupt Auto Clear - RW */
-#define E1000_EIAC_MASK_82574   0x01F00000
-
-#define E1000_NVM_INIT_CTRL2_MNGM 0x6000 /* Manageability Operation Mode mask */
-
-#define E1000_RXCFGL    0x0B634 /* TimeSync Rx EtherType & Msg Type Reg - RW */
-
-bool e1000e_get_laa_state_82571(struct e1000_hw *hw);
-void e1000e_set_laa_state_82571(struct e1000_hw *hw, bool state);
-
-#endif
diff --git a/src/drivers/net/e1000e/e1000e_defines.h b/src/drivers/net/e1000e/e1000e_defines.h
deleted file mode 100644 (file)
index 8cfc6ed..0000000
+++ /dev/null
@@ -1,1471 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000E_DEFINES_H_
-#define _E1000E_DEFINES_H_
-
-/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
-#define REQ_TX_DESCRIPTOR_MULTIPLE  8
-#define REQ_RX_DESCRIPTOR_MULTIPLE  8
-
-/* Definitions for power management and wakeup registers */
-/* Wake Up Control */
-#define E1000_WUC_APME       0x00000001 /* APM Enable */
-#define E1000_WUC_PME_EN     0x00000002 /* PME Enable */
-#define E1000_WUC_PME_STATUS 0x00000004 /* PME Status */
-#define E1000_WUC_APMPME     0x00000008 /* Assert PME on APM Wakeup */
-#define E1000_WUC_LSCWE      0x00000010 /* Link Status wake up enable */
-#define E1000_WUC_LSCWO      0x00000020 /* Link Status wake up override */
-#define E1000_WUC_SPM        0x80000000 /* Enable SPM */
-#define E1000_WUC_PHY_WAKE   0x00000100 /* if PHY supports wakeup */
-
-/* Wake Up Filter Control */
-#define E1000_WUFC_LNKC 0x00000001 /* Link Status Change Wakeup Enable */
-#define E1000_WUFC_MAG  0x00000002 /* Magic Packet Wakeup Enable */
-#define E1000_WUFC_EX   0x00000004 /* Directed Exact Wakeup Enable */
-#define E1000_WUFC_MC   0x00000008 /* Directed Multicast Wakeup Enable */
-#define E1000_WUFC_BC   0x00000010 /* Broadcast Wakeup Enable */
-#define E1000_WUFC_ARP  0x00000020 /* ARP Request Packet Wakeup Enable */
-#define E1000_WUFC_IPV4 0x00000040 /* Directed IPv4 Packet Wakeup Enable */
-#define E1000_WUFC_IPV6 0x00000080 /* Directed IPv6 Packet Wakeup Enable */
-#define E1000_WUFC_IGNORE_TCO_PHY 0x00000800 /* Ignore WakeOn TCO packets */
-#define E1000_WUFC_FLX0_PHY      0x00001000 /* Flexible Filter 0 Enable */
-#define E1000_WUFC_FLX1_PHY      0x00002000 /* Flexible Filter 1 Enable */
-#define E1000_WUFC_FLX2_PHY      0x00004000 /* Flexible Filter 2 Enable */
-#define E1000_WUFC_FLX3_PHY      0x00008000 /* Flexible Filter 3 Enable */
-#define E1000_WUFC_FLX4_PHY      0x00000200 /* Flexible Filter 4 Enable */
-#define E1000_WUFC_FLX5_PHY      0x00000400 /* Flexible Filter 5 Enable */
-#define E1000_WUFC_IGNORE_TCO   0x00008000 /* Ignore WakeOn TCO packets */
-#define E1000_WUFC_FLX0 0x00010000 /* Flexible Filter 0 Enable */
-#define E1000_WUFC_FLX1 0x00020000 /* Flexible Filter 1 Enable */
-#define E1000_WUFC_FLX2 0x00040000 /* Flexible Filter 2 Enable */
-#define E1000_WUFC_FLX3 0x00080000 /* Flexible Filter 3 Enable */
-#define E1000_WUFC_FLX4 0x00100000 /* Flexible Filter 4 Enable */
-#define E1000_WUFC_FLX5 0x00200000 /* Flexible Filter 5 Enable */
-#define E1000_WUFC_ALL_FILTERS_PHY_4 0x0000F0FF /*Mask for all wakeup filters*/
-#define E1000_WUFC_FLX_OFFSET_PHY 12 /* Offset to the Flexible Filters bits */
-#define E1000_WUFC_FLX_FILTERS_PHY_4 0x0000F000 /*Mask for 4 flexible filters*/
-#define E1000_WUFC_ALL_FILTERS_PHY_6 0x0000F6FF /*Mask for 6 wakeup filters */
-#define E1000_WUFC_FLX_FILTERS_PHY_6 0x0000F600 /*Mask for 6 flexible filters*/
-#define E1000_WUFC_ALL_FILTERS  0x000F00FF /* Mask for all wakeup filters */
-#define E1000_WUFC_ALL_FILTERS_6  0x003F00FF /* Mask for all 6 wakeup filters*/
-#define E1000_WUFC_FLX_OFFSET   16 /* Offset to the Flexible Filters bits */
-#define E1000_WUFC_FLX_FILTERS  0x000F0000 /*Mask for the 4 flexible filters */
-#define E1000_WUFC_FLX_FILTERS_6  0x003F0000 /* Mask for 6 flexible filters */
-
-/* Wake Up Status */
-#define E1000_WUS_LNKC         E1000_WUFC_LNKC
-#define E1000_WUS_MAG          E1000_WUFC_MAG
-#define E1000_WUS_EX           E1000_WUFC_EX
-#define E1000_WUS_MC           E1000_WUFC_MC
-#define E1000_WUS_BC           E1000_WUFC_BC
-#define E1000_WUS_ARP          E1000_WUFC_ARP
-#define E1000_WUS_IPV4         E1000_WUFC_IPV4
-#define E1000_WUS_IPV6         E1000_WUFC_IPV6
-#define E1000_WUS_FLX0_PHY      E1000_WUFC_FLX0_PHY
-#define E1000_WUS_FLX1_PHY      E1000_WUFC_FLX1_PHY
-#define E1000_WUS_FLX2_PHY      E1000_WUFC_FLX2_PHY
-#define E1000_WUS_FLX3_PHY      E1000_WUFC_FLX3_PHY
-#define E1000_WUS_FLX_FILTERS_PHY_4        E1000_WUFC_FLX_FILTERS_PHY_4
-#define E1000_WUS_FLX0         E1000_WUFC_FLX0
-#define E1000_WUS_FLX1         E1000_WUFC_FLX1
-#define E1000_WUS_FLX2         E1000_WUFC_FLX2
-#define E1000_WUS_FLX3         E1000_WUFC_FLX3
-#define E1000_WUS_FLX4         E1000_WUFC_FLX4
-#define E1000_WUS_FLX5         E1000_WUFC_FLX5
-#define E1000_WUS_FLX4_PHY         E1000_WUFC_FLX4_PHY
-#define E1000_WUS_FLX5_PHY         E1000_WUFC_FLX5_PHY
-#define E1000_WUS_FLX_FILTERS  E1000_WUFC_FLX_FILTERS
-#define E1000_WUS_FLX_FILTERS_6  E1000_WUFC_FLX_FILTERS_6
-#define E1000_WUS_FLX_FILTERS_PHY_6  E1000_WUFC_FLX_FILTERS_PHY_6
-
-/* Wake Up Packet Length */
-#define E1000_WUPL_LENGTH_MASK 0x0FFF   /* Only the lower 12 bits are valid */
-
-/* Four Flexible Filters are supported */
-#define E1000_FLEXIBLE_FILTER_COUNT_MAX 4
-/* Six Flexible Filters are supported */
-#define E1000_FLEXIBLE_FILTER_COUNT_MAX_6   6
-
-/* Each Flexible Filter is at most 128 (0x80) bytes in length */
-#define E1000_FLEXIBLE_FILTER_SIZE_MAX  128
-
-#define E1000_FFLT_SIZE E1000_FLEXIBLE_FILTER_COUNT_MAX
-#define E1000_FFLT_SIZE_6 E1000_FLEXIBLE_FILTER_COUNT_MAX_6
-#define E1000_FFMT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
-#define E1000_FFVT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
-
-/* Extended Device Control */
-#define E1000_CTRL_EXT_GPI0_EN   0x00000001 /* Maps SDP4 to GPI0 */
-#define E1000_CTRL_EXT_GPI1_EN   0x00000002 /* Maps SDP5 to GPI1 */
-#define E1000_CTRL_EXT_PHYINT_EN E1000_CTRL_EXT_GPI1_EN
-#define E1000_CTRL_EXT_GPI2_EN   0x00000004 /* Maps SDP6 to GPI2 */
-#define E1000_CTRL_EXT_GPI3_EN   0x00000008 /* Maps SDP7 to GPI3 */
-/* Reserved (bits 4,5) in >= 82575 */
-#define E1000_CTRL_EXT_SDP4_DATA 0x00000010 /* Value of SW Definable Pin 4 */
-#define E1000_CTRL_EXT_SDP5_DATA 0x00000020 /* Value of SW Definable Pin 5 */
-#define E1000_CTRL_EXT_PHY_INT   E1000_CTRL_EXT_SDP5_DATA
-#define E1000_CTRL_EXT_SDP6_DATA 0x00000040 /* Value of SW Definable Pin 6 */
-#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */
-/* SDP 4/5 (bits 8,9) are reserved in >= 82575 */
-#define E1000_CTRL_EXT_SDP4_DIR  0x00000100 /* Direction of SDP4 0=in 1=out */
-#define E1000_CTRL_EXT_SDP5_DIR  0x00000200 /* Direction of SDP5 0=in 1=out */
-#define E1000_CTRL_EXT_SDP6_DIR  0x00000400 /* Direction of SDP6 0=in 1=out */
-#define E1000_CTRL_EXT_SDP3_DIR  0x00000800 /* Direction of SDP3 0=in 1=out */
-#define E1000_CTRL_EXT_ASDCHK    0x00001000 /* Initiate an ASD sequence */
-#define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
-#define E1000_CTRL_EXT_IPS       0x00004000 /* Invert Power State */
-#define E1000_CTRL_EXT_SPD_BYPS  0x00008000 /* Speed Select Bypass */
-#define E1000_CTRL_EXT_RO_DIS    0x00020000 /* Relaxed Ordering disable */
-#define E1000_CTRL_EXT_DMA_DYN_CLK_EN 0x00080000 /* DMA Dynamic Clock Gating */
-#define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_GMII 0x00000000
-#define E1000_CTRL_EXT_LINK_MODE_TBI  0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_KMRN    0x00000000
-#define E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES  0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_PCIX_SERDES  0x00800000
-#define E1000_CTRL_EXT_LINK_MODE_SGMII   0x00800000
-#define E1000_CTRL_EXT_EIAME          0x01000000
-#define E1000_CTRL_EXT_IRCA           0x00000001
-#define E1000_CTRL_EXT_WR_WMARK_MASK  0x03000000
-#define E1000_CTRL_EXT_WR_WMARK_256   0x00000000
-#define E1000_CTRL_EXT_WR_WMARK_320   0x01000000
-#define E1000_CTRL_EXT_WR_WMARK_384   0x02000000
-#define E1000_CTRL_EXT_WR_WMARK_448   0x03000000
-#define E1000_CTRL_EXT_CANC           0x04000000 /* Int delay cancellation */
-#define E1000_CTRL_EXT_DRV_LOAD       0x10000000 /* Driver loaded bit for FW */
-/* IAME enable bit (27) was removed in >= 82575 */
-#define E1000_CTRL_EXT_IAME          0x08000000 /* Int acknowledge Auto-mask */
-#define E1000_CRTL_EXT_PB_PAREN       0x01000000 /* packet buffer parity error
-                                                  * detection enabled */
-#define E1000_CTRL_EXT_DF_PAREN       0x02000000 /* descriptor FIFO parity
-                                                  * error detection enable */
-#define E1000_CTRL_EXT_GHOST_PAREN    0x40000000
-#define E1000_CTRL_EXT_PBA_CLR        0x80000000 /* PBA Clear */
-#define E1000_CTRL_EXT_LSECCK         0x00001000
-#define E1000_CTRL_EXT_PHYPDEN        0x00100000
-#define E1000_I2CCMD_REG_ADDR_SHIFT   16
-#define E1000_I2CCMD_REG_ADDR         0x00FF0000
-#define E1000_I2CCMD_PHY_ADDR_SHIFT   24
-#define E1000_I2CCMD_PHY_ADDR         0x07000000
-#define E1000_I2CCMD_OPCODE_READ      0x08000000
-#define E1000_I2CCMD_OPCODE_WRITE     0x00000000
-#define E1000_I2CCMD_RESET            0x10000000
-#define E1000_I2CCMD_READY            0x20000000
-#define E1000_I2CCMD_INTERRUPT_ENA    0x40000000
-#define E1000_I2CCMD_ERROR            0x80000000
-#define E1000_MAX_SGMII_PHY_REG_ADDR  255
-#define E1000_I2CCMD_PHY_TIMEOUT      200
-
-/* Receive Descriptor bit definitions */
-#define E1000_RXD_STAT_DD       0x01    /* Descriptor Done */
-#define E1000_RXD_STAT_EOP      0x02    /* End of Packet */
-#define E1000_RXD_STAT_IXSM     0x04    /* Ignore checksum */
-#define E1000_RXD_STAT_VP       0x08    /* IEEE VLAN Packet */
-#define E1000_RXD_STAT_UDPCS    0x10    /* UDP xsum calculated */
-#define E1000_RXD_STAT_TCPCS    0x20    /* TCP xsum calculated */
-#define E1000_RXD_STAT_IPCS     0x40    /* IP xsum calculated */
-#define E1000_RXD_STAT_PIF      0x80    /* passed in-exact filter */
-#define E1000_RXD_STAT_CRCV     0x100   /* Speculative CRC Valid */
-#define E1000_RXD_STAT_IPIDV    0x200   /* IP identification valid */
-#define E1000_RXD_STAT_UDPV     0x400   /* Valid UDP checksum */
-#define E1000_RXD_STAT_DYNINT   0x800   /* Pkt caused INT via DYNINT */
-#define E1000_RXD_STAT_ACK      0x8000  /* ACK Packet indication */
-#define E1000_RXD_ERR_CE        0x01    /* CRC Error */
-#define E1000_RXD_ERR_SE        0x02    /* Symbol Error */
-#define E1000_RXD_ERR_SEQ       0x04    /* Sequence Error */
-#define E1000_RXD_ERR_CXE       0x10    /* Carrier Extension Error */
-#define E1000_RXD_ERR_TCPE      0x20    /* TCP/UDP Checksum Error */
-#define E1000_RXD_ERR_IPE       0x40    /* IP Checksum Error */
-#define E1000_RXD_ERR_RXE       0x80    /* Rx Data Error */
-#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */
-#define E1000_RXD_SPC_PRI_MASK  0xE000  /* Priority is in upper 3 bits */
-#define E1000_RXD_SPC_PRI_SHIFT 13
-#define E1000_RXD_SPC_CFI_MASK  0x1000  /* CFI is bit 12 */
-#define E1000_RXD_SPC_CFI_SHIFT 12
-
-#define E1000_RXDEXT_STATERR_CE    0x01000000
-#define E1000_RXDEXT_STATERR_SE    0x02000000
-#define E1000_RXDEXT_STATERR_SEQ   0x04000000
-#define E1000_RXDEXT_STATERR_CXE   0x10000000
-#define E1000_RXDEXT_STATERR_TCPE  0x20000000
-#define E1000_RXDEXT_STATERR_IPE   0x40000000
-#define E1000_RXDEXT_STATERR_RXE   0x80000000
-
-#define E1000_RXDEXT_LSECH                0x01000000
-#define E1000_RXDEXT_LSECE_MASK           0x60000000
-#define E1000_RXDEXT_LSECE_NO_ERROR       0x00000000
-#define E1000_RXDEXT_LSECE_NO_SA_MATCH    0x20000000
-#define E1000_RXDEXT_LSECE_REPLAY_DETECT  0x40000000
-#define E1000_RXDEXT_LSECE_BAD_SIG        0x60000000
-
-/* mask to determine if packets should be dropped due to frame errors */
-#define E1000_RXD_ERR_FRAME_ERR_MASK ( \
-    E1000_RXD_ERR_CE  |                \
-    E1000_RXD_ERR_SE  |                \
-    E1000_RXD_ERR_SEQ |                \
-    E1000_RXD_ERR_CXE |                \
-    E1000_RXD_ERR_RXE)
-
-/* Same mask, but for extended and packet split descriptors */
-#define E1000_RXDEXT_ERR_FRAME_ERR_MASK ( \
-    E1000_RXDEXT_STATERR_CE  |            \
-    E1000_RXDEXT_STATERR_SE  |            \
-    E1000_RXDEXT_STATERR_SEQ |            \
-    E1000_RXDEXT_STATERR_CXE |            \
-    E1000_RXDEXT_STATERR_RXE)
-
-#define E1000_MRQC_ENABLE_MASK                 0x00000007
-#define E1000_MRQC_ENABLE_RSS_2Q               0x00000001
-#define E1000_MRQC_ENABLE_RSS_INT              0x00000004
-#define E1000_MRQC_RSS_FIELD_MASK              0xFFFF0000
-#define E1000_MRQC_RSS_FIELD_IPV4_TCP          0x00010000
-#define E1000_MRQC_RSS_FIELD_IPV4              0x00020000
-#define E1000_MRQC_RSS_FIELD_IPV6_TCP_EX       0x00040000
-#define E1000_MRQC_RSS_FIELD_IPV6_EX           0x00080000
-#define E1000_MRQC_RSS_FIELD_IPV6              0x00100000
-#define E1000_MRQC_RSS_FIELD_IPV6_TCP          0x00200000
-
-#define E1000_RXDPS_HDRSTAT_HDRSP              0x00008000
-#define E1000_RXDPS_HDRSTAT_HDRLEN_MASK        0x000003FF
-
-/* Management Control */
-#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
-#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
-#define E1000_MANC_R_ON_FORCE    0x00000004 /* Reset on Force TCO - RO */
-#define E1000_MANC_RMCP_EN       0x00000100 /* Enable RCMP 026Fh Filtering */
-#define E1000_MANC_0298_EN       0x00000200 /* Enable RCMP 0298h Filtering */
-#define E1000_MANC_IPV4_EN       0x00000400 /* Enable IPv4 */
-#define E1000_MANC_IPV6_EN       0x00000800 /* Enable IPv6 */
-#define E1000_MANC_SNAP_EN       0x00001000 /* Accept LLC/SNAP */
-#define E1000_MANC_ARP_EN        0x00002000 /* Enable ARP Request Filtering */
-/* Enable Neighbor Discovery Filtering */
-#define E1000_MANC_NEIGHBOR_EN   0x00004000
-#define E1000_MANC_ARP_RES_EN    0x00008000 /* Enable ARP response Filtering */
-#define E1000_MANC_TCO_RESET     0x00010000 /* TCO Reset Occurred */
-#define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets Enabled */
-#define E1000_MANC_REPORT_STATUS 0x00040000 /* Status Reporting Enabled */
-#define E1000_MANC_RCV_ALL       0x00080000 /* Receive All Enabled */
-#define E1000_MANC_BLK_PHY_RST_ON_IDE   0x00040000 /* Block phy resets */
-/* Enable MAC address filtering */
-#define E1000_MANC_EN_MAC_ADDR_FILTER   0x00100000
-/* Enable MNG packets to host memory */
-#define E1000_MANC_EN_MNG2HOST   0x00200000
-/* Enable IP address filtering */
-#define E1000_MANC_EN_IP_ADDR_FILTER    0x00400000
-#define E1000_MANC_EN_XSUM_FILTER   0x00800000 /* Enable checksum filtering */
-#define E1000_MANC_BR_EN            0x01000000 /* Enable broadcast filtering */
-#define E1000_MANC_SMB_REQ       0x01000000 /* SMBus Request */
-#define E1000_MANC_SMB_GNT       0x02000000 /* SMBus Grant */
-#define E1000_MANC_SMB_CLK_IN    0x04000000 /* SMBus Clock In */
-#define E1000_MANC_SMB_DATA_IN   0x08000000 /* SMBus Data In */
-#define E1000_MANC_SMB_DATA_OUT  0x10000000 /* SMBus Data Out */
-#define E1000_MANC_SMB_CLK_OUT   0x20000000 /* SMBus Clock Out */
-
-#define E1000_MANC_SMB_DATA_OUT_SHIFT  28 /* SMBus Data Out Shift */
-#define E1000_MANC_SMB_CLK_OUT_SHIFT   29 /* SMBus Clock Out Shift */
-
-/* Receive Control */
-#define E1000_RCTL_RST            0x00000001    /* Software reset */
-#define E1000_RCTL_EN             0x00000002    /* enable */
-#define E1000_RCTL_SBP            0x00000004    /* store bad packet */
-#define E1000_RCTL_UPE            0x00000008    /* unicast promisc enable */
-#define E1000_RCTL_MPE            0x00000010    /* multicast promisc enable */
-#define E1000_RCTL_LPE            0x00000020    /* long packet enable */
-#define E1000_RCTL_LBM_NO         0x00000000    /* no loopback mode */
-#define E1000_RCTL_LBM_MAC        0x00000040    /* MAC loopback mode */
-#define E1000_RCTL_LBM_SLP        0x00000080    /* serial link loopback mode */
-#define E1000_RCTL_LBM_TCVR       0x000000C0    /* tcvr loopback mode */
-#define E1000_RCTL_DTYP_MASK      0x00000C00    /* Descriptor type mask */
-#define E1000_RCTL_DTYP_PS        0x00000400    /* Packet Split descriptor */
-#define E1000_RCTL_RDMTS_HALF     0x00000000    /* rx desc min thresh size */
-#define E1000_RCTL_RDMTS_QUAT     0x00000100    /* rx desc min thresh size */
-#define E1000_RCTL_RDMTS_EIGTH    0x00000200    /* rx desc min thresh size */
-#define E1000_RCTL_MO_SHIFT       12            /* multicast offset shift */
-#define E1000_RCTL_MO_0           0x00000000    /* multicast offset 11:0 */
-#define E1000_RCTL_MO_1           0x00001000    /* multicast offset 12:1 */
-#define E1000_RCTL_MO_2           0x00002000    /* multicast offset 13:2 */
-#define E1000_RCTL_MO_3           0x00003000    /* multicast offset 15:4 */
-#define E1000_RCTL_MDR            0x00004000    /* multicast desc ring 0 */
-#define E1000_RCTL_BAM            0x00008000    /* broadcast enable */
-/* these buffer sizes are valid if E1000_RCTL_BSEX is 0 */
-#define E1000_RCTL_SZ_2048        0x00000000    /* rx buffer size 2048 */
-#define E1000_RCTL_SZ_1024        0x00010000    /* rx buffer size 1024 */
-#define E1000_RCTL_SZ_512         0x00020000    /* rx buffer size 512 */
-#define E1000_RCTL_SZ_256         0x00030000    /* rx buffer size 256 */
-/* these buffer sizes are valid if E1000_RCTL_BSEX is 1 */
-#define E1000_RCTL_SZ_16384       0x00010000    /* rx buffer size 16384 */
-#define E1000_RCTL_SZ_8192        0x00020000    /* rx buffer size 8192 */
-#define E1000_RCTL_SZ_4096        0x00030000    /* rx buffer size 4096 */
-#define E1000_RCTL_VFE            0x00040000    /* vlan filter enable */
-#define E1000_RCTL_CFIEN          0x00080000    /* canonical form enable */
-#define E1000_RCTL_CFI            0x00100000    /* canonical form indicator */
-#define E1000_RCTL_DPF            0x00400000    /* discard pause frames */
-#define E1000_RCTL_PMCF           0x00800000    /* pass MAC control frames */
-#define E1000_RCTL_BSEX           0x02000000    /* Buffer size extension */
-#define E1000_RCTL_SECRC          0x04000000    /* Strip Ethernet CRC */
-#define E1000_RCTL_FLXBUF_MASK    0x78000000    /* Flexible buffer size */
-#define E1000_RCTL_FLXBUF_SHIFT   27            /* Flexible buffer shift */
-
-/*
- * Use byte values for the following shift parameters
- * Usage:
- *     psrctl |= (((ROUNDUP(value0, 128) >> E1000_PSRCTL_BSIZE0_SHIFT) &
- *                  E1000_PSRCTL_BSIZE0_MASK) |
- *                ((ROUNDUP(value1, 1024) >> E1000_PSRCTL_BSIZE1_SHIFT) &
- *                  E1000_PSRCTL_BSIZE1_MASK) |
- *                ((ROUNDUP(value2, 1024) << E1000_PSRCTL_BSIZE2_SHIFT) &
- *                  E1000_PSRCTL_BSIZE2_MASK) |
- *                ((ROUNDUP(value3, 1024) << E1000_PSRCTL_BSIZE3_SHIFT) |;
- *                  E1000_PSRCTL_BSIZE3_MASK))
- * where value0 = [128..16256],  default=256
- *       value1 = [1024..64512], default=4096
- *       value2 = [0..64512],    default=4096
- *       value3 = [0..64512],    default=0
- */
-
-#define E1000_PSRCTL_BSIZE0_MASK   0x0000007F
-#define E1000_PSRCTL_BSIZE1_MASK   0x00003F00
-#define E1000_PSRCTL_BSIZE2_MASK   0x003F0000
-#define E1000_PSRCTL_BSIZE3_MASK   0x3F000000
-
-#define E1000_PSRCTL_BSIZE0_SHIFT  7            /* Shift _right_ 7 */
-#define E1000_PSRCTL_BSIZE1_SHIFT  2            /* Shift _right_ 2 */
-#define E1000_PSRCTL_BSIZE2_SHIFT  6            /* Shift _left_ 6 */
-#define E1000_PSRCTL_BSIZE3_SHIFT 14            /* Shift _left_ 14 */
-
-/* SWFW_SYNC Definitions */
-#define E1000_SWFW_EEP_SM   0x01
-#define E1000_SWFW_PHY0_SM  0x02
-#define E1000_SWFW_PHY1_SM  0x04
-#define E1000_SWFW_CSR_SM   0x08
-
-/* FACTPS Definitions */
-#define E1000_FACTPS_LFS    0x40000000  /* LAN Function Select */
-/* Device Control */
-#define E1000_CTRL_FD       0x00000001  /* Full duplex.0=half; 1=full */
-#define E1000_CTRL_BEM      0x00000002  /* Endian Mode.0=little,1=big */
-#define E1000_CTRL_PRIOR    0x00000004  /* Priority on PCI. 0=rx,1=fair */
-#define E1000_CTRL_GIO_MASTER_DISABLE 0x00000004 /*Blocks new Master reqs */
-#define E1000_CTRL_LRST     0x00000008  /* Link reset. 0=normal,1=reset */
-#define E1000_CTRL_TME      0x00000010  /* Test mode. 0=normal,1=test */
-#define E1000_CTRL_SLE      0x00000020  /* Serial Link on 0=dis,1=en */
-#define E1000_CTRL_ASDE     0x00000020  /* Auto-speed detect enable */
-#define E1000_CTRL_SLU      0x00000040  /* Set link up (Force Link) */
-#define E1000_CTRL_ILOS     0x00000080  /* Invert Loss-Of Signal */
-#define E1000_CTRL_SPD_SEL  0x00000300  /* Speed Select Mask */
-#define E1000_CTRL_SPD_10   0x00000000  /* Force 10Mb */
-#define E1000_CTRL_SPD_100  0x00000100  /* Force 100Mb */
-#define E1000_CTRL_SPD_1000 0x00000200  /* Force 1Gb */
-#define E1000_CTRL_BEM32    0x00000400  /* Big Endian 32 mode */
-#define E1000_CTRL_FRCSPD   0x00000800  /* Force Speed */
-#define E1000_CTRL_FRCDPX   0x00001000  /* Force Duplex */
-#define E1000_CTRL_D_UD_EN  0x00002000  /* Dock/Undock enable */
-#define E1000_CTRL_D_UD_POLARITY 0x00004000 /* Defined polarity of Dock/Undock
-                                             * indication in SDP[0] */
-#define E1000_CTRL_FORCE_PHY_RESET 0x00008000 /* Reset both PHY ports, through
-                                               * PHYRST_N pin */
-#define E1000_CTRL_EXT_LINK_EN 0x00010000 /* enable link status from external
-                                           * LINK_0 and LINK_1 pins */
-#define E1000_CTRL_SWDPIN0  0x00040000  /* SWDPIN 0 value */
-#define E1000_CTRL_SWDPIN1  0x00080000  /* SWDPIN 1 value */
-#define E1000_CTRL_SWDPIN2  0x00100000  /* SWDPIN 2 value */
-#define E1000_CTRL_SWDPIN3  0x00200000  /* SWDPIN 3 value */
-#define E1000_CTRL_SWDPIO0  0x00400000  /* SWDPIN 0 Input or output */
-#define E1000_CTRL_SWDPIO1  0x00800000  /* SWDPIN 1 input or output */
-#define E1000_CTRL_SWDPIO2  0x01000000  /* SWDPIN 2 input or output */
-#define E1000_CTRL_SWDPIO3  0x02000000  /* SWDPIN 3 input or output */
-#define E1000_CTRL_RST      0x04000000  /* Global reset */
-#define E1000_CTRL_RFCE     0x08000000  /* Receive Flow Control enable */
-#define E1000_CTRL_TFCE     0x10000000  /* Transmit flow control enable */
-#define E1000_CTRL_RTE      0x20000000  /* Routing tag enable */
-#define E1000_CTRL_VME      0x40000000  /* IEEE VLAN mode enable */
-#define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */
-#define E1000_CTRL_SW2FW_INT 0x02000000 /* Initiate an interrupt to ME */
-#define E1000_CTRL_I2C_ENA  0x02000000  /* I2C enable */
-
-/*
- * Bit definitions for the Management Data IO (MDIO) and Management Data
- * Clock (MDC) pins in the Device Control Register.
- */
-#define E1000_CTRL_PHY_RESET_DIR  E1000_CTRL_SWDPIO0
-#define E1000_CTRL_PHY_RESET      E1000_CTRL_SWDPIN0
-#define E1000_CTRL_MDIO_DIR       E1000_CTRL_SWDPIO2
-#define E1000_CTRL_MDIO           E1000_CTRL_SWDPIN2
-#define E1000_CTRL_MDC_DIR        E1000_CTRL_SWDPIO3
-#define E1000_CTRL_MDC            E1000_CTRL_SWDPIN3
-#define E1000_CTRL_PHY_RESET_DIR4 E1000_CTRL_EXT_SDP4_DIR
-#define E1000_CTRL_PHY_RESET4     E1000_CTRL_EXT_SDP4_DATA
-
-#define E1000_CONNSW_ENRGSRC             0x4
-#define E1000_PCS_CFG_PCS_EN             8
-#define E1000_PCS_LCTL_FLV_LINK_UP       1
-#define E1000_PCS_LCTL_FSV_10            0
-#define E1000_PCS_LCTL_FSV_100           2
-#define E1000_PCS_LCTL_FSV_1000          4
-#define E1000_PCS_LCTL_FDV_FULL          8
-#define E1000_PCS_LCTL_FSD               0x10
-#define E1000_PCS_LCTL_FORCE_LINK        0x20
-#define E1000_PCS_LCTL_LOW_LINK_LATCH    0x40
-#define E1000_PCS_LCTL_FORCE_FCTRL       0x80
-#define E1000_PCS_LCTL_AN_ENABLE         0x10000
-#define E1000_PCS_LCTL_AN_RESTART        0x20000
-#define E1000_PCS_LCTL_AN_TIMEOUT        0x40000
-#define E1000_PCS_LCTL_AN_SGMII_BYPASS   0x80000
-#define E1000_PCS_LCTL_AN_SGMII_TRIGGER  0x100000
-#define E1000_PCS_LCTL_FAST_LINK_TIMER   0x1000000
-#define E1000_PCS_LCTL_LINK_OK_FIX       0x2000000
-#define E1000_PCS_LCTL_CRS_ON_NI         0x4000000
-#define E1000_ENABLE_SERDES_LOOPBACK     0x0410
-
-#define E1000_PCS_LSTS_LINK_OK           1
-#define E1000_PCS_LSTS_SPEED_10          0
-#define E1000_PCS_LSTS_SPEED_100         2
-#define E1000_PCS_LSTS_SPEED_1000        4
-#define E1000_PCS_LSTS_DUPLEX_FULL       8
-#define E1000_PCS_LSTS_SYNK_OK           0x10
-#define E1000_PCS_LSTS_AN_COMPLETE       0x10000
-#define E1000_PCS_LSTS_AN_PAGE_RX        0x20000
-#define E1000_PCS_LSTS_AN_TIMED_OUT      0x40000
-#define E1000_PCS_LSTS_AN_REMOTE_FAULT   0x80000
-#define E1000_PCS_LSTS_AN_ERROR_RWS      0x100000
-
-/* Device Status */
-#define E1000_STATUS_FD         0x00000001      /* Full duplex.0=half,1=full */
-#define E1000_STATUS_LU         0x00000002      /* Link up.0=no,1=link */
-#define E1000_STATUS_FUNC_MASK  0x0000000C      /* PCI Function Mask */
-#define E1000_STATUS_FUNC_SHIFT 2
-#define E1000_STATUS_FUNC_0     0x00000000      /* Function 0 */
-#define E1000_STATUS_FUNC_1     0x00000004      /* Function 1 */
-#define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
-#define E1000_STATUS_TBIMODE    0x00000020      /* TBI mode */
-#define E1000_STATUS_SPEED_MASK 0x000000C0
-#define E1000_STATUS_SPEED_10   0x00000000      /* Speed 10Mb/s */
-#define E1000_STATUS_SPEED_100  0x00000040      /* Speed 100Mb/s */
-#define E1000_STATUS_SPEED_1000 0x00000080      /* Speed 1000Mb/s */
-#define E1000_STATUS_LAN_INIT_DONE 0x00000200  /* Lan Init Completion by NVM */
-#define E1000_STATUS_ASDV       0x00000300      /* Auto speed detect value */
-#define E1000_STATUS_PHYRA      0x00000400      /* PHY Reset Asserted */
-#define E1000_STATUS_DOCK_CI    0x00000800      /* Change in Dock/Undock state.
-                                                 * Clear on write '0'. */
-#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Master request status */
-#define E1000_STATUS_MTXCKOK    0x00000400      /* MTX clock running OK */
-#define E1000_STATUS_PCI66      0x00000800      /* In 66Mhz slot */
-#define E1000_STATUS_BUS64      0x00001000      /* In 64 bit slot */
-#define E1000_STATUS_PCIX_MODE  0x00002000      /* PCI-X mode */
-#define E1000_STATUS_PCIX_SPEED 0x0000C000      /* PCI-X bus speed */
-#define E1000_STATUS_BMC_SKU_0  0x00100000 /* BMC USB redirect disabled */
-#define E1000_STATUS_BMC_SKU_1  0x00200000 /* BMC SRAM disabled */
-#define E1000_STATUS_BMC_SKU_2  0x00400000 /* BMC SDRAM disabled */
-#define E1000_STATUS_BMC_CRYPTO 0x00800000 /* BMC crypto disabled */
-#define E1000_STATUS_BMC_LITE   0x01000000 /* BMC external code execution
-                                            * disabled */
-#define E1000_STATUS_RGMII_ENABLE 0x02000000 /* RGMII disabled */
-#define E1000_STATUS_FUSE_8       0x04000000
-#define E1000_STATUS_FUSE_9       0x08000000
-#define E1000_STATUS_SERDES0_DIS  0x10000000 /* SERDES disabled on port 0 */
-#define E1000_STATUS_SERDES1_DIS  0x20000000 /* SERDES disabled on port 1 */
-
-/* Constants used to interpret the masked PCI-X bus speed. */
-#define E1000_STATUS_PCIX_SPEED_66  0x00000000 /* PCI-X bus speed 50-66 MHz */
-#define E1000_STATUS_PCIX_SPEED_100 0x00004000 /* PCI-X bus speed 66-100 MHz */
-#define E1000_STATUS_PCIX_SPEED_133 0x00008000 /*PCI-X bus speed 100-133 MHz*/
-
-#define SPEED_10    10
-#define SPEED_100   100
-#define SPEED_1000  1000
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
-
-#define PHY_FORCE_TIME   20
-
-#define ADVERTISE_10_HALF                 0x0001
-#define ADVERTISE_10_FULL                 0x0002
-#define ADVERTISE_100_HALF                0x0004
-#define ADVERTISE_100_FULL                0x0008
-#define ADVERTISE_1000_HALF               0x0010 /* Not used, just FYI */
-#define ADVERTISE_1000_FULL               0x0020
-
-/* 1000/H is not supported, nor spec-compliant. */
-#define E1000_ALL_SPEED_DUPLEX  (ADVERTISE_10_HALF |   ADVERTISE_10_FULL | \
-                                ADVERTISE_100_HALF |  ADVERTISE_100_FULL | \
-                                                     ADVERTISE_1000_FULL)
-#define E1000_ALL_NOT_GIG       (ADVERTISE_10_HALF |   ADVERTISE_10_FULL | \
-                                ADVERTISE_100_HALF |  ADVERTISE_100_FULL)
-#define E1000_ALL_100_SPEED    (ADVERTISE_100_HALF |  ADVERTISE_100_FULL)
-#define E1000_ALL_10_SPEED      (ADVERTISE_10_HALF |   ADVERTISE_10_FULL)
-#define E1000_ALL_FULL_DUPLEX   (ADVERTISE_10_FULL |  ADVERTISE_100_FULL | \
-                                                     ADVERTISE_1000_FULL)
-#define E1000_ALL_HALF_DUPLEX   (ADVERTISE_10_HALF |  ADVERTISE_100_HALF)
-
-#define AUTONEG_ADVERTISE_SPEED_DEFAULT   E1000_ALL_SPEED_DUPLEX
-
-/* LED Control */
-#define E1000_PHY_LED0_MODE_MASK          0x00000007
-#define E1000_PHY_LED0_IVRT               0x00000008
-#define E1000_PHY_LED0_BLINK              0x00000010
-#define E1000_PHY_LED0_MASK               0x0000001F
-
-#define E1000_LEDCTL_LED0_MODE_MASK       0x0000000F
-#define E1000_LEDCTL_LED0_MODE_SHIFT      0
-#define E1000_LEDCTL_LED0_BLINK_RATE      0x00000020
-#define E1000_LEDCTL_LED0_IVRT            0x00000040
-#define E1000_LEDCTL_LED0_BLINK           0x00000080
-#define E1000_LEDCTL_LED1_MODE_MASK       0x00000F00
-#define E1000_LEDCTL_LED1_MODE_SHIFT      8
-#define E1000_LEDCTL_LED1_BLINK_RATE      0x00002000
-#define E1000_LEDCTL_LED1_IVRT            0x00004000
-#define E1000_LEDCTL_LED1_BLINK           0x00008000
-#define E1000_LEDCTL_LED2_MODE_MASK       0x000F0000
-#define E1000_LEDCTL_LED2_MODE_SHIFT      16
-#define E1000_LEDCTL_LED2_BLINK_RATE      0x00200000
-#define E1000_LEDCTL_LED2_IVRT            0x00400000
-#define E1000_LEDCTL_LED2_BLINK           0x00800000
-#define E1000_LEDCTL_LED3_MODE_MASK       0x0F000000
-#define E1000_LEDCTL_LED3_MODE_SHIFT      24
-#define E1000_LEDCTL_LED3_BLINK_RATE      0x20000000
-#define E1000_LEDCTL_LED3_IVRT            0x40000000
-#define E1000_LEDCTL_LED3_BLINK           0x80000000
-
-#define E1000_LEDCTL_MODE_LINK_10_1000  0x0
-#define E1000_LEDCTL_MODE_LINK_100_1000 0x1
-#define E1000_LEDCTL_MODE_LINK_UP       0x2
-#define E1000_LEDCTL_MODE_ACTIVITY      0x3
-#define E1000_LEDCTL_MODE_LINK_ACTIVITY 0x4
-#define E1000_LEDCTL_MODE_LINK_10       0x5
-#define E1000_LEDCTL_MODE_LINK_100      0x6
-#define E1000_LEDCTL_MODE_LINK_1000     0x7
-#define E1000_LEDCTL_MODE_PCIX_MODE     0x8
-#define E1000_LEDCTL_MODE_FULL_DUPLEX   0x9
-#define E1000_LEDCTL_MODE_COLLISION     0xA
-#define E1000_LEDCTL_MODE_BUS_SPEED     0xB
-#define E1000_LEDCTL_MODE_BUS_SIZE      0xC
-#define E1000_LEDCTL_MODE_PAUSED        0xD
-#define E1000_LEDCTL_MODE_LED_ON        0xE
-#define E1000_LEDCTL_MODE_LED_OFF       0xF
-
-/* Transmit Descriptor bit definitions */
-#define E1000_TXD_DTYP_D     0x00100000 /* Data Descriptor */
-#define E1000_TXD_DTYP_C     0x00000000 /* Context Descriptor */
-#define E1000_TXD_POPTS_SHIFT 8         /* POPTS shift */
-#define E1000_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
-#define E1000_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
-#define E1000_TXD_CMD_EOP    0x01000000 /* End of Packet */
-#define E1000_TXD_CMD_IFCS   0x02000000 /* Insert FCS (Ethernet CRC) */
-#define E1000_TXD_CMD_IC     0x04000000 /* Insert Checksum */
-#define E1000_TXD_CMD_RS     0x08000000 /* Report Status */
-#define E1000_TXD_CMD_RPS    0x10000000 /* Report Packet Sent */
-#define E1000_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
-#define E1000_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
-#define E1000_TXD_CMD_IDE    0x80000000 /* Enable Tidv register */
-#define E1000_TXD_STAT_DD    0x00000001 /* Descriptor Done */
-#define E1000_TXD_STAT_EC    0x00000002 /* Excess Collisions */
-#define E1000_TXD_STAT_LC    0x00000004 /* Late Collisions */
-#define E1000_TXD_STAT_TU    0x00000008 /* Transmit underrun */
-#define E1000_TXD_CMD_TCP    0x01000000 /* TCP packet */
-#define E1000_TXD_CMD_IP     0x02000000 /* IP packet */
-#define E1000_TXD_CMD_TSE    0x04000000 /* TCP Seg enable */
-#define E1000_TXD_STAT_TC    0x00000004 /* Tx Underrun */
-/* Extended desc bits for Linksec and timesync */
-#define E1000_TXD_CMD_LINKSEC     0x10000000 /* Apply LinkSec on packet */
-#define E1000_TXD_EXTCMD_TSTAMP   0x00000010 /* IEEE1588 Timestamp packet */
-
-/* Transmit Control */
-#define E1000_TCTL_RST    0x00000001    /* software reset */
-#define E1000_TCTL_EN     0x00000002    /* enable tx */
-#define E1000_TCTL_BCE    0x00000004    /* busy check enable */
-#define E1000_TCTL_PSP    0x00000008    /* pad short packets */
-#define E1000_TCTL_CT     0x00000ff0    /* collision threshold */
-#define E1000_TCTL_COLD   0x003ff000    /* collision distance */
-#define E1000_TCTL_SWXOFF 0x00400000    /* SW Xoff transmission */
-#define E1000_TCTL_PBE    0x00800000    /* Packet Burst Enable */
-#define E1000_TCTL_RTLC   0x01000000    /* Re-transmit on late collision */
-#define E1000_TCTL_NRTU   0x02000000    /* No Re-transmit on underrun */
-#define E1000_TCTL_MULR   0x10000000    /* Multiple request support */
-
-/* Transmit Arbitration Count */
-#define E1000_TARC0_ENABLE     0x00000400   /* Enable Tx Queue 0 */
-
-/* SerDes Control */
-#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400
-
-/* Receive Checksum Control */
-#define E1000_RXCSUM_PCSS_MASK 0x000000FF   /* Packet Checksum Start */
-#define E1000_RXCSUM_IPOFL     0x00000100   /* IPv4 checksum offload */
-#define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
-#define E1000_RXCSUM_IPV6OFL   0x00000400   /* IPv6 checksum offload */
-#define E1000_RXCSUM_CRCOFL    0x00000800   /* CRC32 offload enable */
-#define E1000_RXCSUM_IPPCSE    0x00001000   /* IP payload checksum enable */
-#define E1000_RXCSUM_PCSD      0x00002000   /* packet checksum disabled */
-
-/* Header split receive */
-#define E1000_RFCTL_ISCSI_DIS           0x00000001
-#define E1000_RFCTL_ISCSI_DWC_MASK      0x0000003E
-#define E1000_RFCTL_ISCSI_DWC_SHIFT     1
-#define E1000_RFCTL_NFSW_DIS            0x00000040
-#define E1000_RFCTL_NFSR_DIS            0x00000080
-#define E1000_RFCTL_NFS_VER_MASK        0x00000300
-#define E1000_RFCTL_NFS_VER_SHIFT       8
-#define E1000_RFCTL_IPV6_DIS            0x00000400
-#define E1000_RFCTL_IPV6_XSUM_DIS       0x00000800
-#define E1000_RFCTL_ACK_DIS             0x00001000
-#define E1000_RFCTL_ACKD_DIS            0x00002000
-#define E1000_RFCTL_IPFRSP_DIS          0x00004000
-#define E1000_RFCTL_EXTEN               0x00008000
-#define E1000_RFCTL_IPV6_EX_DIS         0x00010000
-#define E1000_RFCTL_NEW_IPV6_EXT_DIS    0x00020000
-#define E1000_RFCTL_LEF                 0x00040000
-
-/* Collision related configuration parameters */
-#define E1000_COLLISION_THRESHOLD       15
-#define E1000_CT_SHIFT                  4
-#define E1000_COLLISION_DISTANCE        63
-#define E1000_COLD_SHIFT                12
-
-/* Default values for the transmit IPG register */
-#define DEFAULT_82543_TIPG_IPGT_FIBER  9
-#define DEFAULT_82543_TIPG_IPGT_COPPER 8
-
-#define E1000_TIPG_IPGT_MASK  0x000003FF
-#define E1000_TIPG_IPGR1_MASK 0x000FFC00
-#define E1000_TIPG_IPGR2_MASK 0x3FF00000
-
-#define DEFAULT_82543_TIPG_IPGR1 8
-#define E1000_TIPG_IPGR1_SHIFT  10
-
-#define DEFAULT_82543_TIPG_IPGR2 6
-#define DEFAULT_80003ES2LAN_TIPG_IPGR2 7
-#define E1000_TIPG_IPGR2_SHIFT  20
-
-/* Ethertype field values */
-#define ETHERNET_IEEE_VLAN_TYPE 0x8100  /* 802.3ac packet */
-
-#define ETHERNET_FCS_SIZE       4
-#define MAX_JUMBO_FRAME_SIZE    0x3F00
-
-/* Extended Configuration Control and Size */
-#define E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP      0x00000020
-#define E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE       0x00000001
-#define E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE       0x00000008
-#define E1000_EXTCNF_CTRL_SWFLAG                 0x00000020
-#define E1000_EXTCNF_CTRL_GATE_PHY_CFG           0x00000080
-#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK   0x00FF0000
-#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_SHIFT          16
-#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK   0x0FFF0000
-#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT          16
-
-#define E1000_PHY_CTRL_SPD_EN             0x00000001
-#define E1000_PHY_CTRL_D0A_LPLU           0x00000002
-#define E1000_PHY_CTRL_NOND0A_LPLU        0x00000004
-#define E1000_PHY_CTRL_NOND0A_GBE_DISABLE 0x00000008
-#define E1000_PHY_CTRL_GBE_DISABLE        0x00000040
-
-#define E1000_KABGTXD_BGSQLBIAS           0x00050000
-
-/* PBA constants */
-#define E1000_PBA_6K  0x0006    /* 6KB */
-#define E1000_PBA_8K  0x0008    /* 8KB */
-#define E1000_PBA_10K 0x000A    /* 10KB */
-#define E1000_PBA_12K 0x000C    /* 12KB */
-#define E1000_PBA_14K 0x000E    /* 14KB */
-#define E1000_PBA_16K 0x0010    /* 16KB */
-#define E1000_PBA_18K 0x0012
-#define E1000_PBA_20K 0x0014
-#define E1000_PBA_22K 0x0016
-#define E1000_PBA_24K 0x0018
-#define E1000_PBA_26K 0x001A
-#define E1000_PBA_30K 0x001E
-#define E1000_PBA_32K 0x0020
-#define E1000_PBA_34K 0x0022
-#define E1000_PBA_35K 0x0023
-#define E1000_PBA_38K 0x0026
-#define E1000_PBA_40K 0x0028
-#define E1000_PBA_48K 0x0030    /* 48KB */
-#define E1000_PBA_64K 0x0040    /* 64KB */
-
-#define E1000_PBS_16K E1000_PBA_16K
-#define E1000_PBS_24K E1000_PBA_24K
-
-#define IFS_MAX       80
-#define IFS_MIN       40
-#define IFS_RATIO     4
-#define IFS_STEP      10
-#define MIN_NUM_XMITS 1000
-
-/* SW Semaphore Register */
-#define E1000_SWSM_SMBI         0x00000001 /* Driver Semaphore bit */
-#define E1000_SWSM_SWESMBI      0x00000002 /* FW Semaphore bit */
-#define E1000_SWSM_WMNG         0x00000004 /* Wake MNG Clock */
-#define E1000_SWSM_DRV_LOAD     0x00000008 /* Driver Loaded Bit */
-
-#define E1000_SWSM2_LOCK        0x00000002 /* Secondary driver semaphore bit */
-
-/* Interrupt Cause Read */
-#define E1000_ICR_TXDW          0x00000001 /* Transmit desc written back */
-#define E1000_ICR_TXQE          0x00000002 /* Transmit Queue empty */
-#define E1000_ICR_LSC           0x00000004 /* Link Status Change */
-#define E1000_ICR_RXSEQ         0x00000008 /* rx sequence error */
-#define E1000_ICR_RXDMT0        0x00000010 /* rx desc min. threshold (0) */
-#define E1000_ICR_RXO           0x00000040 /* rx overrun */
-#define E1000_ICR_RXT0          0x00000080 /* rx timer intr (ring 0) */
-#define E1000_ICR_VMMB          0x00000100 /* VM MB event */
-#define E1000_ICR_MDAC          0x00000200 /* MDIO access complete */
-#define E1000_ICR_RXCFG         0x00000400 /* Rx /c/ ordered set */
-#define E1000_ICR_GPI_EN0       0x00000800 /* GP Int 0 */
-#define E1000_ICR_GPI_EN1       0x00001000 /* GP Int 1 */
-#define E1000_ICR_GPI_EN2       0x00002000 /* GP Int 2 */
-#define E1000_ICR_GPI_EN3       0x00004000 /* GP Int 3 */
-#define E1000_ICR_TXD_LOW       0x00008000
-#define E1000_ICR_SRPD          0x00010000
-#define E1000_ICR_ACK           0x00020000 /* Receive Ack frame */
-#define E1000_ICR_MNG           0x00040000 /* Manageability event */
-#define E1000_ICR_DOCK          0x00080000 /* Dock/Undock */
-#define E1000_ICR_INT_ASSERTED  0x80000000 /* If this bit asserted, the driver
-                                            * should claim the interrupt */
-#define E1000_ICR_RXD_FIFO_PAR0 0x00100000 /* Q0 Rx desc FIFO parity error */
-#define E1000_ICR_TXD_FIFO_PAR0 0x00200000 /* Q0 Tx desc FIFO parity error */
-#define E1000_ICR_HOST_ARB_PAR 0x00400000 /* host arb read buffer parity err */
-#define E1000_ICR_PB_PAR        0x00800000 /* packet buffer parity error */
-#define E1000_ICR_RXD_FIFO_PAR1 0x01000000 /* Q1 Rx desc FIFO parity error */
-#define E1000_ICR_TXD_FIFO_PAR1 0x02000000 /* Q1 Tx desc FIFO parity error */
-#define E1000_ICR_ALL_PARITY    0x03F00000 /* all parity error bits */
-#define E1000_ICR_DSW           0x00000020 /* FW changed the status of DISSW
-                                            * bit in the FWSM */
-#define E1000_ICR_PHYINT        0x00001000 /* LAN connected device generates
-                                            * an interrupt */
-#define E1000_ICR_DOUTSYNC      0x10000000 /* NIC DMA out of sync */
-#define E1000_ICR_EPRST         0x00100000 /* ME hardware reset occurs */
-#define E1000_ICR_RXQ0          0x00100000 /* Rx Queue 0 Interrupt */
-#define E1000_ICR_RXQ1          0x00200000 /* Rx Queue 1 Interrupt */
-#define E1000_ICR_TXQ0          0x00400000 /* Tx Queue 0 Interrupt */
-#define E1000_ICR_TXQ1          0x00800000 /* Tx Queue 1 Interrupt */
-#define E1000_ICR_OTHER         0x01000000 /* Other Interrupts */
-
-/* PBA ECC Register */
-#define E1000_PBA_ECC_COUNTER_MASK  0xFFF00000 /* ECC counter mask */
-#define E1000_PBA_ECC_COUNTER_SHIFT 20         /* ECC counter shift value */
-#define E1000_PBA_ECC_CORR_EN      0x00000001 /* Enable ECC error correction */
-#define E1000_PBA_ECC_STAT_CLR      0x00000002 /* Clear ECC error counter */
-#define E1000_PBA_ECC_INT_EN     0x00000004 /* Enable ICR bit 5 on ECC error */
-
-/*
- * This defines the bits that are set in the Interrupt Mask
- * Set/Read Register.  Each bit is documented below:
- *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
- *   o RXSEQ  = Receive Sequence Error
- */
-#define POLL_IMS_ENABLE_MASK ( \
-    E1000_IMS_RXDMT0 |    \
-    E1000_IMS_RXSEQ)
-
-/*
- * This defines the bits that are set in the Interrupt Mask
- * Set/Read Register.  Each bit is documented below:
- *   o RXT0   = Receiver Timer Interrupt (ring 0)
- *   o TXDW   = Transmit Descriptor Written Back
- *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
- *   o RXSEQ  = Receive Sequence Error
- *   o LSC    = Link Status Change
- */
-#define IMS_ENABLE_MASK ( \
-    E1000_IMS_RXT0   |    \
-    E1000_IMS_TXDW   |    \
-    E1000_IMS_RXDMT0 |    \
-    E1000_IMS_RXSEQ  |    \
-    E1000_IMS_LSC)
-
-/* Interrupt Mask Set */
-#define E1000_IMS_TXDW      E1000_ICR_TXDW      /* Tx desc written back */
-#define E1000_IMS_TXQE      E1000_ICR_TXQE      /* Transmit Queue empty */
-#define E1000_IMS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_IMS_VMMB      E1000_ICR_VMMB      /* Mail box activity */
-#define E1000_IMS_RXSEQ     E1000_ICR_RXSEQ     /* rx sequence error */
-#define E1000_IMS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
-#define E1000_IMS_RXO       E1000_ICR_RXO       /* rx overrun */
-#define E1000_IMS_RXT0      E1000_ICR_RXT0      /* rx timer intr */
-#define E1000_IMS_MDAC      E1000_ICR_MDAC      /* MDIO access complete */
-#define E1000_IMS_RXCFG     E1000_ICR_RXCFG     /* Rx /c/ ordered set */
-#define E1000_IMS_GPI_EN0   E1000_ICR_GPI_EN0   /* GP Int 0 */
-#define E1000_IMS_GPI_EN1   E1000_ICR_GPI_EN1   /* GP Int 1 */
-#define E1000_IMS_GPI_EN2   E1000_ICR_GPI_EN2   /* GP Int 2 */
-#define E1000_IMS_GPI_EN3   E1000_ICR_GPI_EN3   /* GP Int 3 */
-#define E1000_IMS_TXD_LOW   E1000_ICR_TXD_LOW
-#define E1000_IMS_SRPD      E1000_ICR_SRPD
-#define E1000_IMS_ACK       E1000_ICR_ACK       /* Receive Ack frame */
-#define E1000_IMS_MNG       E1000_ICR_MNG       /* Manageability event */
-#define E1000_IMS_DOCK      E1000_ICR_DOCK      /* Dock/Undock */
-#define E1000_IMS_RXD_FIFO_PAR0 E1000_ICR_RXD_FIFO_PAR0 /* Q0 Rx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0 /* Q0 Tx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_HOST_ARB_PAR  E1000_ICR_HOST_ARB_PAR  /* host arb read buffer
-                                                         * parity error */
-#define E1000_IMS_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer parity
-                                                         * error */
-#define E1000_IMS_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* Q1 Rx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* Q1 Tx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_DSW       E1000_ICR_DSW
-#define E1000_IMS_PHYINT    E1000_ICR_PHYINT
-#define E1000_IMS_DOUTSYNC  E1000_ICR_DOUTSYNC /* NIC DMA out of sync */
-#define E1000_IMS_EPRST     E1000_ICR_EPRST
-#define E1000_IMS_RXQ0          E1000_ICR_RXQ0 /* Rx Queue 0 Interrupt */
-#define E1000_IMS_RXQ1          E1000_ICR_RXQ1 /* Rx Queue 1 Interrupt */
-#define E1000_IMS_TXQ0          E1000_ICR_TXQ0 /* Tx Queue 0 Interrupt */
-#define E1000_IMS_TXQ1          E1000_ICR_TXQ1 /* Tx Queue 1 Interrupt */
-#define E1000_IMS_OTHER         E1000_ICR_OTHER /* Other Interrupts */
-
-/* Interrupt Cause Set */
-#define E1000_ICS_TXDW      E1000_ICR_TXDW      /* Tx desc written back */
-#define E1000_ICS_TXQE      E1000_ICR_TXQE      /* Transmit Queue empty */
-#define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_ICS_RXSEQ     E1000_ICR_RXSEQ     /* rx sequence error */
-#define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
-#define E1000_ICS_RXO       E1000_ICR_RXO       /* rx overrun */
-#define E1000_ICS_RXT0      E1000_ICR_RXT0      /* rx timer intr */
-#define E1000_ICS_MDAC      E1000_ICR_MDAC      /* MDIO access complete */
-#define E1000_ICS_RXCFG     E1000_ICR_RXCFG     /* Rx /c/ ordered set */
-#define E1000_ICS_GPI_EN0   E1000_ICR_GPI_EN0   /* GP Int 0 */
-#define E1000_ICS_GPI_EN1   E1000_ICR_GPI_EN1   /* GP Int 1 */
-#define E1000_ICS_GPI_EN2   E1000_ICR_GPI_EN2   /* GP Int 2 */
-#define E1000_ICS_GPI_EN3   E1000_ICR_GPI_EN3   /* GP Int 3 */
-#define E1000_ICS_TXD_LOW   E1000_ICR_TXD_LOW
-#define E1000_ICS_SRPD      E1000_ICR_SRPD
-#define E1000_ICS_ACK       E1000_ICR_ACK       /* Receive Ack frame */
-#define E1000_ICS_MNG       E1000_ICR_MNG       /* Manageability event */
-#define E1000_ICS_DOCK      E1000_ICR_DOCK      /* Dock/Undock */
-#define E1000_ICS_RXD_FIFO_PAR0 E1000_ICR_RXD_FIFO_PAR0 /* Q0 Rx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0 /* Q0 Tx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_HOST_ARB_PAR  E1000_ICR_HOST_ARB_PAR  /* host arb read buffer
-                                                         * parity error */
-#define E1000_ICS_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer parity
-                                                         * error */
-#define E1000_ICS_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* Q1 Rx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* Q1 Tx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_DSW       E1000_ICR_DSW
-#define E1000_ICS_DOUTSYNC  E1000_ICR_DOUTSYNC /* NIC DMA out of sync */
-#define E1000_ICS_PHYINT    E1000_ICR_PHYINT
-#define E1000_ICS_EPRST     E1000_ICR_EPRST
-
-/* Transmit Descriptor Control */
-#define E1000_TXDCTL_PTHRESH 0x0000003F /* TXDCTL Prefetch Threshold */
-#define E1000_TXDCTL_HTHRESH 0x00003F00 /* TXDCTL Host Threshold */
-#define E1000_TXDCTL_WTHRESH 0x003F0000 /* TXDCTL Writeback Threshold */
-#define E1000_TXDCTL_GRAN    0x01000000 /* TXDCTL Granularity */
-#define E1000_TXDCTL_LWTHRESH 0xFE000000 /* TXDCTL Low Threshold */
-#define E1000_TXDCTL_FULL_TX_DESC_WB 0x01010000 /* GRAN=1, WTHRESH=1 */
-#define E1000_TXDCTL_MAX_TX_DESC_PREFETCH 0x0100001F /* GRAN=1, PTHRESH=31 */
-/* Enable the counting of descriptors still to be processed. */
-#define E1000_TXDCTL_COUNT_DESC 0x00400000
-
-/* Flow Control Constants */
-#define FLOW_CONTROL_ADDRESS_LOW  0x00C28001
-#define FLOW_CONTROL_ADDRESS_HIGH 0x00000100
-#define FLOW_CONTROL_TYPE         0x8808
-
-/* 802.1q VLAN Packet Size */
-#define VLAN_TAG_SIZE              4    /* 802.3ac tag (not DMA'd) */
-#define E1000_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */
-
-/* Receive Address */
-/*
- * Number of high/low register pairs in the RAR. The RAR (Receive Address
- * Registers) holds the directed and multicast addresses that we monitor.
- * Technically, we have 16 spots.  However, we reserve one of these spots
- * (RAR[15]) for our directed address used by controllers with
- * manageability enabled, allowing us room for 15 multicast addresses.
- */
-#define E1000_RAR_ENTRIES     15
-#define E1000_RAH_AV  0x80000000        /* Receive descriptor valid */
-#define E1000_RAL_MAC_ADDR_LEN 4
-#define E1000_RAH_MAC_ADDR_LEN 2
-#define E1000_RAH_POOL_MASK 0x03FC0000
-#define E1000_RAH_POOL_1 0x00040000
-
-/* Error Codes */
-#define E1000_SUCCESS      0
-#define E1000_ERR_NVM      1
-#define E1000_ERR_PHY      2
-#define E1000_ERR_CONFIG   3
-#define E1000_ERR_PARAM    4
-#define E1000_ERR_MAC_INIT 5
-#define E1000_ERR_PHY_TYPE 6
-#define E1000_ERR_RESET   9
-#define E1000_ERR_MASTER_REQUESTS_PENDING 10
-#define E1000_ERR_HOST_INTERFACE_COMMAND 11
-#define E1000_BLK_PHY_RESET   12
-#define E1000_ERR_SWFW_SYNC 13
-#define E1000_NOT_IMPLEMENTED 14
-#define E1000_ERR_MBX      15
-
-/* Loop limit on how long we wait for auto-negotiation to complete */
-#define FIBER_LINK_UP_LIMIT               50
-#define COPPER_LINK_UP_LIMIT              10
-#define PHY_AUTO_NEG_LIMIT                45
-#define PHY_FORCE_LIMIT                   20
-/* Number of 100 microseconds we wait for PCI Express master disable */
-#define MASTER_DISABLE_TIMEOUT      800
-/* Number of milliseconds we wait for PHY configuration done after MAC reset */
-#define PHY_CFG_TIMEOUT             100
-/* Number of 2 milliseconds we wait for acquiring MDIO ownership. */
-#define MDIO_OWNERSHIP_TIMEOUT      10
-/* Number of milliseconds for NVM auto read done after MAC reset. */
-#define AUTO_READ_DONE_TIMEOUT      10
-
-/* Flow Control */
-#define E1000_FCRTH_RTH  0x0000FFF8     /* Mask Bits[15:3] for RTH */
-#define E1000_FCRTH_XFCE 0x80000000     /* External Flow Control Enable */
-#define E1000_FCRTL_RTL  0x0000FFF8     /* Mask Bits[15:3] for RTL */
-#define E1000_FCRTL_XONE 0x80000000     /* Enable XON frame transmission */
-
-/* Transmit Configuration Word */
-#define E1000_TXCW_FD         0x00000020        /* TXCW full duplex */
-#define E1000_TXCW_HD         0x00000040        /* TXCW half duplex */
-#define E1000_TXCW_PAUSE      0x00000080        /* TXCW sym pause request */
-#define E1000_TXCW_ASM_DIR    0x00000100        /* TXCW astm pause direction */
-#define E1000_TXCW_PAUSE_MASK 0x00000180        /* TXCW pause request mask */
-#define E1000_TXCW_RF         0x00003000        /* TXCW remote fault */
-#define E1000_TXCW_NP         0x00008000        /* TXCW next page */
-#define E1000_TXCW_CW         0x0000ffff        /* TxConfigWord mask */
-#define E1000_TXCW_TXC        0x40000000        /* Transmit Config control */
-#define E1000_TXCW_ANE        0x80000000        /* Auto-neg enable */
-
-/* Receive Configuration Word */
-#define E1000_RXCW_CW         0x0000ffff        /* RxConfigWord mask */
-#define E1000_RXCW_NC         0x04000000        /* Receive config no carrier */
-#define E1000_RXCW_IV         0x08000000        /* Receive config invalid */
-#define E1000_RXCW_CC         0x10000000        /* Receive config change */
-#define E1000_RXCW_C          0x20000000        /* Receive config */
-#define E1000_RXCW_SYNCH      0x40000000        /* Receive config synch */
-#define E1000_RXCW_ANC        0x80000000        /* Auto-neg complete */
-
-
-/* PCI Express Control */
-#define E1000_GCR_RXD_NO_SNOOP          0x00000001
-#define E1000_GCR_RXDSCW_NO_SNOOP       0x00000002
-#define E1000_GCR_RXDSCR_NO_SNOOP       0x00000004
-#define E1000_GCR_TXD_NO_SNOOP          0x00000008
-#define E1000_GCR_TXDSCW_NO_SNOOP       0x00000010
-#define E1000_GCR_TXDSCR_NO_SNOOP       0x00000020
-#define E1000_GCR_CMPL_TMOUT_MASK       0x0000F000
-#define E1000_GCR_CMPL_TMOUT_10ms       0x00001000
-#define E1000_GCR_CMPL_TMOUT_RESEND     0x00010000
-#define E1000_GCR_CAP_VER2              0x00040000
-
-#define PCIE_NO_SNOOP_ALL (E1000_GCR_RXD_NO_SNOOP         | \
-                           E1000_GCR_RXDSCW_NO_SNOOP      | \
-                           E1000_GCR_RXDSCR_NO_SNOOP      | \
-                           E1000_GCR_TXD_NO_SNOOP         | \
-                           E1000_GCR_TXDSCW_NO_SNOOP      | \
-                           E1000_GCR_TXDSCR_NO_SNOOP)
-
-/* PHY Control Register */
-#define MII_CR_SPEED_SELECT_MSB 0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_COLL_TEST_ENABLE 0x0080  /* Collision test enable */
-#define MII_CR_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */
-#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */
-#define MII_CR_ISOLATE          0x0400  /* Isolate PHY from MII */
-#define MII_CR_POWER_DOWN       0x0800  /* Power down */
-#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */
-#define MII_CR_SPEED_SELECT_LSB 0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_LOOPBACK         0x4000  /* 0 = normal, 1 = loopback */
-#define MII_CR_RESET            0x8000  /* 0 = normal, 1 = PHY reset */
-#define MII_CR_SPEED_1000       0x0040
-#define MII_CR_SPEED_100        0x2000
-#define MII_CR_SPEED_10         0x0000
-
-/* PHY Status Register */
-#define MII_SR_EXTENDED_CAPS     0x0001 /* Extended register capabilities */
-#define MII_SR_JABBER_DETECT     0x0002 /* Jabber Detected */
-#define MII_SR_LINK_STATUS       0x0004 /* Link Status 1 = link */
-#define MII_SR_AUTONEG_CAPS      0x0008 /* Auto Neg Capable */
-#define MII_SR_REMOTE_FAULT      0x0010 /* Remote Fault Detect */
-#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
-#define MII_SR_PREAMBLE_SUPPRESS 0x0040 /* Preamble may be suppressed */
-#define MII_SR_EXTENDED_STATUS   0x0100 /* Ext. status info in Reg 0x0F */
-#define MII_SR_100T2_HD_CAPS     0x0200 /* 100T2 Half Duplex Capable */
-#define MII_SR_100T2_FD_CAPS     0x0400 /* 100T2 Full Duplex Capable */
-#define MII_SR_10T_HD_CAPS       0x0800 /* 10T   Half Duplex Capable */
-#define MII_SR_10T_FD_CAPS       0x1000 /* 10T   Full Duplex Capable */
-#define MII_SR_100X_HD_CAPS      0x2000 /* 100X  Half Duplex Capable */
-#define MII_SR_100X_FD_CAPS      0x4000 /* 100X  Full Duplex Capable */
-#define MII_SR_100T4_CAPS        0x8000 /* 100T4 Capable */
-
-/* Autoneg Advertisement Register */
-#define NWAY_AR_SELECTOR_FIELD   0x0001   /* indicates IEEE 802.3 CSMA/CD */
-#define NWAY_AR_10T_HD_CAPS      0x0020   /* 10T   Half Duplex Capable */
-#define NWAY_AR_10T_FD_CAPS      0x0040   /* 10T   Full Duplex Capable */
-#define NWAY_AR_100TX_HD_CAPS    0x0080   /* 100TX Half Duplex Capable */
-#define NWAY_AR_100TX_FD_CAPS    0x0100   /* 100TX Full Duplex Capable */
-#define NWAY_AR_100T4_CAPS       0x0200   /* 100T4 Capable */
-#define NWAY_AR_PAUSE            0x0400   /* Pause operation desired */
-#define NWAY_AR_ASM_DIR          0x0800   /* Asymmetric Pause Direction bit */
-#define NWAY_AR_REMOTE_FAULT     0x2000   /* Remote Fault detected */
-#define NWAY_AR_NEXT_PAGE        0x8000   /* Next Page ability supported */
-
-/* Link Partner Ability Register (Base Page) */
-#define NWAY_LPAR_SELECTOR_FIELD 0x0000 /* LP protocol selector field */
-#define NWAY_LPAR_10T_HD_CAPS    0x0020 /* LP is 10T   Half Duplex Capable */
-#define NWAY_LPAR_10T_FD_CAPS    0x0040 /* LP is 10T   Full Duplex Capable */
-#define NWAY_LPAR_100TX_HD_CAPS  0x0080 /* LP is 100TX Half Duplex Capable */
-#define NWAY_LPAR_100TX_FD_CAPS  0x0100 /* LP is 100TX Full Duplex Capable */
-#define NWAY_LPAR_100T4_CAPS     0x0200 /* LP is 100T4 Capable */
-#define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
-#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
-#define NWAY_LPAR_REMOTE_FAULT   0x2000 /* LP has detected Remote Fault */
-#define NWAY_LPAR_ACKNOWLEDGE    0x4000 /* LP has rx'd link code word */
-#define NWAY_LPAR_NEXT_PAGE      0x8000 /* Next Page ability supported */
-
-/* Autoneg Expansion Register */
-#define NWAY_ER_LP_NWAY_CAPS      0x0001 /* LP has Auto Neg Capability */
-#define NWAY_ER_PAGE_RXD          0x0002 /* LP is 10T   Half Duplex Capable */
-#define NWAY_ER_NEXT_PAGE_CAPS    0x0004 /* LP is 10T   Full Duplex Capable */
-#define NWAY_ER_LP_NEXT_PAGE_CAPS 0x0008 /* LP is 100TX Half Duplex Capable */
-#define NWAY_ER_PAR_DETECT_FAULT  0x0010 /* LP is 100TX Full Duplex Capable */
-
-/* 1000BASE-T Control Register */
-#define CR_1000T_ASYM_PAUSE      0x0080 /* Advertise asymmetric pause bit */
-#define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
-#define CR_1000T_FD_CAPS         0x0200 /* Advertise 1000T FD capability  */
-#define CR_1000T_REPEATER_DTE    0x0400 /* 1=Repeater/switch device port */
-                                        /* 0=DTE device */
-#define CR_1000T_MS_VALUE        0x0800 /* 1=Configure PHY as Master */
-                                        /* 0=Configure PHY as Slave */
-#define CR_1000T_MS_ENABLE      0x1000 /* 1=Master/Slave manual config value */
-                                        /* 0=Automatic Master/Slave config */
-#define CR_1000T_TEST_MODE_NORMAL 0x0000 /* Normal Operation */
-#define CR_1000T_TEST_MODE_1     0x2000 /* Transmit Waveform test */
-#define CR_1000T_TEST_MODE_2     0x4000 /* Master Transmit Jitter test */
-#define CR_1000T_TEST_MODE_3     0x6000 /* Slave Transmit Jitter test */
-#define CR_1000T_TEST_MODE_4     0x8000 /* Transmitter Distortion test */
-
-/* 1000BASE-T Status Register */
-#define SR_1000T_IDLE_ERROR_CNT   0x00FF /* Num idle errors since last read */
-#define SR_1000T_ASYM_PAUSE_DIR  0x0100 /* LP asymmetric pause direction bit */
-#define SR_1000T_LP_HD_CAPS       0x0400 /* LP is 1000T HD capable */
-#define SR_1000T_LP_FD_CAPS       0x0800 /* LP is 1000T FD capable */
-#define SR_1000T_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
-#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
-#define SR_1000T_MS_CONFIG_RES    0x4000 /* 1=Local Tx is Master, 0=Slave */
-#define SR_1000T_MS_CONFIG_FAULT  0x8000 /* Master/Slave config fault */
-
-#define SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT 5
-
-/* PHY 1000 MII Register/Bit Definitions */
-/* PHY Registers defined by IEEE */
-#define PHY_CONTROL      0x00 /* Control Register */
-#define PHY_STATUS       0x01 /* Status Register */
-#define PHY_ID1          0x02 /* Phy Id Reg (word 1) */
-#define PHY_ID2          0x03 /* Phy Id Reg (word 2) */
-#define PHY_AUTONEG_ADV  0x04 /* Autoneg Advertisement */
-#define PHY_LP_ABILITY   0x05 /* Link Partner Ability (Base Page) */
-#define PHY_AUTONEG_EXP  0x06 /* Autoneg Expansion Reg */
-#define PHY_NEXT_PAGE_TX 0x07 /* Next Page Tx */
-#define PHY_LP_NEXT_PAGE 0x08 /* Link Partner Next Page */
-#define PHY_1000T_CTRL   0x09 /* 1000Base-T Control Reg */
-#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */
-#define PHY_EXT_STATUS   0x0F /* Extended Status Reg */
-
-#define PHY_CONTROL_LB   0x4000 /* PHY Loopback bit */
-
-/* NVM Control */
-#define E1000_EECD_SK        0x00000001 /* NVM Clock */
-#define E1000_EECD_CS        0x00000002 /* NVM Chip Select */
-#define E1000_EECD_DI        0x00000004 /* NVM Data In */
-#define E1000_EECD_DO        0x00000008 /* NVM Data Out */
-#define E1000_EECD_FWE_MASK  0x00000030
-#define E1000_EECD_FWE_DIS   0x00000010 /* Disable FLASH writes */
-#define E1000_EECD_FWE_EN    0x00000020 /* Enable FLASH writes */
-#define E1000_EECD_FWE_SHIFT 4
-#define E1000_EECD_REQ       0x00000040 /* NVM Access Request */
-#define E1000_EECD_GNT       0x00000080 /* NVM Access Grant */
-#define E1000_EECD_PRES      0x00000100 /* NVM Present */
-#define E1000_EECD_SIZE      0x00000200 /* NVM Size (0=64 word 1=256 word) */
-/* NVM Addressing bits based on type 0=small, 1=large */
-#define E1000_EECD_ADDR_BITS 0x00000400
-#define E1000_EECD_TYPE      0x00002000 /* NVM Type (1-SPI, 0-Microwire) */
-#define E1000_NVM_GRANT_ATTEMPTS   1000 /* NVM # attempts to gain grant */
-#define E1000_EECD_AUTO_RD          0x00000200  /* NVM Auto Read done */
-#define E1000_EECD_SIZE_EX_MASK     0x00007800  /* NVM Size */
-#define E1000_EECD_SIZE_EX_SHIFT     11
-#define E1000_EECD_NVADDS    0x00018000 /* NVM Address Size */
-#define E1000_EECD_SELSHAD   0x00020000 /* Select Shadow RAM */
-#define E1000_EECD_INITSRAM  0x00040000 /* Initialize Shadow RAM */
-#define E1000_EECD_FLUPD     0x00080000 /* Update FLASH */
-#define E1000_EECD_AUPDEN    0x00100000 /* Enable Autonomous FLASH update */
-#define E1000_EECD_SHADV     0x00200000 /* Shadow RAM Data Valid */
-#define E1000_EECD_SEC1VAL   0x00400000 /* Sector One Valid */
-#define E1000_EECD_SECVAL_SHIFT      22
-#define E1000_EECD_SEC1VAL_VALID_MASK (E1000_EECD_AUTO_RD | E1000_EECD_PRES)
-
-#define E1000_NVM_SWDPIN0   0x0001   /* SWDPIN 0 NVM Value */
-#define E1000_NVM_LED_LOGIC 0x0020   /* Led Logic Word */
-#define E1000_NVM_RW_REG_DATA   16  /* Offset to data in NVM read/write regs */
-#define E1000_NVM_RW_REG_DONE   2    /* Offset to READ/WRITE done bit */
-#define E1000_NVM_RW_REG_START  1    /* Start operation */
-#define E1000_NVM_RW_ADDR_SHIFT 2    /* Shift to the address bits */
-#define E1000_NVM_POLL_WRITE    1    /* Flag for polling for write complete */
-#define E1000_NVM_POLL_READ     0    /* Flag for polling for read complete */
-#define E1000_FLASH_UPDATES  2000
-
-/* NVM Word Offsets */
-#define NVM_COMPAT                 0x0003
-#define NVM_ID_LED_SETTINGS        0x0004
-#define NVM_VERSION                0x0005
-#define NVM_SERDES_AMPLITUDE       0x0006 /* SERDES output amplitude */
-#define NVM_PHY_CLASS_WORD         0x0007
-#define NVM_INIT_CONTROL1_REG      0x000A
-#define NVM_INIT_CONTROL2_REG      0x000F
-#define NVM_SWDEF_PINS_CTRL_PORT_1 0x0010
-#define NVM_INIT_CONTROL3_PORT_B   0x0014
-#define NVM_INIT_3GIO_3            0x001A
-#define NVM_SWDEF_PINS_CTRL_PORT_0 0x0020
-#define NVM_INIT_CONTROL3_PORT_A   0x0024
-#define NVM_CFG                    0x0012
-#define NVM_FLASH_VERSION          0x0032
-#define NVM_ALT_MAC_ADDR_PTR       0x0037
-#define NVM_CHECKSUM_REG           0x003F
-
-#define E1000_NVM_CFG_DONE_PORT_0  0x040000 /* MNG config cycle done */
-#define E1000_NVM_CFG_DONE_PORT_1  0x080000 /* ...for second port */
-
-/* Mask bits for fields in Word 0x0f of the NVM */
-#define NVM_WORD0F_PAUSE_MASK       0x3000
-#define NVM_WORD0F_PAUSE            0x1000
-#define NVM_WORD0F_ASM_DIR          0x2000
-#define NVM_WORD0F_ANE              0x0800
-#define NVM_WORD0F_SWPDIO_EXT_MASK  0x00F0
-#define NVM_WORD0F_LPLU             0x0001
-
-/* Mask bits for fields in Word 0x1a of the NVM */
-#define NVM_WORD1A_ASPM_MASK  0x000C
-
-/* For checksumming, the sum of all words in the NVM should equal 0xBABA. */
-#define NVM_SUM                    0xBABA
-
-#define NVM_MAC_ADDR_OFFSET        0
-#define NVM_PBA_OFFSET_0           8
-#define NVM_PBA_OFFSET_1           9
-#define NVM_RESERVED_WORD          0xFFFF
-#define NVM_PHY_CLASS_A            0x8000
-#define NVM_SERDES_AMPLITUDE_MASK  0x000F
-#define NVM_SIZE_MASK              0x1C00
-#define NVM_SIZE_SHIFT             10
-#define NVM_WORD_SIZE_BASE_SHIFT   6
-#define NVM_SWDPIO_EXT_SHIFT       4
-
-/* NVM Commands - SPI */
-#define NVM_MAX_RETRY_SPI          5000 /* Max wait of 5ms, for RDY signal */
-#define NVM_READ_OPCODE_SPI        0x03 /* NVM read opcode */
-#define NVM_WRITE_OPCODE_SPI       0x02 /* NVM write opcode */
-#define NVM_A8_OPCODE_SPI          0x08 /* opcode bit-3 = address bit-8 */
-#define NVM_WREN_OPCODE_SPI        0x06 /* NVM set Write Enable latch */
-#define NVM_WRDI_OPCODE_SPI        0x04 /* NVM reset Write Enable latch */
-#define NVM_RDSR_OPCODE_SPI        0x05 /* NVM read Status register */
-#define NVM_WRSR_OPCODE_SPI        0x01 /* NVM write Status register */
-
-/* SPI NVM Status Register */
-#define NVM_STATUS_RDY_SPI         0x01
-#define NVM_STATUS_WEN_SPI         0x02
-#define NVM_STATUS_BP0_SPI         0x04
-#define NVM_STATUS_BP1_SPI         0x08
-#define NVM_STATUS_WPEN_SPI        0x80
-
-/* Word definitions for ID LED Settings */
-#define ID_LED_RESERVED_0000 0x0000
-#define ID_LED_RESERVED_FFFF 0xFFFF
-#define ID_LED_DEFAULT       ((ID_LED_OFF1_ON2  << 12) | \
-                              (ID_LED_OFF1_OFF2 <<  8) | \
-                              (ID_LED_DEF1_DEF2 <<  4) | \
-                              (ID_LED_DEF1_DEF2))
-#define ID_LED_DEF1_DEF2     0x1
-#define ID_LED_DEF1_ON2      0x2
-#define ID_LED_DEF1_OFF2     0x3
-#define ID_LED_ON1_DEF2      0x4
-#define ID_LED_ON1_ON2       0x5
-#define ID_LED_ON1_OFF2      0x6
-#define ID_LED_OFF1_DEF2     0x7
-#define ID_LED_OFF1_ON2      0x8
-#define ID_LED_OFF1_OFF2     0x9
-
-#define IGP_ACTIVITY_LED_MASK   0xFFFFF0FF
-#define IGP_ACTIVITY_LED_ENABLE 0x0300
-#define IGP_LED3_MODE           0x07000000
-
-/* PCI/PCI-X/PCI-EX Config space */
-#define PCI_HEADER_TYPE_REGISTER     0x0E
-#define PCIE_LINK_STATUS             0x12
-#define PCIE_DEVICE_CONTROL2         0x28
-
-#define PCI_HEADER_TYPE_MULTIFUNC    0x80
-#define PCIE_LINK_WIDTH_MASK         0x3F0
-#define PCIE_LINK_WIDTH_SHIFT        4
-#define PCIE_DEVICE_CONTROL2_16ms    0x0005
-
-#ifndef ETH_ADDR_LEN
-#define ETH_ADDR_LEN                 6
-#endif
-
-#define PHY_REVISION_MASK      0xFFFFFFF0
-#define MAX_PHY_REG_ADDRESS    0x1F  /* 5 bit address bus (0-0x1F) */
-#define MAX_PHY_MULTI_PAGE_REG 0xF
-
-/* Bit definitions for valid PHY IDs. */
-/*
- * I = Integrated
- * E = External
- */
-#define M88E1000_E_PHY_ID    0x01410C50
-#define M88E1000_I_PHY_ID    0x01410C30
-#define M88E1011_I_PHY_ID    0x01410C20
-#define IGP01E1000_I_PHY_ID  0x02A80380
-#define M88E1011_I_REV_4     0x04
-#define M88E1111_I_PHY_ID    0x01410CC0
-#define GG82563_E_PHY_ID     0x01410CA0
-#define IGP03E1000_E_PHY_ID  0x02A80390
-#define IFE_E_PHY_ID         0x02A80330
-#define IFE_PLUS_E_PHY_ID    0x02A80320
-#define IFE_C_E_PHY_ID       0x02A80310
-#define BME1000_E_PHY_ID     0x01410CB0
-#define BME1000_E_PHY_ID_R2  0x01410CB1
-#define I82577_E_PHY_ID 0x01540050
-#define I82578_E_PHY_ID 0x004DD040
-#define I82579_E_PHY_ID      0x01540090
-#define M88_VENDOR           0x0141
-
-/* M88E1000 Specific Registers */
-#define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */
-#define M88E1000_PHY_SPEC_STATUS   0x11  /* PHY Specific Status Register */
-#define M88E1000_INT_ENABLE        0x12  /* Interrupt Enable Register */
-#define M88E1000_INT_STATUS        0x13  /* Interrupt Status Register */
-#define M88E1000_EXT_PHY_SPEC_CTRL 0x14  /* Extended PHY Specific Control */
-#define M88E1000_RX_ERR_CNTR       0x15  /* Receive Error Counter */
-
-#define M88E1000_PHY_EXT_CTRL      0x1A  /* PHY extend control register */
-#define M88E1000_PHY_PAGE_SELECT   0x1D  /* Reg 29 for page number setting */
-#define M88E1000_PHY_GEN_CONTROL   0x1E  /* Its meaning depends on reg 29 */
-#define M88E1000_PHY_VCO_REG_BIT8  0x100 /* Bits 8 & 11 are adjusted for */
-#define M88E1000_PHY_VCO_REG_BIT11 0x800    /* improved BER performance */
-
-/* M88E1000 PHY Specific Control Register */
-#define M88E1000_PSCR_JABBER_DISABLE    0x0001 /* 1=Jabber Function disabled */
-#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reverse enabled */
-#define M88E1000_PSCR_SQE_TEST          0x0004 /* 1=SQE Test enabled */
-/* 1=CLK125 low, 0=CLK125 toggling */
-#define M88E1000_PSCR_CLK125_DISABLE    0x0010
-#define M88E1000_PSCR_MDI_MANUAL_MODE  0x0000 /* MDI Crossover Mode bits 6:5 */
-                                               /* Manual MDI configuration */
-#define M88E1000_PSCR_MDIX_MANUAL_MODE 0x0020  /* Manual MDIX configuration */
-/* 1000BASE-T: Auto crossover, 100BASE-TX/10BASE-T: MDI Mode */
-#define M88E1000_PSCR_AUTO_X_1000T     0x0040
-/* Auto crossover enabled all speeds */
-#define M88E1000_PSCR_AUTO_X_MODE      0x0060
-/*
- * 1=Enable Extended 10BASE-T distance (Lower 10BASE-T Rx Threshold
- * 0=Normal 10BASE-T Rx Threshold
- */
-#define M88E1000_PSCR_EN_10BT_EXT_DIST 0x0080
-/* 1=5-bit interface in 100BASE-TX, 0=MII interface in 100BASE-TX */
-#define M88E1000_PSCR_MII_5BIT_ENABLE      0x0100
-#define M88E1000_PSCR_SCRAMBLER_DISABLE    0x0200 /* 1=Scrambler disable */
-#define M88E1000_PSCR_FORCE_LINK_GOOD      0x0400 /* 1=Force link good */
-#define M88E1000_PSCR_ASSERT_CRS_ON_TX     0x0800 /* 1=Assert CRS on Tx */
-
-/* M88E1000 PHY Specific Status Register */
-#define M88E1000_PSSR_JABBER             0x0001 /* 1=Jabber */
-#define M88E1000_PSSR_REV_POLARITY       0x0002 /* 1=Polarity reversed */
-#define M88E1000_PSSR_DOWNSHIFT          0x0020 /* 1=Downshifted */
-#define M88E1000_PSSR_MDIX               0x0040 /* 1=MDIX; 0=MDI */
-/*
- * 0 = <50M
- * 1 = 50-80M
- * 2 = 80-110M
- * 3 = 110-140M
- * 4 = >140M
- */
-#define M88E1000_PSSR_CABLE_LENGTH       0x0380
-#define M88E1000_PSSR_LINK               0x0400 /* 1=Link up, 0=Link down */
-#define M88E1000_PSSR_SPD_DPLX_RESOLVED  0x0800 /* 1=Speed & Duplex resolved */
-#define M88E1000_PSSR_PAGE_RCVD          0x1000 /* 1=Page received */
-#define M88E1000_PSSR_DPLX               0x2000 /* 1=Duplex 0=Half Duplex */
-#define M88E1000_PSSR_SPEED              0xC000 /* Speed, bits 14:15 */
-#define M88E1000_PSSR_10MBS              0x0000 /* 00=10Mbs */
-#define M88E1000_PSSR_100MBS             0x4000 /* 01=100Mbs */
-#define M88E1000_PSSR_1000MBS            0x8000 /* 10=1000Mbs */
-
-#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
-
-/* M88E1000 Extended PHY Specific Control Register */
-#define M88E1000_EPSCR_FIBER_LOOPBACK 0x4000 /* 1=Fiber loopback */
-/*
- * 1 = Lost lock detect enabled.
- * Will assert lost lock and bring
- * link down if idle not seen
- * within 1ms in 1000BASE-T
- */
-#define M88E1000_EPSCR_DOWN_NO_IDLE   0x8000
-/*
- * Number of times we will attempt to autonegotiate before downshifting if we
- * are the master
- */
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK 0x0C00
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_1X   0x0000
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_2X   0x0400
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_3X   0x0800
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_4X   0x0C00
-/*
- * Number of times we will attempt to autonegotiate before downshifting if we
- * are the slave
- */
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK  0x0300
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_DIS   0x0000
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X    0x0100
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_2X    0x0200
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_3X    0x0300
-#define M88E1000_EPSCR_TX_CLK_2_5     0x0060 /* 2.5 MHz TX_CLK */
-#define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
-#define M88E1000_EPSCR_TX_CLK_0       0x0000 /* NO  TX_CLK */
-
-/* M88EC018 Rev 2 specific DownShift settings */
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK  0x0E00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_1X    0x0000
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_2X    0x0200
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_3X    0x0400
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_4X    0x0600
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_6X    0x0A00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_7X    0x0C00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_8X    0x0E00
-
-#define I82578_EPSCR_DOWNSHIFT_ENABLE          0x0020
-#define I82578_EPSCR_DOWNSHIFT_COUNTER_MASK    0x001C
-
-/* BME1000 PHY Specific Control Register */
-#define BME1000_PSCR_ENABLE_DOWNSHIFT   0x0800 /* 1 = enable downshift */
-
-/*
- * Bits...
- * 15-5: page
- * 4-0: register offset
- */
-#define GG82563_PAGE_SHIFT        5
-#define GG82563_REG(page, reg)    \
-        (((page) << GG82563_PAGE_SHIFT) | ((reg) & MAX_PHY_REG_ADDRESS))
-#define GG82563_MIN_ALT_REG       30
-
-/* GG82563 Specific Registers */
-#define GG82563_PHY_SPEC_CTRL           \
-        GG82563_REG(0, 16) /* PHY Specific Control */
-#define GG82563_PHY_SPEC_STATUS         \
-        GG82563_REG(0, 17) /* PHY Specific Status */
-#define GG82563_PHY_INT_ENABLE          \
-        GG82563_REG(0, 18) /* Interrupt Enable */
-#define GG82563_PHY_SPEC_STATUS_2       \
-        GG82563_REG(0, 19) /* PHY Specific Status 2 */
-#define GG82563_PHY_RX_ERR_CNTR         \
-        GG82563_REG(0, 21) /* Receive Error Counter */
-#define GG82563_PHY_PAGE_SELECT         \
-        GG82563_REG(0, 22) /* Page Select */
-#define GG82563_PHY_SPEC_CTRL_2         \
-        GG82563_REG(0, 26) /* PHY Specific Control 2 */
-#define GG82563_PHY_PAGE_SELECT_ALT     \
-        GG82563_REG(0, 29) /* Alternate Page Select */
-#define GG82563_PHY_TEST_CLK_CTRL       \
-        GG82563_REG(0, 30) /* Test Clock Control (use reg. 29 to select) */
-
-#define GG82563_PHY_MAC_SPEC_CTRL       \
-        GG82563_REG(2, 21) /* MAC Specific Control Register */
-#define GG82563_PHY_MAC_SPEC_CTRL_2     \
-        GG82563_REG(2, 26) /* MAC Specific Control 2 */
-
-#define GG82563_PHY_DSP_DISTANCE    \
-        GG82563_REG(5, 26) /* DSP Distance */
-
-/* Page 193 - Port Control Registers */
-#define GG82563_PHY_KMRN_MODE_CTRL   \
-        GG82563_REG(193, 16) /* Kumeran Mode Control */
-#define GG82563_PHY_PORT_RESET          \
-        GG82563_REG(193, 17) /* Port Reset */
-#define GG82563_PHY_REVISION_ID         \
-        GG82563_REG(193, 18) /* Revision ID */
-#define GG82563_PHY_DEVICE_ID           \
-        GG82563_REG(193, 19) /* Device ID */
-#define GG82563_PHY_PWR_MGMT_CTRL       \
-        GG82563_REG(193, 20) /* Power Management Control */
-#define GG82563_PHY_RATE_ADAPT_CTRL     \
-        GG82563_REG(193, 25) /* Rate Adaptation Control */
-
-/* Page 194 - KMRN Registers */
-#define GG82563_PHY_KMRN_FIFO_CTRL_STAT \
-        GG82563_REG(194, 16) /* FIFO's Control/Status */
-#define GG82563_PHY_KMRN_CTRL           \
-        GG82563_REG(194, 17) /* Control */
-#define GG82563_PHY_INBAND_CTRL         \
-        GG82563_REG(194, 18) /* Inband Control */
-#define GG82563_PHY_KMRN_DIAGNOSTIC     \
-        GG82563_REG(194, 19) /* Diagnostic */
-#define GG82563_PHY_ACK_TIMEOUTS        \
-        GG82563_REG(194, 20) /* Acknowledge Timeouts */
-#define GG82563_PHY_ADV_ABILITY         \
-        GG82563_REG(194, 21) /* Advertised Ability */
-#define GG82563_PHY_LINK_PARTNER_ADV_ABILITY \
-        GG82563_REG(194, 23) /* Link Partner Advertised Ability */
-#define GG82563_PHY_ADV_NEXT_PAGE       \
-        GG82563_REG(194, 24) /* Advertised Next Page */
-#define GG82563_PHY_LINK_PARTNER_ADV_NEXT_PAGE \
-        GG82563_REG(194, 25) /* Link Partner Advertised Next page */
-#define GG82563_PHY_KMRN_MISC           \
-        GG82563_REG(194, 26) /* Misc. */
-
-/* MDI Control */
-#define E1000_MDIC_DATA_MASK 0x0000FFFF
-#define E1000_MDIC_REG_MASK  0x001F0000
-#define E1000_MDIC_REG_SHIFT 16
-#define E1000_MDIC_PHY_MASK  0x03E00000
-#define E1000_MDIC_PHY_SHIFT 21
-#define E1000_MDIC_OP_WRITE  0x04000000
-#define E1000_MDIC_OP_READ   0x08000000
-#define E1000_MDIC_READY     0x10000000
-#define E1000_MDIC_INT_EN    0x20000000
-#define E1000_MDIC_ERROR     0x40000000
-
-/* SerDes Control */
-#define E1000_GEN_CTL_READY             0x80000000
-#define E1000_GEN_CTL_ADDRESS_SHIFT     8
-#define E1000_GEN_POLL_TIMEOUT          640
-
-
-
-#endif /* _E1000E_DEFINES_H_ */
diff --git a/src/drivers/net/e1000e/e1000e_hw.h b/src/drivers/net/e1000e/e1000e_hw.h
deleted file mode 100644 (file)
index 336af30..0000000
+++ /dev/null
@@ -1,723 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000E_HW_H_
-#define _E1000E_HW_H_
-
-#include "e1000e_regs.h"
-#include "e1000e_defines.h"
-
-struct e1000_hw;
-
-#define E1000_DEV_ID_82571EB_COPPER           0x105E
-#define E1000_DEV_ID_82571EB_FIBER            0x105F
-#define E1000_DEV_ID_82571EB_SERDES           0x1060
-#define E1000_DEV_ID_82571EB_SERDES_DUAL      0x10D9
-#define E1000_DEV_ID_82571EB_SERDES_QUAD      0x10DA
-#define E1000_DEV_ID_82571EB_QUAD_COPPER      0x10A4
-#define E1000_DEV_ID_82571PT_QUAD_COPPER      0x10D5
-#define E1000_DEV_ID_82571EB_QUAD_FIBER       0x10A5
-#define E1000_DEV_ID_82571EB_QUAD_COPPER_LP   0x10BC
-#define E1000_DEV_ID_82572EI_COPPER           0x107D
-#define E1000_DEV_ID_82572EI_FIBER            0x107E
-#define E1000_DEV_ID_82572EI_SERDES           0x107F
-#define E1000_DEV_ID_82572EI                  0x10B9
-#define E1000_DEV_ID_82573E                   0x108B
-#define E1000_DEV_ID_82573E_IAMT              0x108C
-#define E1000_DEV_ID_82573L                   0x109A
-#define E1000_DEV_ID_82574L                   0x10D3
-#define E1000_DEV_ID_82574LA                  0x10F6
-#define E1000_DEV_ID_82583V                   0x150C
-#define E1000_DEV_ID_80003ES2LAN_COPPER_DPT   0x1096
-#define E1000_DEV_ID_80003ES2LAN_SERDES_DPT   0x1098
-#define E1000_DEV_ID_80003ES2LAN_COPPER_SPT   0x10BA
-#define E1000_DEV_ID_80003ES2LAN_SERDES_SPT   0x10BB
-#define E1000_DEV_ID_ICH8_82567V_3            0x1501
-#define E1000_DEV_ID_ICH8_IGP_M_AMT           0x1049
-#define E1000_DEV_ID_ICH8_IGP_AMT             0x104A
-#define E1000_DEV_ID_ICH8_IGP_C               0x104B
-#define E1000_DEV_ID_ICH8_IFE                 0x104C
-#define E1000_DEV_ID_ICH8_IFE_GT              0x10C4
-#define E1000_DEV_ID_ICH8_IFE_G               0x10C5
-#define E1000_DEV_ID_ICH8_IGP_M               0x104D
-#define E1000_DEV_ID_ICH9_IGP_M               0x10BF
-#define E1000_DEV_ID_ICH9_IGP_M_AMT           0x10F5
-#define E1000_DEV_ID_ICH9_IGP_M_V             0x10CB
-#define E1000_DEV_ID_ICH9_IGP_AMT             0x10BD
-#define E1000_DEV_ID_ICH9_BM                  0x10E5
-#define E1000_DEV_ID_ICH9_IGP_C               0x294C
-#define E1000_DEV_ID_ICH9_IFE                 0x10C0
-#define E1000_DEV_ID_ICH9_IFE_GT              0x10C3
-#define E1000_DEV_ID_ICH9_IFE_G               0x10C2
-#define E1000_DEV_ID_ICH10_R_BM_LM            0x10CC
-#define E1000_DEV_ID_ICH10_R_BM_LF            0x10CD
-#define E1000_DEV_ID_ICH10_R_BM_V             0x10CE
-#define E1000_DEV_ID_ICH10_D_BM_LM            0x10DE
-#define E1000_DEV_ID_ICH10_D_BM_LF            0x10DF
-#define E1000_DEV_ID_PCH_M_HV_LM              0x10EA
-#define E1000_DEV_ID_PCH_M_HV_LC              0x10EB
-#define E1000_DEV_ID_PCH_D_HV_DM              0x10EF
-#define E1000_DEV_ID_PCH_D_HV_DC              0x10F0
-#define E1000_DEV_ID_PCH2_LV_LM               0x1502
-#define E1000_DEV_ID_PCH2_LV_V                0x1503
-#define E1000_REVISION_0 0
-#define E1000_REVISION_1 1
-#define E1000_REVISION_2 2
-#define E1000_REVISION_3 3
-#define E1000_REVISION_4 4
-
-#define E1000_FUNC_0     0
-#define E1000_FUNC_1     1
-
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN0   0
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1   3
-
-enum e1000_mac_type {
-       e1000_undefined = 0,
-       e1000_82571,
-       e1000_82572,
-       e1000_82573,
-       e1000_82574,
-       e1000_82583,
-       e1000_80003es2lan,
-       e1000_ich8lan,
-       e1000_ich9lan,
-       e1000_ich10lan,
-       e1000_pchlan,
-       e1000_pch2lan,
-       e1000_num_macs  /* List is 1-based, so subtract 1 for true count. */
-};
-
-enum e1000_media_type {
-       e1000_media_type_unknown = 0,
-       e1000_media_type_copper = 1,
-       e1000_media_type_fiber = 2,
-       e1000_media_type_internal_serdes = 3,
-       e1000_num_media_types
-};
-
-enum e1000_nvm_type {
-       e1000_nvm_unknown = 0,
-       e1000_nvm_none,
-       e1000_nvm_eeprom_spi,
-       e1000_nvm_flash_hw,
-       e1000_nvm_flash_sw
-};
-
-enum e1000_nvm_override {
-       e1000_nvm_override_none = 0,
-       e1000_nvm_override_spi_small,
-       e1000_nvm_override_spi_large,
-};
-
-enum e1000_phy_type {
-       e1000_phy_unknown = 0,
-       e1000_phy_none,
-       e1000_phy_m88,
-       e1000_phy_igp,
-       e1000_phy_igp_2,
-       e1000_phy_gg82563,
-       e1000_phy_igp_3,
-       e1000_phy_ife,
-       e1000_phy_bm,
-       e1000_phy_82578,
-       e1000_phy_82577,
-       e1000_phy_82579,
-};
-
-enum e1000_bus_type {
-       e1000_bus_type_unknown = 0,
-       e1000_bus_type_pci,
-       e1000_bus_type_pcix,
-       e1000_bus_type_pci_express,
-       e1000_bus_type_reserved
-};
-
-enum e1000_bus_speed {
-       e1000_bus_speed_unknown = 0,
-       e1000_bus_speed_33,
-       e1000_bus_speed_66,
-       e1000_bus_speed_100,
-       e1000_bus_speed_120,
-       e1000_bus_speed_133,
-       e1000_bus_speed_2500,
-       e1000_bus_speed_5000,
-       e1000_bus_speed_reserved
-};
-
-enum e1000_bus_width {
-       e1000_bus_width_unknown = 0,
-       e1000_bus_width_pcie_x1,
-       e1000_bus_width_pcie_x2,
-       e1000_bus_width_pcie_x4 = 4,
-       e1000_bus_width_pcie_x8 = 8,
-       e1000_bus_width_32,
-       e1000_bus_width_64,
-       e1000_bus_width_reserved
-};
-
-enum e1000_1000t_rx_status {
-       e1000_1000t_rx_status_not_ok = 0,
-       e1000_1000t_rx_status_ok,
-       e1000_1000t_rx_status_undefined = 0xFF
-};
-
-enum e1000_rev_polarity {
-       e1000_rev_polarity_normal = 0,
-       e1000_rev_polarity_reversed,
-       e1000_rev_polarity_undefined = 0xFF
-};
-
-enum e1000_fc_mode {
-       e1000_fc_none = 0,
-       e1000_fc_rx_pause,
-       e1000_fc_tx_pause,
-       e1000_fc_full,
-       e1000_fc_default = 0xFF
-};
-
-enum e1000_ms_type {
-       e1000_ms_hw_default = 0,
-       e1000_ms_force_master,
-       e1000_ms_force_slave,
-       e1000_ms_auto
-};
-
-enum e1000_smart_speed {
-       e1000_smart_speed_default = 0,
-       e1000_smart_speed_on,
-       e1000_smart_speed_off
-};
-
-enum e1000_serdes_link_state {
-       e1000_serdes_link_down = 0,
-       e1000_serdes_link_autoneg_progress,
-       e1000_serdes_link_autoneg_complete,
-       e1000_serdes_link_forced_up
-};
-
-/* Receive Descriptor */
-struct e1000_rx_desc {
-       __le64 buffer_addr; /* Address of the descriptor's data buffer */
-       __le16 length;      /* Length of data DMAed into data buffer */
-       __le16 csum;        /* Packet checksum */
-       u8  status;         /* Descriptor status */
-       u8  errors;         /* Descriptor Errors */
-       __le16 special;
-};
-
-/* Receive Descriptor - Extended */
-union e1000_rx_desc_extended {
-       struct {
-               __le64 buffer_addr;
-               __le64 reserved;
-       } read;
-       struct {
-               struct {
-                       __le32 mrq;           /* Multiple Rx Queues */
-                       union {
-                               __le32 rss;         /* RSS Hash */
-                               struct {
-                                       __le16 ip_id;  /* IP id */
-                                       __le16 csum;   /* Packet Checksum */
-                               } csum_ip;
-                       } hi_dword;
-               } lower;
-               struct {
-                       __le32 status_error;  /* ext status/error */
-                       __le16 length;
-                       __le16 vlan;          /* VLAN tag */
-               } upper;
-       } wb;  /* writeback */
-};
-
-#define MAX_PS_BUFFERS 4
-/* Receive Descriptor - Packet Split */
-union e1000_rx_desc_packet_split {
-       struct {
-               /* one buffer for protocol header(s), three data buffers */
-               __le64 buffer_addr[MAX_PS_BUFFERS];
-       } read;
-       struct {
-               struct {
-                       __le32 mrq;           /* Multiple Rx Queues */
-                       union {
-                               __le32 rss;           /* RSS Hash */
-                               struct {
-                                       __le16 ip_id;    /* IP id */
-                                       __le16 csum;     /* Packet Checksum */
-                               } csum_ip;
-                       } hi_dword;
-               } lower;
-               struct {
-                       __le32 status_error;  /* ext status/error */
-                       __le16 length0;       /* length of buffer 0 */
-                       __le16 vlan;          /* VLAN tag */
-               } middle;
-               struct {
-                       __le16 header_status;
-                       __le16 length[3];     /* length of buffers 1-3 */
-               } upper;
-               __le64 reserved;
-       } wb; /* writeback */
-};
-
-/* Transmit Descriptor */
-struct e1000_tx_desc {
-       __le64 buffer_addr;   /* Address of the descriptor's data buffer */
-       union {
-               __le32 data;
-               struct {
-                       __le16 length;    /* Data buffer length */
-                       u8 cso;           /* Checksum offset */
-                       u8 cmd;           /* Descriptor control */
-               } flags;
-       } lower;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;        /* Descriptor status */
-                       u8 css;           /* Checksum start */
-                       __le16 special;
-               } fields;
-       } upper;
-};
-
-/* Offload Context Descriptor */
-struct e1000_context_desc {
-       union {
-               __le32 ip_config;
-               struct {
-                       u8 ipcss;         /* IP checksum start */
-                       u8 ipcso;         /* IP checksum offset */
-                       __le16 ipcse;     /* IP checksum end */
-               } ip_fields;
-       } lower_setup;
-       union {
-               __le32 tcp_config;
-               struct {
-                       u8 tucss;         /* TCP checksum start */
-                       u8 tucso;         /* TCP checksum offset */
-                       __le16 tucse;     /* TCP checksum end */
-               } tcp_fields;
-       } upper_setup;
-       __le32 cmd_and_length;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;        /* Descriptor status */
-                       u8 hdr_len;       /* Header length */
-                       __le16 mss;       /* Maximum segment size */
-               } fields;
-       } tcp_seg_setup;
-};
-
-/* Offload data descriptor */
-struct e1000_data_desc {
-       __le64 buffer_addr;   /* Address of the descriptor's buffer address */
-       union {
-               __le32 data;
-               struct {
-                       __le16 length;    /* Data buffer length */
-                       u8 typ_len_ext;
-                       u8 cmd;
-               } flags;
-       } lower;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;        /* Descriptor status */
-                       u8 popts;         /* Packet Options */
-                       __le16 special;
-               } fields;
-       } upper;
-};
-
-/* Statistics counters collected by the MAC */
-struct e1000_hw_stats {
-       u64 crcerrs;
-       u64 algnerrc;
-       u64 symerrs;
-       u64 rxerrc;
-       u64 mpc;
-       u64 scc;
-       u64 ecol;
-       u64 mcc;
-       u64 latecol;
-       u64 colc;
-       u64 dc;
-       u64 tncrs;
-       u64 sec;
-       u64 cexterr;
-       u64 rlec;
-       u64 xonrxc;
-       u64 xontxc;
-       u64 xoffrxc;
-       u64 xofftxc;
-       u64 fcruc;
-       u64 prc64;
-       u64 prc127;
-       u64 prc255;
-       u64 prc511;
-       u64 prc1023;
-       u64 prc1522;
-       u64 gprc;
-       u64 bprc;
-       u64 mprc;
-       u64 gptc;
-       u64 gorc;
-       u64 gotc;
-       u64 rnbc;
-       u64 ruc;
-       u64 rfc;
-       u64 roc;
-       u64 rjc;
-       u64 mgprc;
-       u64 mgpdc;
-       u64 mgptc;
-       u64 tor;
-       u64 tot;
-       u64 tpr;
-       u64 tpt;
-       u64 ptc64;
-       u64 ptc127;
-       u64 ptc255;
-       u64 ptc511;
-       u64 ptc1023;
-       u64 ptc1522;
-       u64 mptc;
-       u64 bptc;
-       u64 tsctc;
-       u64 tsctfc;
-       u64 iac;
-       u64 icrxptc;
-       u64 icrxatc;
-       u64 ictxptc;
-       u64 ictxatc;
-       u64 ictxqec;
-       u64 ictxqmtc;
-       u64 icrxdmtc;
-       u64 icrxoc;
-       u64 doosync;
-};
-
-
-struct e1000_phy_stats {
-       u32 idle_errors;
-       u32 receive_errors;
-};
-
-struct e1000_host_mng_dhcp_cookie {
-       u32 signature;
-       u8  status;
-       u8  reserved0;
-       u16 vlan_id;
-       u32 reserved1;
-       u16 reserved2;
-       u8  reserved3;
-       u8  checksum;
-};
-
-/* Host Interface "Rev 1" */
-struct e1000_host_command_header {
-       u8 command_id;
-       u8 command_length;
-       u8 command_options;
-       u8 checksum;
-};
-
-#define E1000_HI_MAX_DATA_LENGTH     252
-struct e1000_host_command_info {
-       struct e1000_host_command_header command_header;
-       u8 command_data[E1000_HI_MAX_DATA_LENGTH];
-};
-
-/* Host Interface "Rev 2" */
-struct e1000_host_mng_command_header {
-       u8  command_id;
-       u8  checksum;
-       u16 reserved1;
-       u16 reserved2;
-       u16 command_length;
-};
-
-#define E1000_HI_MAX_MNG_DATA_LENGTH 0x6F8
-struct e1000_host_mng_command_info {
-       struct e1000_host_mng_command_header command_header;
-       u8 command_data[E1000_HI_MAX_MNG_DATA_LENGTH];
-};
-
-#include "e1000e_mac.h"
-#include "e1000e_phy.h"
-#include "e1000e_nvm.h"
-#include "e1000e_manage.h"
-
-struct e1000_mac_operations {
-       /* Function pointers for the MAC. */
-       s32  (*init_params)(struct e1000_hw *);
-       s32  (*id_led_init)(struct e1000_hw *);
-       s32  (*blink_led)(struct e1000_hw *);
-       s32  (*check_for_link)(struct e1000_hw *);
-       bool (*check_mng_mode)(struct e1000_hw *hw);
-       s32  (*cleanup_led)(struct e1000_hw *);
-       void (*clear_hw_cntrs)(struct e1000_hw *);
-       void (*clear_vfta)(struct e1000_hw *);
-       s32  (*get_bus_info)(struct e1000_hw *);
-       void (*set_lan_id)(struct e1000_hw *);
-       s32  (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *);
-       s32  (*led_on)(struct e1000_hw *);
-       s32  (*led_off)(struct e1000_hw *);
-       void (*update_mc_addr_list)(struct e1000_hw *, u8 *, u32);
-       s32  (*reset_hw)(struct e1000_hw *);
-       s32  (*init_hw)(struct e1000_hw *);
-       s32  (*setup_link)(struct e1000_hw *);
-       s32  (*setup_physical_interface)(struct e1000_hw *);
-       s32  (*setup_led)(struct e1000_hw *);
-       void (*write_vfta)(struct e1000_hw *, u32, u32);
-       void (*mta_set)(struct e1000_hw *, u32);
-       void (*config_collision_dist)(struct e1000_hw *);
-       void (*rar_set)(struct e1000_hw *, u8*, u32);
-       s32  (*read_mac_addr)(struct e1000_hw *);
-       s32  (*validate_mdi_setting)(struct e1000_hw *);
-       s32  (*mng_host_if_write)(struct e1000_hw *, u8*, u16, u16, u8*);
-       s32  (*mng_write_cmd_header)(struct e1000_hw *hw,
-                      struct e1000_host_mng_command_header*);
-       s32  (*mng_enable_host_if)(struct e1000_hw *);
-       s32  (*wait_autoneg)(struct e1000_hw *);
-};
-
-struct e1000_phy_operations {
-       s32  (*init_params)(struct e1000_hw *);
-       s32  (*acquire)(struct e1000_hw *);
-       s32  (*cfg_on_link_up)(struct e1000_hw *);
-       s32  (*check_polarity)(struct e1000_hw *);
-       s32  (*check_reset_block)(struct e1000_hw *);
-       s32  (*commit)(struct e1000_hw *);
-#if 0
-       s32  (*force_speed_duplex)(struct e1000_hw *);
-#endif
-       s32  (*get_cfg_done)(struct e1000_hw *hw);
-#if 0
-       s32  (*get_cable_length)(struct e1000_hw *);
-#endif
-       s32  (*get_info)(struct e1000_hw *);
-       s32  (*read_reg)(struct e1000_hw *, u32, u16 *);
-       s32  (*read_reg_locked)(struct e1000_hw *, u32, u16 *);
-       void (*release)(struct e1000_hw *);
-       s32  (*reset)(struct e1000_hw *);
-       s32  (*set_d0_lplu_state)(struct e1000_hw *, bool);
-       s32  (*set_d3_lplu_state)(struct e1000_hw *, bool);
-       s32  (*write_reg)(struct e1000_hw *, u32, u16);
-       s32  (*write_reg_locked)(struct e1000_hw *, u32, u16);
-       void (*power_up)(struct e1000_hw *);
-       void (*power_down)(struct e1000_hw *);
-};
-
-struct e1000_nvm_operations {
-       s32  (*init_params)(struct e1000_hw *);
-       s32  (*acquire)(struct e1000_hw *);
-       s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
-       void (*release)(struct e1000_hw *);
-       void (*reload)(struct e1000_hw *);
-       s32  (*update)(struct e1000_hw *);
-       s32  (*valid_led_default)(struct e1000_hw *, u16 *);
-       s32  (*validate)(struct e1000_hw *);
-       s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
-};
-
-struct e1000_mac_info {
-       struct e1000_mac_operations ops;
-       u8 addr[6];
-       u8 perm_addr[6];
-
-       enum e1000_mac_type type;
-
-       u32 collision_delta;
-       u32 ledctl_default;
-       u32 ledctl_mode1;
-       u32 ledctl_mode2;
-       u32 mc_filter_type;
-       u32 tx_packet_delta;
-       u32 txcw;
-
-       u16 current_ifs_val;
-       u16 ifs_max_val;
-       u16 ifs_min_val;
-       u16 ifs_ratio;
-       u16 ifs_step_size;
-       u16 mta_reg_count;
-
-       /* Maximum size of the MTA register table in all supported adapters */
-       #define MAX_MTA_REG 128
-       u32 mta_shadow[MAX_MTA_REG];
-       u16 rar_entry_count;
-
-       u8  forced_speed_duplex;
-
-       bool adaptive_ifs;
-       bool arc_subsystem_valid;
-       bool asf_firmware_present;
-       bool autoneg;
-       bool autoneg_failed;
-       bool get_link_status;
-       bool in_ifs_mode;
-       enum e1000_serdes_link_state serdes_link_state;
-       bool serdes_has_link;
-       bool tx_pkt_filtering;
-};
-
-struct e1000_phy_info {
-       struct e1000_phy_operations ops;
-       enum e1000_phy_type type;
-
-       enum e1000_1000t_rx_status local_rx;
-       enum e1000_1000t_rx_status remote_rx;
-       enum e1000_ms_type ms_type;
-       enum e1000_ms_type original_ms_type;
-       enum e1000_rev_polarity cable_polarity;
-       enum e1000_smart_speed smart_speed;
-
-       u32 addr;
-       u32 id;
-       u32 reset_delay_us; /* in usec */
-       u32 revision;
-
-       enum e1000_media_type media_type;
-
-       u16 autoneg_advertised;
-       u16 autoneg_mask;
-       u16 cable_length;
-       u16 max_cable_length;
-       u16 min_cable_length;
-
-       u8 mdix;
-
-       bool disable_polarity_correction;
-       bool is_mdix;
-       bool polarity_correction;
-       bool reset_disable;
-       bool speed_downgraded;
-       bool autoneg_wait_to_complete;
-};
-
-struct e1000_nvm_info {
-       struct e1000_nvm_operations ops;
-       enum e1000_nvm_type type;
-       enum e1000_nvm_override override;
-
-       u32 flash_bank_size;
-       u32 flash_base_addr;
-
-       u16 word_size;
-       u16 delay_usec;
-       u16 address_bits;
-       u16 opcode_bits;
-       u16 page_size;
-};
-
-struct e1000_bus_info {
-       enum e1000_bus_type type;
-       enum e1000_bus_speed speed;
-       enum e1000_bus_width width;
-
-       u16 func;
-       u16 pci_cmd_word;
-};
-
-struct e1000_fc_info {
-       u32 high_water;          /* Flow control high-water mark */
-       u32 low_water;           /* Flow control low-water mark */
-       u16 pause_time;          /* Flow control pause timer */
-       bool send_xon;           /* Flow control send XON */
-       bool strict_ieee;        /* Strict IEEE mode */
-       enum e1000_fc_mode current_mode; /* FC mode in effect */
-       enum e1000_fc_mode requested_mode; /* FC mode requested by caller */
-};
-
-struct e1000_dev_spec_82571 {
-       bool laa_is_present;
-       u32 smb_counter;
-};
-
-struct e1000_dev_spec_80003es2lan {
-       bool  mdic_wa_enable;
-};
-
-struct e1000_shadow_ram {
-       u16  value;
-       bool modified;
-};
-
-#define E1000_ICH8_SHADOW_RAM_WORDS            2048
-
-struct e1000_dev_spec_ich8lan {
-       bool kmrn_lock_loss_workaround_enabled;
-       struct e1000_shadow_ram shadow_ram[E1000_ICH8_SHADOW_RAM_WORDS];
-       bool nvm_k1_enabled;
-};
-
-struct e1000_hw {
-       struct e1000_adapter *adapter;
-
-       u8 __iomem *hw_addr;
-       u8 __iomem *flash_address;
-
-       void *back;
-       unsigned long io_base;
-
-       struct e1000_mac_info  mac;
-       struct e1000_fc_info   fc;
-       struct e1000_phy_info  phy;
-       struct e1000_nvm_info  nvm;
-       struct e1000_bus_info  bus;
-       struct e1000_host_mng_dhcp_cookie mng_cookie;
-
-       union {
-               struct e1000_dev_spec_82571     _82571;
-               struct e1000_dev_spec_80003es2lan _80003es2lan;
-               struct e1000_dev_spec_ich8lan   ich8lan;
-       } dev_spec;
-
-       u16 device_id;
-       u16 subsystem_vendor_id;
-       u16 subsystem_device_id;
-       u16 vendor_id;
-
-       u8  revision_id;
-};
-
-#include "e1000e_82571.h"
-#include "e1000e_80003es2lan.h"
-#include "e1000e_ich8lan.h"
-
-/* These functions must be implemented by drivers */
-s32  e1000e_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
-
-#endif
diff --git a/src/drivers/net/e1000e/e1000e_ich8lan.c b/src/drivers/net/e1000e/e1000e_ich8lan.c
deleted file mode 100644 (file)
index d438ff1..0000000
+++ /dev/null
@@ -1,3465 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-/*
- * 82562G 10/100 Network Connection
- * 82562G-2 10/100 Network Connection
- * 82562GT 10/100 Network Connection
- * 82562GT-2 10/100 Network Connection
- * 82562V 10/100 Network Connection
- * 82562V-2 10/100 Network Connection
- * 82566DC-2 Gigabit Network Connection
- * 82566DC Gigabit Network Connection
- * 82566DM-2 Gigabit Network Connection
- * 82566DM Gigabit Network Connection
- * 82566MC Gigabit Network Connection
- * 82566MM Gigabit Network Connection
- * 82567LM Gigabit Network Connection
- * 82567LF Gigabit Network Connection
- * 82567V Gigabit Network Connection
- * 82567LM-2 Gigabit Network Connection
- * 82567LF-2 Gigabit Network Connection
- * 82567V-2 Gigabit Network Connection
- * 82567LF-3 Gigabit Network Connection
- * 82567LM-3 Gigabit Network Connection
- * 82567LM-4 Gigabit Network Connection
- * 82577LM Gigabit Network Connection
- * 82577LC Gigabit Network Connection
- * 82578DM Gigabit Network Connection
- * 82578DC Gigabit Network Connection
- */
-
-#include "e1000e.h"
-
-static s32  e1000e_init_phy_params_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_init_phy_params_pchlan(struct e1000_hw *hw);
-static s32  e1000e_init_nvm_params_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_init_mac_params_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_acquire_swflag_ich8lan(struct e1000_hw *hw);
-static void e1000e_release_swflag_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_acquire_nvm_ich8lan(struct e1000_hw *hw);
-static void e1000e_release_nvm_ich8lan(struct e1000_hw *hw);
-static bool e1000e_check_mng_mode_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_check_reset_block_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_phy_hw_reset_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_get_phy_info_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_set_lplu_state_pchlan(struct e1000_hw *hw, bool active);
-static s32  e1000e_set_d0_lplu_state_ich8lan(struct e1000_hw *hw,
-                                            bool active);
-static s32  e1000e_set_d3_lplu_state_ich8lan(struct e1000_hw *hw,
-                                            bool active);
-static s32  e1000e_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset,
-                                   u16 words, u16 *data);
-static s32  e1000e_write_nvm_ich8lan(struct e1000_hw *hw, u16 offset,
-                                    u16 words, u16 *data);
-static s32  e1000e_validate_nvm_checksum_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_update_nvm_checksum_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_valid_led_default_ich8lan(struct e1000_hw *hw,
-                                            u16 *data);
-static s32  e1000e_id_led_init_pchlan(struct e1000_hw *hw);
-static s32  e1000e_get_bus_info_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_reset_hw_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_init_hw_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_setup_link_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_setup_copper_link_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_get_link_up_info_ich8lan(struct e1000_hw *hw,
-                                           u16 *speed, u16 *duplex);
-static s32  e1000e_cleanup_led_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_led_on_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_led_off_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_k1_gig_workaround_hv(struct e1000_hw *hw, bool link);
-static s32  e1000e_setup_led_pchlan(struct e1000_hw *hw);
-static s32  e1000e_cleanup_led_pchlan(struct e1000_hw *hw);
-static s32  e1000e_led_on_pchlan(struct e1000_hw *hw);
-static s32  e1000e_led_off_pchlan(struct e1000_hw *hw);
-static void e1000e_clear_hw_cntrs_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank);
-static s32  e1000e_flash_cycle_ich8lan(struct e1000_hw *hw, u32 timeout);
-static s32  e1000e_flash_cycle_init_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_get_phy_info_ife_ich8lan(struct e1000_hw *hw);
-static void e1000e_initialize_hw_bits_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_read_flash_byte_ich8lan(struct e1000_hw *hw,
-                                          u32 offset, u8 *data);
-static s32  e1000e_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
-                                          u8 size, u16 *data);
-static s32  e1000e_read_flash_word_ich8lan(struct e1000_hw *hw,
-                                          u32 offset, u16 *data);
-static s32  e1000e_retry_write_flash_byte_ich8lan(struct e1000_hw *hw,
-                                                 u32 offset, u8 byte);
-static s32  e1000e_write_flash_byte_ich8lan(struct e1000_hw *hw,
-                                           u32 offset, u8 data);
-static s32  e1000e_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
-                                           u8 size, u16 data);
-static s32  e1000e_get_cfg_done_ich8lan(struct e1000_hw *hw);
-static void e1000e_power_down_phy_copper_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_check_for_copper_link_ich8lan(struct e1000_hw *hw);
-static void e1000e_lan_init_done_ich8lan(struct e1000_hw *hw);
-static s32  e1000e_sw_lcd_config_ich8lan(struct e1000_hw *hw);
-
-/* ICH GbE Flash Hardware Sequencing Flash Status Register bit breakdown */
-/* Offset 04h HSFSTS */
-union ich8_hws_flash_status {
-       struct ich8_hsfsts {
-               u16 flcdone    :1; /* bit 0 Flash Cycle Done */
-               u16 flcerr     :1; /* bit 1 Flash Cycle Error */
-               u16 dael       :1; /* bit 2 Direct Access error Log */
-               u16 berasesz   :2; /* bit 4:3 Sector Erase Size */
-               u16 flcinprog  :1; /* bit 5 flash cycle in Progress */
-               u16 reserved1  :2; /* bit 13:6 Reserved */
-               u16 reserved2  :6; /* bit 13:6 Reserved */
-               u16 fldesvalid :1; /* bit 14 Flash Descriptor Valid */
-               u16 flockdn    :1; /* bit 15 Flash Config Lock-Down */
-       } hsf_status;
-       u16 regval;
-};
-
-/* ICH GbE Flash Hardware Sequencing Flash control Register bit breakdown */
-/* Offset 06h FLCTL */
-union ich8_hws_flash_ctrl {
-       struct ich8_hsflctl {
-               u16 flcgo      :1;   /* 0 Flash Cycle Go */
-               u16 flcycle    :2;   /* 2:1 Flash Cycle */
-               u16 reserved   :5;   /* 7:3 Reserved  */
-               u16 fldbcount  :2;   /* 9:8 Flash Data Byte Count */
-               u16 flockdn    :6;   /* 15:10 Reserved */
-       } hsf_ctrl;
-       u16 regval;
-};
-
-/* ICH Flash Region Access Permissions */
-union ich8_hws_flash_regacc {
-       struct ich8_flracc {
-               u32 grra      :8; /* 0:7 GbE region Read Access */
-               u32 grwa      :8; /* 8:15 GbE region Write Access */
-               u32 gmrag     :8; /* 23:16 GbE Master Read Access Grant */
-               u32 gmwag     :8; /* 31:24 GbE Master Write Access Grant */
-       } hsf_flregacc;
-       u16 regval;
-};
-
-/**
- *  e1000e_init_phy_params_pchlan - Initialize PHY function pointers
- *  @hw: pointer to the HW structure
- *
- *  Initialize family-specific PHY parameters and function pointers.
- **/
-static s32 e1000e_init_phy_params_pchlan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-
-       phy->addr                     = 1;
-       phy->reset_delay_us           = 100;
-
-       phy->ops.acquire              = e1000e_acquire_swflag_ich8lan;
-       phy->ops.check_polarity       = e1000e_check_polarity_ife;
-       phy->ops.check_reset_block    = e1000e_check_reset_block_ich8lan;
-#if 0
-       phy->ops.force_speed_duplex   = e1000e_phy_force_speed_duplex_ife;
-#endif
-#if 0
-       phy->ops.get_cable_length     = e1000e_get_cable_length_igp_2;
-#endif
-       phy->ops.get_cfg_done         = e1000e_get_cfg_done_ich8lan;
-       phy->ops.get_info             = e1000e_get_phy_info_ich8lan;
-       phy->ops.read_reg             = e1000e_read_phy_reg_hv;
-       phy->ops.read_reg_locked      = e1000e_read_phy_reg_hv_locked;
-       phy->ops.release              = e1000e_release_swflag_ich8lan;
-       phy->ops.reset                = e1000e_phy_hw_reset_ich8lan;
-       phy->ops.set_d0_lplu_state    = e1000e_set_lplu_state_pchlan;
-       phy->ops.set_d3_lplu_state    = e1000e_set_lplu_state_pchlan;
-       phy->ops.write_reg            = e1000e_write_phy_reg_hv;
-       phy->ops.write_reg_locked     = e1000e_write_phy_reg_hv_locked;
-       phy->ops.power_up             = e1000e_power_up_phy_copper;
-       phy->ops.power_down           = e1000e_power_down_phy_copper_ich8lan;
-       phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-
-       phy->id = e1000_phy_unknown;
-       e1000e_get_phy_id(hw);
-       phy->type = e1000e_get_phy_type_from_id(phy->id);
-
-       if (phy->type == e1000_phy_82577 || phy->type == e1000_phy_82579) {
-               phy->ops.check_polarity = e1000e_check_polarity_82577;
-#if 0
-               phy->ops.force_speed_duplex =
-                       e1000e_phy_force_speed_duplex_82577;
-#endif
-#if 0
-               phy->ops.get_cable_length   = e1000e_get_cable_length_82577;
-#endif
-               phy->ops.get_info = e1000e_get_phy_info_82577;
-               phy->ops.commit = e1000e_phy_sw_reset;
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000e_init_phy_params_ich8lan - Initialize PHY function pointers
- *  @hw: pointer to the HW structure
- *
- *  Initialize family-specific PHY parameters and function pointers.
- **/
-static s32 e1000e_init_phy_params_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 i = 0;
-
-       phy->addr                     = 1;
-       phy->reset_delay_us           = 100;
-
-       phy->ops.acquire              = e1000e_acquire_swflag_ich8lan;
-       phy->ops.check_polarity       = e1000e_check_polarity_ife;
-       phy->ops.check_reset_block    = e1000e_check_reset_block_ich8lan;
-#if 0
-       phy->ops.force_speed_duplex   = e1000e_phy_force_speed_duplex_ife;
-#endif
-#if 0
-       phy->ops.get_cable_length     = e1000e_get_cable_length_igp_2;
-#endif
-       phy->ops.get_cfg_done         = e1000e_get_cfg_done_ich8lan;
-       phy->ops.get_info             = e1000e_get_phy_info_ich8lan;
-       phy->ops.read_reg             = e1000e_read_phy_reg_igp;
-       phy->ops.release              = e1000e_release_swflag_ich8lan;
-       phy->ops.reset                = e1000e_phy_hw_reset_ich8lan;
-       phy->ops.set_d0_lplu_state    = e1000e_set_d0_lplu_state_ich8lan;
-       phy->ops.set_d3_lplu_state    = e1000e_set_d3_lplu_state_ich8lan;
-       phy->ops.write_reg            = e1000e_write_phy_reg_igp;
-       phy->ops.power_up             = e1000e_power_up_phy_copper;
-       phy->ops.power_down           = e1000e_power_down_phy_copper_ich8lan;
-
-       /*
-        * We may need to do this twice - once for IGP and if that fails,
-        * we'll set BM func pointers and try again
-        */
-       ret_val = e1000e_determine_phy_address(hw);
-       if (ret_val) {
-               phy->ops.write_reg = e1000e_write_phy_reg_bm;
-               phy->ops.read_reg  = e1000e_read_phy_reg_bm;
-               ret_val = e1000e_determine_phy_address(hw);
-               if (ret_val) {
-                       DBG("Cannot determine PHY addr. Erroring out\n");
-                       goto out;
-               }
-       }
-
-       phy->id = 0;
-       while ((e1000_phy_unknown == e1000e_get_phy_type_from_id(phy->id)) &&
-              (i++ < 100)) {
-               msleep(1);
-               ret_val = e1000e_get_phy_id(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       /* Verify phy id */
-       switch (phy->id) {
-       case IGP03E1000_E_PHY_ID:
-               phy->type = e1000_phy_igp_3;
-               phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-               phy->ops.read_reg_locked = e1000e_read_phy_reg_igp_locked;
-               phy->ops.write_reg_locked = e1000e_write_phy_reg_igp_locked;
-               break;
-       case IFE_E_PHY_ID:
-       case IFE_PLUS_E_PHY_ID:
-       case IFE_C_E_PHY_ID:
-               phy->type = e1000_phy_ife;
-               phy->autoneg_mask = E1000_ALL_NOT_GIG;
-               break;
-       case BME1000_E_PHY_ID:
-               phy->type = e1000_phy_bm;
-               phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-               phy->ops.read_reg = e1000e_read_phy_reg_bm;
-               phy->ops.write_reg = e1000e_write_phy_reg_bm;
-               phy->ops.commit = e1000e_phy_sw_reset;
-               break;
-       default:
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_init_nvm_params_ich8lan - Initialize NVM function pointers
- *  @hw: pointer to the HW structure
- *
- *  Initialize family-specific NVM parameters and function
- *  pointers.
- **/
-static s32 e1000e_init_nvm_params_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
-       u32 gfpreg, sector_base_addr, sector_end_addr;
-       s32 ret_val = E1000_SUCCESS;
-       u16 i;
-
-       /* Can't read flash registers if the register set isn't mapped. */
-       if (!hw->flash_address) {
-               e_dbg("ERROR: Flash registers not mapped\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       nvm->type = e1000_nvm_flash_sw;
-
-       gfpreg = er32flash(ICH_FLASH_GFPREG);
-
-       /*
-        * sector_X_addr is a "sector"-aligned address (4096 bytes)
-        * Add 1 to sector_end_addr since this sector is included in
-        * the overall size.
-        */
-       sector_base_addr = gfpreg & FLASH_GFPREG_BASE_MASK;
-       sector_end_addr = ((gfpreg >> 16) & FLASH_GFPREG_BASE_MASK) + 1;
-
-       /* flash_base_addr is byte-aligned */
-       nvm->flash_base_addr = sector_base_addr << FLASH_SECTOR_ADDR_SHIFT;
-
-       /*
-        * find total size of the NVM, then cut in half since the total
-        * size represents two separate NVM banks.
-        */
-       nvm->flash_bank_size = (sector_end_addr - sector_base_addr)
-                                 << FLASH_SECTOR_ADDR_SHIFT;
-       nvm->flash_bank_size /= 2;
-       /* Adjust to word count */
-       nvm->flash_bank_size /= sizeof(u16);
-
-       nvm->word_size = E1000_ICH8_SHADOW_RAM_WORDS;
-
-       /* Clear shadow ram */
-       for (i = 0; i < nvm->word_size; i++) {
-               dev_spec->shadow_ram[i].modified = false;
-               dev_spec->shadow_ram[i].value    = 0xFFFF;
-       }
-
-       /* Function Pointers */
-       nvm->ops.acquire       = e1000e_acquire_nvm_ich8lan;
-       nvm->ops.release       = e1000e_release_nvm_ich8lan;
-       nvm->ops.read          = e1000e_read_nvm_ich8lan;
-       nvm->ops.update        = e1000e_update_nvm_checksum_ich8lan;
-       nvm->ops.valid_led_default = e1000e_valid_led_default_ich8lan;
-       nvm->ops.validate      = e1000e_validate_nvm_checksum_ich8lan;
-       nvm->ops.write         = e1000e_write_nvm_ich8lan;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_init_mac_params_ich8lan - Initialize MAC function pointers
- *  @hw: pointer to the HW structure
- *
- *  Initialize family-specific MAC parameters and function
- *  pointers.
- **/
-static s32 e1000e_init_mac_params_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-
-       /* Set media type function pointer */
-       hw->phy.media_type = e1000_media_type_copper;
-
-       /* Set mta register count */
-       mac->mta_reg_count = 32;
-       /* Set rar entry count */
-       mac->rar_entry_count = E1000_ICH_RAR_ENTRIES;
-       if (mac->type == e1000_ich8lan)
-               mac->rar_entry_count--;
-       /* Set if part includes ASF firmware */
-       mac->asf_firmware_present = true;
-       /* Set if manageability features are enabled. */
-       mac->arc_subsystem_valid = true;
-
-       /* Function pointers */
-
-       /* bus type/speed/width */
-       mac->ops.get_bus_info = e1000e_get_bus_info_ich8lan;
-       /* function id */
-       mac->ops.set_lan_id = e1000e_set_lan_id_single_port;
-       /* reset */
-       mac->ops.reset_hw = e1000e_reset_hw_ich8lan;
-       /* hw initialization */
-       mac->ops.init_hw = e1000e_init_hw_ich8lan;
-       /* link setup */
-       mac->ops.setup_link = e1000e_setup_link_ich8lan;
-       /* physical interface setup */
-       mac->ops.setup_physical_interface = e1000e_setup_copper_link_ich8lan;
-       /* check for link */
-       mac->ops.check_for_link = e1000e_check_for_copper_link_ich8lan;
-       /* check management mode */
-       mac->ops.check_mng_mode = e1000e_check_mng_mode_ich8lan;
-       /* link info */
-       mac->ops.get_link_up_info = e1000e_get_link_up_info_ich8lan;
-       /* multicast address update */
-       mac->ops.update_mc_addr_list = e1000e_update_mc_addr_list_generic;
-       /* setting MTA */
-       mac->ops.mta_set = e1000e_mta_set_generic;
-       /* clear hardware counters */
-       mac->ops.clear_hw_cntrs = e1000e_clear_hw_cntrs_ich8lan;
-
-       /* LED operations */
-       switch (mac->type) {
-       case e1000_ich8lan:
-       case e1000_ich9lan:
-       case e1000_ich10lan:
-               /* ID LED init */
-               mac->ops.id_led_init = e1000e_id_led_init;
-               /* blink LED */
-               mac->ops.blink_led = e1000e_blink_led;
-               /* setup LED */
-               mac->ops.setup_led = e1000e_setup_led_generic;
-               /* cleanup LED */
-               mac->ops.cleanup_led = e1000e_cleanup_led_ich8lan;
-               /* turn on/off LED */
-               mac->ops.led_on = e1000e_led_on_ich8lan;
-               mac->ops.led_off = e1000e_led_off_ich8lan;
-               break;
-       case e1000_pchlan:
-       case e1000_pch2lan:
-               /* ID LED init */
-               mac->ops.id_led_init = e1000e_id_led_init_pchlan;
-               /* setup LED */
-               mac->ops.setup_led = e1000e_setup_led_pchlan;
-               /* cleanup LED */
-               mac->ops.cleanup_led = e1000e_cleanup_led_pchlan;
-               /* turn on/off LED */
-               mac->ops.led_on = e1000e_led_on_pchlan;
-               mac->ops.led_off = e1000e_led_off_pchlan;
-               break;
-       default:
-               break;
-       }
-
-       /* Enable PCS Lock-loss workaround for ICH8 */
-       if (mac->type == e1000_ich8lan)
-               e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw, true);
-
-       /* Disable PHY configuration by hardware, config by software */
-       if (mac->type == e1000_pch2lan) {
-               u32 extcnf_ctrl = er32(EXTCNF_CTRL);
-
-               extcnf_ctrl |= E1000_EXTCNF_CTRL_GATE_PHY_CFG;
-               ew32(EXTCNF_CTRL, extcnf_ctrl);
-       }
-
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_check_for_copper_link_ich8lan - Check for link (Copper)
- *  @hw: pointer to the HW structure
- *
- *  Checks to see of the link status of the hardware has changed.  If a
- *  change in link status has been detected, then we read the PHY registers
- *  to get the current speed/duplex if link exists.
- **/
-static s32 e1000e_check_for_copper_link_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val;
-       bool link;
-
-       /*
-        * We only want to go out to the PHY registers to see if Auto-Neg
-        * has completed and/or if our link status has changed.  The
-        * get_link_status flag is set upon receiving a Link Status
-        * Change or Rx Sequence Error interrupt.
-        */
-       if (!mac->get_link_status) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       /*
-        * First we want to see if the MII Status Register reports
-        * link.  If so, then we want to get the current speed/duplex
-        * of the PHY.
-        */
-       ret_val = e1000e_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (hw->mac.type == e1000_pchlan) {
-               ret_val = e1000e_k1_gig_workaround_hv(hw, link);
-               if (ret_val)
-                       goto out;
-       }
-
-       if (!link)
-               goto out; /* No link detected */
-
-       mac->get_link_status = false;
-
-       if (hw->phy.type == e1000_phy_82578) {
-               ret_val = e1000e_link_stall_workaround_hv(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       /*
-        * Check if there was DownShift, must be checked
-        * immediately after link-up
-        */
-       e1000e_check_downshift(hw);
-
-       /*
-        * If we are forcing speed/duplex, then we simply return since
-        * we have already determined whether we have link or not.
-        */
-       if (!mac->autoneg) {
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       /*
-        * Auto-Neg is enabled.  Auto Speed Detection takes care
-        * of MAC speed/duplex configuration.  So we only need to
-        * configure Collision Distance in the MAC.
-        */
-       e1000e_config_collision_dist(hw);
-
-       /*
-        * Configure Flow Control now that Auto-Neg has completed.
-        * First, we need to restore the desired flow control
-        * settings because we may have had to re-autoneg with a
-        * different link partner.
-        */
-       ret_val = e1000e_config_fc_after_link_up(hw);
-       if (ret_val)
-               e_dbg("Error configuring flow control\n");
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_init_function_pointers_ich8lan - Initialize ICH8 function pointers
- *  @hw: pointer to the HW structure
- *
- *  Initialize family-specific function pointers for PHY, MAC, and NVM.
- **/
-void e1000e_init_function_pointers_ich8lan(struct e1000_hw *hw)
-{
-       e1000e_init_mac_ops_generic(hw);
-       e1000e_init_nvm_ops_generic(hw);
-       hw->mac.ops.init_params = e1000e_init_mac_params_ich8lan;
-       hw->nvm.ops.init_params = e1000e_init_nvm_params_ich8lan;
-       switch (hw->mac.type) {
-       case e1000_ich8lan:
-       case e1000_ich9lan:
-       case e1000_ich10lan:
-               hw->phy.ops.init_params = e1000e_init_phy_params_ich8lan;
-               break;
-       case e1000_pchlan:
-       case e1000_pch2lan:
-               hw->phy.ops.init_params = e1000e_init_phy_params_pchlan;
-               break;
-       default:
-               break;
-       }
-}
-
-#if 0
-static DEFINE_MUTEX(nvm_mutex);
-#endif
-
-/**
- *  e1000e_acquire_nvm_ich8lan - Acquire NVM mutex
- *  @hw: pointer to the HW structure
- *
- *  Acquires the mutex for performing NVM operations.
- **/
-static s32 e1000e_acquire_nvm_ich8lan(struct e1000_hw *hw __unused)
-{
-#if 0
-       mutex_lock(&nvm_mutex);
-#endif
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_release_nvm_ich8lan - Release NVM mutex
- *  @hw: pointer to the HW structure
- *
- *  Releases the mutex used while performing NVM operations.
- **/
-static void e1000e_release_nvm_ich8lan(struct e1000_hw *hw __unused)
-{
-#if 0
-       mutex_unlock(&nvm_mutex);
-#endif
-       return;
-}
-
-#if 0
-static DEFINE_MUTEX(swflag_mutex);
-#endif
-
-/**
- *  e1000e_acquire_swflag_ich8lan - Acquire software control flag
- *  @hw: pointer to the HW structure
- *
- *  Acquires the software control flag for performing PHY and select
- *  MAC CSR accesses.
- **/
-static s32 e1000e_acquire_swflag_ich8lan(struct e1000_hw *hw)
-{
-       u32 extcnf_ctrl, timeout = PHY_CFG_TIMEOUT;
-       s32 ret_val = E1000_SUCCESS;
-
-#if 0
-       mutex_lock(&swflag_mutex);
-#endif
-
-       while (timeout) {
-               extcnf_ctrl = er32(EXTCNF_CTRL);
-               if (!(extcnf_ctrl & E1000_EXTCNF_CTRL_SWFLAG))
-                       break;
-
-               mdelay(1);
-               timeout--;
-       }
-
-       if (!timeout) {
-               e_dbg("SW/FW/HW has locked the resource for too long.\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       timeout = SW_FLAG_TIMEOUT;
-
-       extcnf_ctrl |= E1000_EXTCNF_CTRL_SWFLAG;
-       ew32(EXTCNF_CTRL, extcnf_ctrl);
-
-       while (timeout) {
-               extcnf_ctrl = er32(EXTCNF_CTRL);
-               if (extcnf_ctrl & E1000_EXTCNF_CTRL_SWFLAG)
-                       break;
-
-               mdelay(1);
-               timeout--;
-       }
-
-       if (!timeout) {
-               e_dbg("Failed to acquire the semaphore.\n");
-               extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG;
-               ew32(EXTCNF_CTRL, extcnf_ctrl);
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-out:
-#if 0
-       if (ret_val)
-               mutex_unlock(&swflag_mutex);
-#endif
-       return ret_val;
-}
-
-/**
- *  e1000e_release_swflag_ich8lan - Release software control flag
- *  @hw: pointer to the HW structure
- *
- *  Releases the software control flag for performing PHY and select
- *  MAC CSR accesses.
- **/
-static void e1000e_release_swflag_ich8lan(struct e1000_hw *hw)
-{
-       u32 extcnf_ctrl;
-
-       extcnf_ctrl = er32(EXTCNF_CTRL);
-       extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG;
-       ew32(EXTCNF_CTRL, extcnf_ctrl);
-
-#if 0
-       mutex_unlock(&swflag_mutex);
-#endif
-       return;
-}
-
-/**
- *  e1000e_check_mng_mode_ich8lan - Checks management mode
- *  @hw: pointer to the HW structure
- *
- *  This checks if the adapter has manageability enabled.
- *  This is a function pointer entry point only called by read/write
- *  routines for the PHY and NVM parts.
- **/
-static bool e1000e_check_mng_mode_ich8lan(struct e1000_hw *hw)
-{
-       u32 fwsm;
-
-       fwsm = er32(FWSM);
-       return (fwsm & E1000_FWSM_MODE_MASK) ==
-               (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT);
-}
-/**
- *  e1000e_check_reset_block_ich8lan - Check if PHY reset is blocked
- *  @hw: pointer to the HW structure
- *
- *  Checks if firmware is blocking the reset of the PHY.
- *  This is a function pointer entry point only called by
- *  reset routines.
- **/
-static s32 e1000e_check_reset_block_ich8lan(struct e1000_hw *hw)
-{
-       u32 fwsm;
-
-       fwsm = er32(FWSM);
-       return (fwsm & E1000_ICH_FWSM_RSPCIPHY) ? E1000_SUCCESS
-                                               : E1000_BLK_PHY_RESET;
-}
-
-/**
- *  e1000e_sw_lcd_config_ich8lan - SW-based LCD Configuration
- *  @hw:   pointer to the HW structure
- *
- *  SW should configure the LCD from the NVM extended configuration region
- *  as a workaround for certain parts.
- **/
-static s32 e1000e_sw_lcd_config_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 i, data, cnf_size, cnf_base_addr, sw_cfg_mask;
-       s32 ret_val;
-       u16 word_addr, reg_data, reg_addr, phy_page = 0;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               return ret_val;
-
-       /*
-        * Initialize the PHY from the NVM on ICH platforms.  This
-        * is needed due to an issue where the NVM configuration is
-        * not properly autoloaded after power transitions.
-        * Therefore, after each PHY reset, we will load the
-        * configuration data out of the NVM manually.
-        */
-       if ((hw->mac.type == e1000_ich8lan && phy->type == e1000_phy_igp_3) ||
-               (hw->mac.type == e1000_pchlan)) {
-               /* Check if SW needs to configure the PHY */
-               if ((hw->device_id == E1000_DEV_ID_ICH8_IGP_M_AMT) ||
-                   (hw->device_id == E1000_DEV_ID_ICH8_IGP_M) ||
-                   (hw->mac.type == e1000_pchlan) ||
-                   (hw->mac.type == e1000_pch2lan))
-                       sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;
-               else
-                       sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG;
-
-               data = er32(FEXTNVM);
-               if (!(data & sw_cfg_mask))
-                       goto out;
-
-               /* Wait for basic configuration completes before proceeding */
-               e1000e_lan_init_done_ich8lan(hw);
-
-               if (hw->mac.type != e1000_pch2lan) {
-                       /*
-                        * Make sure HW does not configure LCD from PHY
-                        * extended configuration before SW configuration
-                        */
-                       data = er32(EXTCNF_CTRL);
-                       if (data & E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE)
-                               goto out;
-               }
-
-               cnf_size = er32(EXTCNF_SIZE);
-               cnf_size &= E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK;
-               cnf_size >>= E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_SHIFT;
-               if (!cnf_size)
-                       goto out;
-
-               cnf_base_addr = data & E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK;
-               cnf_base_addr >>= E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT;
-
-               if (!(data & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE) &&
-                   (hw->mac.type == e1000_pchlan ||
-                    hw->mac.type == e1000_pch2lan)) {
-                       /*
-                        * HW configures the SMBus address and LEDs when the
-                        * OEM and LCD Write Enable bits are set in the NVM.
-                        * When both NVM bits are cleared, SW will configure
-                        * them instead.
-                        */
-                       data = er32(STRAP);
-                       data &= E1000_STRAP_SMBUS_ADDRESS_MASK;
-                       reg_data = data >> E1000_STRAP_SMBUS_ADDRESS_SHIFT;
-                       reg_data |= HV_SMB_ADDR_PEC_EN | HV_SMB_ADDR_VALID;
-                       ret_val = e1000e_write_phy_reg_hv_locked(hw, HV_SMB_ADDR,
-                                                               reg_data);
-                       if (ret_val)
-                               goto out;
-
-                       data = er32(LEDCTL);
-                       ret_val = e1000e_write_phy_reg_hv_locked(hw,
-                                                               HV_LED_CONFIG,
-                                                               (u16)data);
-                       if (ret_val)
-                               goto out;
-               }
-
-               /* Configure LCD from extended configuration region. */
-
-               /* cnf_base_addr is in DWORD */
-               word_addr = (u16)(cnf_base_addr << 1);
-
-               for (i = 0; i < cnf_size; i++) {
-                       ret_val = e1000e_read_nvm(hw, (word_addr + i * 2), 1,
-                                                  &reg_data);
-                       if (ret_val)
-                               goto out;
-
-                       ret_val = e1000e_read_nvm(hw, (word_addr + i * 2 + 1),
-                                                  1, &reg_addr);
-                       if (ret_val)
-                               goto out;
-
-                       /* Save off the PHY page for future writes. */
-                       if (reg_addr == IGP01E1000_PHY_PAGE_SELECT) {
-                               phy_page = reg_data;
-                               continue;
-                       }
-
-                       reg_addr &= PHY_REG_MASK;
-                       reg_addr |= phy_page;
-
-                       ret_val = phy->ops.write_reg_locked(hw, (u32)reg_addr,
-                                                           reg_data);
-                       if (ret_val)
-                               goto out;
-               }
-       }
-
-out:
-       hw->phy.ops.release(hw);
-       return ret_val;
-}
-
-/**
- *  e1000e_k1_gig_workaround_hv - K1 Si workaround
- *  @hw:   pointer to the HW structure
- *  @link: link up bool flag
- *
- *  If K1 is enabled for 1Gbps, the MAC might stall when transitioning
- *  from a lower speed.  This workaround disables K1 whenever link is at 1Gig
- *  If link is down, the function will restore the default K1 setting located
- *  in the NVM.
- **/
-static s32 e1000e_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 status_reg = 0;
-       bool k1_enable = hw->dev_spec.ich8lan.nvm_k1_enabled;
-
-       if (hw->mac.type != e1000_pchlan)
-               goto out;
-
-       /* Wrap the whole flow with the sw flag */
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       /* Disable K1 when link is 1Gbps, otherwise use the NVM setting */
-       if (link) {
-               if (hw->phy.type == e1000_phy_82578) {
-                       ret_val = hw->phy.ops.read_reg_locked(hw, BM_CS_STATUS,
-                                                             &status_reg);
-                       if (ret_val)
-                               goto release;
-
-                       status_reg &= BM_CS_STATUS_LINK_UP |
-                                     BM_CS_STATUS_RESOLVED |
-                                     BM_CS_STATUS_SPEED_MASK;
-
-                       if (status_reg == (BM_CS_STATUS_LINK_UP |
-                                          BM_CS_STATUS_RESOLVED |
-                                          BM_CS_STATUS_SPEED_1000))
-                               k1_enable = false;
-               }
-
-               if (hw->phy.type == e1000_phy_82577) {
-                       ret_val = hw->phy.ops.read_reg_locked(hw, HV_M_STATUS,
-                                                             &status_reg);
-                       if (ret_val)
-                               goto release;
-
-                       status_reg &= HV_M_STATUS_LINK_UP |
-                                     HV_M_STATUS_AUTONEG_COMPLETE |
-                                     HV_M_STATUS_SPEED_MASK;
-
-                       if (status_reg == (HV_M_STATUS_LINK_UP |
-                                          HV_M_STATUS_AUTONEG_COMPLETE |
-                                          HV_M_STATUS_SPEED_1000))
-                               k1_enable = false;
-               }
-
-               /* Link stall fix for link up */
-               ret_val = hw->phy.ops.write_reg_locked(hw, PHY_REG(770, 19),
-                                                      0x0100);
-               if (ret_val)
-                       goto release;
-
-       } else {
-               /* Link stall fix for link down */
-               ret_val = hw->phy.ops.write_reg_locked(hw, PHY_REG(770, 19),
-                                                      0x4100);
-               if (ret_val)
-                       goto release;
-       }
-
-       ret_val = e1000e_configure_k1_ich8lan(hw, k1_enable);
-
-release:
-       hw->phy.ops.release(hw);
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_configure_k1_ich8lan - Configure K1 power state
- *  @hw: pointer to the HW structure
- *  @enable: K1 state to configure
- *
- *  Configure the K1 power state based on the provided parameter.
- *  Assumes semaphore already acquired.
- *
- *  Success returns 0, Failure returns -E1000_ERR_PHY (-2)
- **/
-s32 e1000e_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u32 ctrl_reg = 0;
-       u32 ctrl_ext = 0;
-       u32 reg = 0;
-       u16 kmrn_reg = 0;
-
-       ret_val = e1000e_read_kmrn_reg_locked(hw,
-                                            E1000_KMRNCTRLSTA_K1_CONFIG,
-                                            &kmrn_reg);
-       if (ret_val)
-               goto out;
-
-       if (k1_enable)
-               kmrn_reg |= E1000_KMRNCTRLSTA_K1_ENABLE;
-       else
-               kmrn_reg &= ~E1000_KMRNCTRLSTA_K1_ENABLE;
-
-       ret_val = e1000e_write_kmrn_reg_locked(hw,
-                                             E1000_KMRNCTRLSTA_K1_CONFIG,
-                                             kmrn_reg);
-       if (ret_val)
-               goto out;
-
-       udelay(20);
-       ctrl_ext = er32(CTRL_EXT);
-       ctrl_reg = er32(CTRL);
-
-       reg = ctrl_reg & ~(E1000_CTRL_SPD_1000 | E1000_CTRL_SPD_100);
-       reg |= E1000_CTRL_FRCSPD;
-       ew32(CTRL, reg);
-
-       E1000_WRITE_REG(hw,
-                       E1000_CTRL_EXT,
-                       ctrl_ext | E1000_CTRL_EXT_SPD_BYPS);
-       udelay(20);
-       ew32(CTRL, ctrl_reg);
-       ew32(CTRL_EXT, ctrl_ext);
-       udelay(20);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_oem_bits_config_ich8lan - SW-based LCD Configuration
- *  @hw:       pointer to the HW structure
- *  @d0_state: boolean if entering d0 or d3 device state
- *
- *  SW will configure Gbe Disable and LPLU based on the NVM. The four bits are
- *  collectively called OEM bits.  The OEM Write Enable bit and SW Config bit
- *  in NVM determines whether HW should configure LPLU and Gbe Disable.
- **/
-s32 e1000e_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
-{
-       s32 ret_val = 0;
-       u32 mac_reg;
-       u16 oem_reg;
-
-       if (hw->mac.type != e1000_pchlan && hw->mac.type != e1000_pch2lan)
-               return ret_val;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               return ret_val;
-
-       if (hw->mac.type != e1000_pch2lan) {
-               mac_reg = er32(EXTCNF_CTRL);
-               if (mac_reg & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE)
-                       goto out;
-       }
-
-       mac_reg = er32(FEXTNVM);
-       if (!(mac_reg & E1000_FEXTNVM_SW_CONFIG_ICH8M))
-               goto out;
-
-       mac_reg = er32(PHY_CTRL);
-
-       ret_val = hw->phy.ops.read_reg_locked(hw, HV_OEM_BITS, &oem_reg);
-       if (ret_val)
-               goto out;
-
-       oem_reg &= ~(HV_OEM_BITS_GBE_DIS | HV_OEM_BITS_LPLU);
-
-       if (d0_state) {
-               if (mac_reg & E1000_PHY_CTRL_GBE_DISABLE)
-                       oem_reg |= HV_OEM_BITS_GBE_DIS;
-
-               if (mac_reg & E1000_PHY_CTRL_D0A_LPLU)
-                       oem_reg |= HV_OEM_BITS_LPLU;
-       } else {
-               if (mac_reg & E1000_PHY_CTRL_NOND0A_GBE_DISABLE)
-                       oem_reg |= HV_OEM_BITS_GBE_DIS;
-
-               if (mac_reg & E1000_PHY_CTRL_NOND0A_LPLU)
-                       oem_reg |= HV_OEM_BITS_LPLU;
-       }
-       /* Restart auto-neg to activate the bits */
-       if (!e1000e_check_reset_block(hw))
-               oem_reg |= HV_OEM_BITS_RESTART_AN;
-       ret_val = hw->phy.ops.write_reg_locked(hw, HV_OEM_BITS, oem_reg);
-
-out:
-       hw->phy.ops.release(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000e_hv_phy_workarounds_ich8lan - A series of Phy workarounds to be
- *  done after every PHY reset.
- **/
-static s32 e1000e_hv_phy_workarounds_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->mac.type != e1000_pchlan)
-               goto out;
-
-       if (((hw->phy.type == e1000_phy_82577) &&
-            ((hw->phy.revision == 1) || (hw->phy.revision == 2))) ||
-           ((hw->phy.type == e1000_phy_82578) && (hw->phy.revision == 1))) {
-               /* Disable generation of early preamble */
-               ret_val = e1e_wphy(hw, PHY_REG(769, 25), 0x4431);
-               if (ret_val)
-                       goto out;
-
-               /* Preamble tuning for SSC */
-               ret_val = e1e_wphy(hw, PHY_REG(770, 16), 0xA204);
-               if (ret_val)
-                       goto out;
-       }
-
-       if (hw->phy.type == e1000_phy_82578) {
-               /*
-                * Return registers to default by doing a soft reset then
-                * writing 0x3140 to the control register.
-                */
-               if (hw->phy.revision < 2) {
-                       e1000e_phy_sw_reset(hw);
-                       ret_val = e1e_wphy(hw, PHY_CONTROL,
-                                                       0x3140);
-               }
-       }
-
-       /* Select page 0 */
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       hw->phy.addr = 1;
-       ret_val = e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT, 0);
-       if (ret_val)
-               goto out;
-       hw->phy.ops.release(hw);
-
-       /*
-        * Configure the K1 Si workaround during phy reset assuming there is
-        * link so that it disables K1 if link is in 1Gbps.
-        */
-       ret_val = e1000e_k1_gig_workaround_hv(hw, true);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_lan_init_done_ich8lan - Check for PHY config completion
- *  @hw: pointer to the HW structure
- *
- *  Check the appropriate indication the MAC has finished configuring the
- *  PHY after a software reset.
- **/
-static void e1000e_lan_init_done_ich8lan(struct e1000_hw *hw)
-{
-       u32 data, loop = E1000_ICH8_LAN_INIT_TIMEOUT;
-
-       /* Wait for basic configuration completes before proceeding */
-       do {
-               data = er32(STATUS);
-               data &= E1000_STATUS_LAN_INIT_DONE;
-               udelay(100);
-       } while ((!data) && --loop);
-
-       /*
-        * If basic configuration is incomplete before the above loop
-        * count reaches 0, loading the configuration from NVM will
-        * leave the PHY in a bad state possibly resulting in no link.
-        */
-       if (loop == 0)
-               e_dbg("LAN_INIT_DONE not set, increase timeout\n");
-
-       /* Clear the Init Done bit for the next init event */
-       data = er32(STATUS);
-       data &= ~E1000_STATUS_LAN_INIT_DONE;
-       ew32(STATUS, data);
-}
-
-/**
- *  e1000e_phy_hw_reset_ich8lan - Performs a PHY reset
- *  @hw: pointer to the HW structure
- *
- *  Resets the PHY
- *  This is a function pointer entry point called by drivers
- *  or other shared routines.
- **/
-static s32 e1000e_phy_hw_reset_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 reg;
-
-       ret_val = e1000e_phy_hw_reset_generic(hw);
-       if (ret_val)
-               goto out;
-
-       /* Allow time for h/w to get to a quiescent state after reset */
-       msleep(10);
-
-       if (hw->mac.type == e1000_pchlan) {
-               ret_val = e1000e_hv_phy_workarounds_ich8lan(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       /* Dummy read to clear the phy wakeup bit after lcd reset */
-       if (hw->mac.type == e1000_pchlan)
-               e1e_rphy(hw, BM_WUC, &reg);
-
-       /* Configure the LCD with the extended configuration region in NVM */
-       ret_val = e1000e_sw_lcd_config_ich8lan(hw);
-       if (ret_val)
-               goto out;
-
-       /* Configure the LCD with the OEM bits in NVM */
-       if (hw->mac.type == e1000_pchlan)
-               ret_val = e1000e_oem_bits_config_ich8lan(hw, true);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_get_phy_info_ich8lan - Calls appropriate PHY type get_phy_info
- *  @hw: pointer to the HW structure
- *
- *  Wrapper for calling the get_phy_info routines for the appropriate phy type.
- **/
-static s32 e1000e_get_phy_info_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = -E1000_ERR_PHY_TYPE;
-
-       switch (hw->phy.type) {
-       case e1000_phy_ife:
-               ret_val = e1000e_get_phy_info_ife_ich8lan(hw);
-               break;
-       case e1000_phy_igp_3:
-       case e1000_phy_bm:
-       case e1000_phy_82578:
-       case e1000_phy_82577:
-               ret_val = e1000e_get_phy_info_igp(hw);
-               break;
-       default:
-               break;
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000e_get_phy_info_ife_ich8lan - Retrieves various IFE PHY states
- *  @hw: pointer to the HW structure
- *
- *  Populates "phy" structure with various feature states.
- *  This function is only called by other family-specific
- *  routines.
- **/
-static s32 e1000e_get_phy_info_ife_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-       bool link;
-
-       ret_val = e1000e_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               e_dbg("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ret_val = e1e_rphy(hw, IFE_PHY_SPECIAL_CONTROL, &data);
-       if (ret_val)
-               goto out;
-       phy->polarity_correction = (data & IFE_PSC_AUTO_POLARITY_DISABLE)
-                                  ? false : true;
-
-       if (phy->polarity_correction) {
-               ret_val = e1000e_check_polarity_ife(hw);
-               if (ret_val)
-                       goto out;
-       } else {
-               /* Polarity is forced */
-               phy->cable_polarity = (data & IFE_PSC_FORCE_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
-       }
-
-       ret_val = e1e_rphy(hw, IFE_PHY_MDIX_CONTROL, &data);
-       if (ret_val)
-               goto out;
-
-       phy->is_mdix = (data & IFE_PMC_MDIX_STATUS) ? true : false;
-
-       /* The following parameters are undefined for 10/100 operation. */
-       phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
-       phy->local_rx = e1000_1000t_rx_status_undefined;
-       phy->remote_rx = e1000_1000t_rx_status_undefined;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_set_lplu_state_pchlan - Set Low Power Link Up state
- *  @hw: pointer to the HW structure
- *  @active: true to enable LPLU, false to disable
- *
- *  Sets the LPLU state according to the active flag.  For PCH, if OEM write
- *  bit are disabled in the NVM, writing the LPLU bits in the MAC will not set
- *  the phy speed. This function will manually set the LPLU bit and restart
- *  auto-neg as hw would do. D3 and D0 LPLU will call the same function
- *  since it configures the same bit.
- **/
-static s32 e1000e_set_lplu_state_pchlan(struct e1000_hw *hw, bool active)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 oem_reg;
-
-       ret_val = e1e_rphy(hw, HV_OEM_BITS, &oem_reg);
-       if (ret_val)
-               goto out;
-
-       if (active)
-               oem_reg |= HV_OEM_BITS_LPLU;
-       else
-               oem_reg &= ~HV_OEM_BITS_LPLU;
-
-       oem_reg |= HV_OEM_BITS_RESTART_AN;
-       ret_val = e1e_wphy(hw, HV_OEM_BITS, oem_reg);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_set_d0_lplu_state_ich8lan - Set Low Power Linkup D0 state
- *  @hw: pointer to the HW structure
- *  @active: true to enable LPLU, false to disable
- *
- *  Sets the LPLU D0 state according to the active flag.  When
- *  activating LPLU this function also disables smart speed
- *  and vice versa.  LPLU will not be activated unless the
- *  device autonegotiation advertisement meets standards of
- *  either 10 or 10/100 or 10/100/1000 at all duplexes.
- *  This is a function pointer entry point only called by
- *  PHY setup routines.
- **/
-static s32 e1000e_set_d0_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 phy_ctrl;
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       if (phy->type == e1000_phy_ife)
-               goto out;
-
-       phy_ctrl = er32(PHY_CTRL);
-
-       if (active) {
-               phy_ctrl |= E1000_PHY_CTRL_D0A_LPLU;
-               ew32(PHY_CTRL, phy_ctrl);
-
-               if (phy->type != e1000_phy_igp_3)
-                       goto out;
-
-               /*
-                * Call gig speed drop workaround on LPLU before accessing
-                * any PHY registers
-                */
-               if (hw->mac.type == e1000_ich8lan)
-                       e1000e_gig_downshift_workaround_ich8lan(hw);
-
-               /* When LPLU is enabled, we should disable SmartSpeed */
-               ret_val = e1e_rphy(hw,
-                                           IGP01E1000_PHY_PORT_CONFIG,
-                                           &data);
-               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-               ret_val = e1e_wphy(hw,
-                                            IGP01E1000_PHY_PORT_CONFIG,
-                                            data);
-               if (ret_val)
-                       goto out;
-       } else {
-               phy_ctrl &= ~E1000_PHY_CTRL_D0A_LPLU;
-               ew32(PHY_CTRL, phy_ctrl);
-
-               if (phy->type != e1000_phy_igp_3)
-                       goto out;
-
-               /*
-                * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
-                * during Dx states where the power conservation is most
-                * important.  During driver activity we should enable
-                * SmartSpeed, so performance is maintained.
-                */
-               if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = e1e_rphy(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = e1e_rphy(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_set_d3_lplu_state_ich8lan - Set Low Power Linkup D3 state
- *  @hw: pointer to the HW structure
- *  @active: true to enable LPLU, false to disable
- *
- *  Sets the LPLU D3 state according to the active flag.  When
- *  activating LPLU this function also disables smart speed
- *  and vice versa.  LPLU will not be activated unless the
- *  device autonegotiation advertisement meets standards of
- *  either 10 or 10/100 or 10/100/1000 at all duplexes.
- *  This is a function pointer entry point only called by
- *  PHY setup routines.
- **/
-static s32 e1000e_set_d3_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 phy_ctrl;
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       phy_ctrl = er32(PHY_CTRL);
-
-       if (!active) {
-               phy_ctrl &= ~E1000_PHY_CTRL_NOND0A_LPLU;
-               ew32(PHY_CTRL, phy_ctrl);
-
-               if (phy->type != e1000_phy_igp_3)
-                       goto out;
-
-               /*
-                * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
-                * during Dx states where the power conservation is most
-                * important.  During driver activity we should enable
-                * SmartSpeed, so performance is maintained.
-                */
-               if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = e1e_rphy(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = e1e_rphy(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               }
-       } else if ((phy->autoneg_advertised == E1000_ALL_SPEED_DUPLEX) ||
-                  (phy->autoneg_advertised == E1000_ALL_NOT_GIG) ||
-                  (phy->autoneg_advertised == E1000_ALL_10_SPEED)) {
-               phy_ctrl |= E1000_PHY_CTRL_NOND0A_LPLU;
-               ew32(PHY_CTRL, phy_ctrl);
-
-               if (phy->type != e1000_phy_igp_3)
-                       goto out;
-
-               /*
-                * Call gig speed drop workaround on LPLU before accessing
-                * any PHY registers
-                */
-               if (hw->mac.type == e1000_ich8lan)
-                       e1000e_gig_downshift_workaround_ich8lan(hw);
-
-               /* When LPLU is enabled, we should disable SmartSpeed */
-               ret_val = e1e_rphy(hw,
-                                           IGP01E1000_PHY_PORT_CONFIG,
-                                           &data);
-               if (ret_val)
-                       goto out;
-
-               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-               ret_val = e1e_wphy(hw,
-                                            IGP01E1000_PHY_PORT_CONFIG,
-                                            data);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_valid_nvm_bank_detect_ich8lan - finds out the valid bank 0 or 1
- *  @hw: pointer to the HW structure
- *  @bank:  pointer to the variable that returns the active bank
- *
- *  Reads signature byte from the NVM using the flash access registers.
- *  Word 0x13 bits 15:14 = 10b indicate a valid signature for that bank.
- **/
-static s32 e1000e_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
-{
-       u32 eecd;
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 bank1_offset = nvm->flash_bank_size * sizeof(u16);
-       u32 act_offset = E1000_ICH_NVM_SIG_WORD * 2 + 1;
-       u8 sig_byte = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       switch (hw->mac.type) {
-       case e1000_ich8lan:
-       case e1000_ich9lan:
-               eecd = er32(EECD);
-               if ((eecd & E1000_EECD_SEC1VAL_VALID_MASK) ==
-                   E1000_EECD_SEC1VAL_VALID_MASK) {
-                       if (eecd & E1000_EECD_SEC1VAL)
-                               *bank = 1;
-                       else
-                               *bank = 0;
-
-                       goto out;
-               }
-               e_dbg("Unable to determine valid NVM bank via EEC - "
-                        "reading flash signature\n");
-               /* fall-thru */
-       default:
-               /* set bank to 0 in case flash read fails */
-               *bank = 0;
-
-               /* Check bank 0 */
-               ret_val = e1000e_read_flash_byte_ich8lan(hw, act_offset,
-                                                       &sig_byte);
-               if (ret_val)
-                       goto out;
-               if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==
-                   E1000_ICH_NVM_SIG_VALUE) {
-                       *bank = 0;
-                       goto out;
-               }
-
-               /* Check bank 1 */
-               ret_val = e1000e_read_flash_byte_ich8lan(hw, act_offset +
-                                                       bank1_offset,
-                                                       &sig_byte);
-               if (ret_val)
-                       goto out;
-               if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==
-                   E1000_ICH_NVM_SIG_VALUE) {
-                       *bank = 1;
-                       goto out;
-               }
-
-               e_dbg("ERROR: No valid NVM bank present\n");
-               ret_val = -E1000_ERR_NVM;
-               break;
-       }
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_nvm_ich8lan - Read word(s) from the NVM
- *  @hw: pointer to the HW structure
- *  @offset: The offset (in bytes) of the word(s) to read.
- *  @words: Size of data to read in words
- *  @data: Pointer to the word(s) to read at offset.
- *
- *  Reads a word(s) from the NVM using the flash access registers.
- **/
-static s32 e1000e_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
-                                  u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
-       u32 act_offset;
-       s32 ret_val = E1000_SUCCESS;
-       u32 bank = 0;
-       u16 i, word;
-
-       if ((offset >= nvm->word_size) || (words > nvm->word_size - offset) ||
-           (words == 0)) {
-               e_dbg("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       nvm->ops.acquire(hw);
-
-       ret_val = e1000e_valid_nvm_bank_detect_ich8lan(hw, &bank);
-       if (ret_val != E1000_SUCCESS) {
-               e_dbg("Could not detect valid bank, assuming bank 0\n");
-               bank = 0;
-       }
-
-       act_offset = (bank) ? nvm->flash_bank_size : 0;
-       act_offset += offset;
-
-       ret_val = E1000_SUCCESS;
-       for (i = 0; i < words; i++) {
-               if ((dev_spec->shadow_ram) &&
-                   (dev_spec->shadow_ram[offset+i].modified)) {
-                       data[i] = dev_spec->shadow_ram[offset+i].value;
-               } else {
-                       ret_val = e1000e_read_flash_word_ich8lan(hw,
-                                                               act_offset + i,
-                                                               &word);
-                       if (ret_val)
-                               break;
-                       data[i] = word;
-               }
-       }
-
-       nvm->ops.release(hw);
-
-out:
-       if (ret_val)
-               e_dbg("NVM read error: %d\n", ret_val);
-
-       return ret_val;
-}
-
-/**
- *  e1000e_flash_cycle_init_ich8lan - Initialize flash
- *  @hw: pointer to the HW structure
- *
- *  This function does initial flash setup so that a new read/write/erase cycle
- *  can be started.
- **/
-static s32 e1000e_flash_cycle_init_ich8lan(struct e1000_hw *hw)
-{
-       union ich8_hws_flash_status hsfsts;
-       s32 ret_val = -E1000_ERR_NVM;
-       s32 i = 0;
-
-       hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-
-       /* Check if the flash descriptor is valid */
-       if (hsfsts.hsf_status.fldesvalid == 0) {
-               e_dbg("Flash descriptor invalid.  "
-                        "SW Sequencing must be used.");
-               goto out;
-       }
-
-       /* Clear FCERR and DAEL in hw status by writing 1 */
-       hsfsts.hsf_status.flcerr = 1;
-       hsfsts.hsf_status.dael = 1;
-
-       ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
-
-       /*
-        * Either we should have a hardware SPI cycle in progress
-        * bit to check against, in order to start a new cycle or
-        * FDONE bit should be changed in the hardware so that it
-        * is 1 after hardware reset, which can then be used as an
-        * indication whether a cycle is in progress or has been
-        * completed.
-        */
-
-       if (hsfsts.hsf_status.flcinprog == 0) {
-               /*
-                * There is no cycle running at present,
-                * so we can start a cycle.
-                * Begin by setting Flash Cycle Done.
-                */
-               hsfsts.hsf_status.flcdone = 1;
-               ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
-               ret_val = E1000_SUCCESS;
-       } else {
-               /*
-                * Otherwise poll for sometime so the current
-                * cycle has a chance to end before giving up.
-                */
-               for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) {
-                       hsfsts.regval = er16flash(
-                                                             ICH_FLASH_HSFSTS);
-                       if (hsfsts.hsf_status.flcinprog == 0) {
-                               ret_val = E1000_SUCCESS;
-                               break;
-                       }
-                       udelay(1);
-               }
-               if (ret_val == E1000_SUCCESS) {
-                       /*
-                        * Successful in waiting for previous cycle to timeout,
-                        * now set the Flash Cycle Done.
-                        */
-                       hsfsts.hsf_status.flcdone = 1;
-                       ew16flash(ICH_FLASH_HSFSTS,
-                                               hsfsts.regval);
-               } else {
-                       e_dbg("Flash controller busy, cannot get access");
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_flash_cycle_ich8lan - Starts flash cycle (read/write/erase)
- *  @hw: pointer to the HW structure
- *  @timeout: maximum time to wait for completion
- *
- *  This function starts a flash cycle and waits for its completion.
- **/
-static s32 e1000e_flash_cycle_ich8lan(struct e1000_hw *hw, u32 timeout)
-{
-       union ich8_hws_flash_ctrl hsflctl;
-       union ich8_hws_flash_status hsfsts;
-       s32 ret_val = -E1000_ERR_NVM;
-       u32 i = 0;
-
-       /* Start a cycle by writing 1 in Flash Cycle Go in Hw Flash Control */
-       hsflctl.regval = er16flash(ICH_FLASH_HSFCTL);
-       hsflctl.hsf_ctrl.flcgo = 1;
-       ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval);
-
-       /* wait till FDONE bit is set to 1 */
-       do {
-               hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-               if (hsfsts.hsf_status.flcdone == 1)
-                       break;
-               udelay(1);
-       } while (i++ < timeout);
-
-       if (hsfsts.hsf_status.flcdone == 1 && hsfsts.hsf_status.flcerr == 0)
-               ret_val = E1000_SUCCESS;
-
-       return ret_val;
-}
-
-/**
- *  e1000e_read_flash_word_ich8lan - Read word from flash
- *  @hw: pointer to the HW structure
- *  @offset: offset to data location
- *  @data: pointer to the location for storing the data
- *
- *  Reads the flash word at offset into data.  Offset is converted
- *  to bytes before read.
- **/
-static s32 e1000e_read_flash_word_ich8lan(struct e1000_hw *hw, u32 offset,
-                                         u16 *data)
-{
-       s32 ret_val;
-
-       if (!data) {
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       /* Must convert offset into bytes. */
-       offset <<= 1;
-
-       ret_val = e1000e_read_flash_data_ich8lan(hw, offset, 2, data);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_flash_byte_ich8lan - Read byte from flash
- *  @hw: pointer to the HW structure
- *  @offset: The offset of the byte to read.
- *  @data: Pointer to a byte to store the value read.
- *
- *  Reads a single byte from the NVM using the flash access registers.
- **/
-static s32 e1000e_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
-                                         u8 *data)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 word = 0;
-
-       ret_val = e1000e_read_flash_data_ich8lan(hw, offset, 1, &word);
-       if (ret_val)
-               goto out;
-
-       *data = (u8)word;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_flash_data_ich8lan - Read byte or word from NVM
- *  @hw: pointer to the HW structure
- *  @offset: The offset (in bytes) of the byte or word to read.
- *  @size: Size of data to read, 1=byte 2=word
- *  @data: Pointer to the word to store the value read.
- *
- *  Reads a byte or word from the NVM using the flash access registers.
- **/
-static s32 e1000e_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
-                                         u8 size, u16 *data)
-{
-       union ich8_hws_flash_status hsfsts;
-       union ich8_hws_flash_ctrl hsflctl;
-       u32 flash_linear_addr;
-       u32 flash_data = 0;
-       s32 ret_val = -E1000_ERR_NVM;
-       u8 count = 0;
-
-       if (size < 1  || size > 2 || offset > ICH_FLASH_LINEAR_ADDR_MASK)
-               goto out;
-       flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +
-                           hw->nvm.flash_base_addr;
-
-       do {
-               udelay(1);
-               /* Steps */
-               ret_val = e1000e_flash_cycle_init_ich8lan(hw);
-               if (ret_val != E1000_SUCCESS)
-                       break;
-
-               hsflctl.regval = er16flash(ICH_FLASH_HSFCTL);
-               /* 0b/1b corresponds to 1 or 2 byte size, respectively. */
-               hsflctl.hsf_ctrl.fldbcount = size - 1;
-               hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_READ;
-               ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval);
-
-               ew32flash(ICH_FLASH_FADDR, flash_linear_addr);
-
-               ret_val = e1000e_flash_cycle_ich8lan(hw,
-                                               ICH_FLASH_READ_COMMAND_TIMEOUT);
-
-               /*
-                * Check if FCERR is set to 1, if set to 1, clear it
-                * and try the whole sequence a few more times, else
-                * read in (shift in) the Flash Data0, the order is
-                * least significant byte first msb to lsb
-                */
-               if (ret_val == E1000_SUCCESS) {
-                       flash_data = er32flash(ICH_FLASH_FDATA0);
-                       if (size == 1)
-                               *data = (u8)(flash_data & 0x000000FF);
-                       else if (size == 2)
-                               *data = (u16)(flash_data & 0x0000FFFF);
-                       break;
-               } else {
-                       /*
-                        * If we've gotten here, then things are probably
-                        * completely hosed, but if the error condition is
-                        * detected, it won't hurt to give it another try...
-                        * ICH_FLASH_CYCLE_REPEAT_COUNT times.
-                        */
-                       hsfsts.regval = er16flash(
-                                                             ICH_FLASH_HSFSTS);
-                       if (hsfsts.hsf_status.flcerr == 1) {
-                               /* Repeat for some time before giving up. */
-                               continue;
-                       } else if (hsfsts.hsf_status.flcdone == 0) {
-                               e_dbg("Timeout error - flash cycle "
-                                        "did not complete.");
-                               break;
-                       }
-               }
-       } while (count++ < ICH_FLASH_CYCLE_REPEAT_COUNT);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_write_nvm_ich8lan - Write word(s) to the NVM
- *  @hw: pointer to the HW structure
- *  @offset: The offset (in bytes) of the word(s) to write.
- *  @words: Size of data to write in words
- *  @data: Pointer to the word(s) to write at offset.
- *
- *  Writes a byte or word to the NVM using the flash access registers.
- **/
-static s32 e1000e_write_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
-                                   u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
-       s32 ret_val = E1000_SUCCESS;
-       u16 i;
-
-       if ((offset >= nvm->word_size) || (words > nvm->word_size - offset) ||
-           (words == 0)) {
-               e_dbg("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       nvm->ops.acquire(hw);
-
-       for (i = 0; i < words; i++) {
-               dev_spec->shadow_ram[offset+i].modified = true;
-               dev_spec->shadow_ram[offset+i].value = data[i];
-       }
-
-       nvm->ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_update_nvm_checksum_ich8lan - Update the checksum for NVM
- *  @hw: pointer to the HW structure
- *
- *  The NVM checksum is updated by calling the generic update_nvm_checksum,
- *  which writes the checksum to the shadow ram.  The changes in the shadow
- *  ram are then committed to the EEPROM by processing each bank at a time
- *  checking for the modified bit and writing only the pending changes.
- *  After a successful commit, the shadow ram is cleared and is ready for
- *  future writes.
- **/
-static s32 e1000e_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
-       u32 i, act_offset, new_bank_offset, old_bank_offset, bank;
-       s32 ret_val;
-       u16 data;
-
-       ret_val = e1000e_update_nvm_checksum_generic(hw);
-       if (ret_val)
-               goto out;
-
-       if (nvm->type != e1000_nvm_flash_sw)
-               goto out;
-
-       nvm->ops.acquire(hw);
-
-       /*
-        * We're writing to the opposite bank so if we're on bank 1,
-        * write to bank 0 etc.  We also need to erase the segment that
-        * is going to be written
-        */
-       ret_val =  e1000e_valid_nvm_bank_detect_ich8lan(hw, &bank);
-       if (ret_val != E1000_SUCCESS) {
-               e_dbg("Could not detect valid bank, assuming bank 0\n");
-               bank = 0;
-       }
-
-       if (bank == 0) {
-               new_bank_offset = nvm->flash_bank_size;
-               old_bank_offset = 0;
-               ret_val = e1000e_erase_flash_bank_ich8lan(hw, 1);
-               if (ret_val) {
-                       nvm->ops.release(hw);
-                       goto out;
-               }
-       } else {
-               old_bank_offset = nvm->flash_bank_size;
-               new_bank_offset = 0;
-               ret_val = e1000e_erase_flash_bank_ich8lan(hw, 0);
-               if (ret_val) {
-                       nvm->ops.release(hw);
-                       goto out;
-               }
-       }
-
-       for (i = 0; i < E1000_ICH8_SHADOW_RAM_WORDS; i++) {
-               /*
-                * Determine whether to write the value stored
-                * in the other NVM bank or a modified value stored
-                * in the shadow RAM
-                */
-               if (dev_spec->shadow_ram[i].modified) {
-                       data = dev_spec->shadow_ram[i].value;
-               } else {
-                       ret_val = e1000e_read_flash_word_ich8lan(hw, i +
-                                                               old_bank_offset,
-                                                               &data);
-                       if (ret_val)
-                               break;
-               }
-
-               /*
-                * If the word is 0x13, then make sure the signature bits
-                * (15:14) are 11b until the commit has completed.
-                * This will allow us to write 10b which indicates the
-                * signature is valid.  We want to do this after the write
-                * has completed so that we don't mark the segment valid
-                * while the write is still in progress
-                */
-               if (i == E1000_ICH_NVM_SIG_WORD)
-                       data |= E1000_ICH_NVM_SIG_MASK;
-
-               /* Convert offset to bytes. */
-               act_offset = (i + new_bank_offset) << 1;
-
-               udelay(100);
-               /* Write the bytes to the new bank. */
-               ret_val = e1000e_retry_write_flash_byte_ich8lan(hw,
-                                                              act_offset,
-                                                              (u8)data);
-               if (ret_val)
-                       break;
-
-               udelay(100);
-               ret_val = e1000e_retry_write_flash_byte_ich8lan(hw,
-                                                         act_offset + 1,
-                                                         (u8)(data >> 8));
-               if (ret_val)
-                       break;
-       }
-
-       /*
-        * Don't bother writing the segment valid bits if sector
-        * programming failed.
-        */
-       if (ret_val) {
-               e_dbg("Flash commit failed.\n");
-               nvm->ops.release(hw);
-               goto out;
-       }
-
-       /*
-        * Finally validate the new segment by setting bit 15:14
-        * to 10b in word 0x13 , this can be done without an
-        * erase as well since these bits are 11 to start with
-        * and we need to change bit 14 to 0b
-        */
-       act_offset = new_bank_offset + E1000_ICH_NVM_SIG_WORD;
-       ret_val = e1000e_read_flash_word_ich8lan(hw, act_offset, &data);
-       if (ret_val) {
-               nvm->ops.release(hw);
-               goto out;
-       }
-
-       data &= 0xBFFF;
-       ret_val = e1000e_retry_write_flash_byte_ich8lan(hw,
-                                                      act_offset * 2 + 1,
-                                                      (u8)(data >> 8));
-       if (ret_val) {
-               nvm->ops.release(hw);
-               goto out;
-       }
-
-       /*
-        * And invalidate the previously valid segment by setting
-        * its signature word (0x13) high_byte to 0b. This can be
-        * done without an erase because flash erase sets all bits
-        * to 1's. We can write 1's to 0's without an erase
-        */
-       act_offset = (old_bank_offset + E1000_ICH_NVM_SIG_WORD) * 2 + 1;
-       ret_val = e1000e_retry_write_flash_byte_ich8lan(hw, act_offset, 0);
-       if (ret_val) {
-               nvm->ops.release(hw);
-               goto out;
-       }
-
-       /* Great!  Everything worked, we can now clear the cached entries. */
-       for (i = 0; i < E1000_ICH8_SHADOW_RAM_WORDS; i++) {
-               dev_spec->shadow_ram[i].modified = false;
-               dev_spec->shadow_ram[i].value = 0xFFFF;
-       }
-
-       nvm->ops.release(hw);
-
-       /*
-        * Reload the EEPROM, or else modifications will not appear
-        * until after the next adapter reset.
-        */
-       nvm->ops.reload(hw);
-       msleep(10);
-
-out:
-       if (ret_val)
-               e_dbg("NVM update error: %d\n", ret_val);
-
-       return ret_val;
-}
-
-/**
- *  e1000e_validate_nvm_checksum_ich8lan - Validate EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Check to see if checksum needs to be fixed by reading bit 6 in word 0x19.
- *  If the bit is 0, that the EEPROM had been modified, but the checksum was not
- *  calculated, in which case we need to calculate the checksum and set bit 6.
- **/
-static s32 e1000e_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       /*
-        * Read 0x19 and check bit 6.  If this bit is 0, the checksum
-        * needs to be fixed.  This bit is an indication that the NVM
-        * was prepared by OEM software and did not calculate the
-        * checksum...a likely scenario.
-        */
-       ret_val = e1000e_read_nvm(hw, 0x19, 1, &data);
-       if (ret_val)
-               goto out;
-
-       if ((data & 0x40) == 0) {
-               data |= 0x40;
-               ret_val = e1000e_write_nvm(hw, 0x19, 1, &data);
-               if (ret_val)
-                       goto out;
-               ret_val = e1000e_update_nvm_checksum(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1000e_validate_nvm_checksum_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_write_flash_data_ich8lan - Writes bytes to the NVM
- *  @hw: pointer to the HW structure
- *  @offset: The offset (in bytes) of the byte/word to read.
- *  @size: Size of data to read, 1=byte 2=word
- *  @data: The byte(s) to write to the NVM.
- *
- *  Writes one/two bytes to the NVM using the flash access registers.
- **/
-static s32 e1000e_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
-                                          u8 size, u16 data)
-{
-       union ich8_hws_flash_status hsfsts;
-       union ich8_hws_flash_ctrl hsflctl;
-       u32 flash_linear_addr;
-       u32 flash_data = 0;
-       s32 ret_val = -E1000_ERR_NVM;
-       u8 count = 0;
-
-       if (size < 1 || size > 2 || data > size * 0xff ||
-           offset > ICH_FLASH_LINEAR_ADDR_MASK)
-               goto out;
-
-       flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +
-                           hw->nvm.flash_base_addr;
-
-       do {
-               udelay(1);
-               /* Steps */
-               ret_val = e1000e_flash_cycle_init_ich8lan(hw);
-               if (ret_val != E1000_SUCCESS)
-                       break;
-
-               hsflctl.regval = er16flash(ICH_FLASH_HSFCTL);
-               /* 0b/1b corresponds to 1 or 2 byte size, respectively. */
-               hsflctl.hsf_ctrl.fldbcount = size - 1;
-               hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_WRITE;
-               ew16flash(ICH_FLASH_HSFCTL, hsflctl.regval);
-
-               ew32flash(ICH_FLASH_FADDR, flash_linear_addr);
-
-               if (size == 1)
-                       flash_data = (u32)data & 0x00FF;
-               else
-                       flash_data = (u32)data;
-
-               ew32flash(ICH_FLASH_FDATA0, flash_data);
-
-               /*
-                * check if FCERR is set to 1 , if set to 1, clear it
-                * and try the whole sequence a few more times else done
-                */
-               ret_val = e1000e_flash_cycle_ich8lan(hw,
-                                              ICH_FLASH_WRITE_COMMAND_TIMEOUT);
-               if (ret_val == E1000_SUCCESS)
-                       break;
-
-               /*
-                * If we're here, then things are most likely
-                * completely hosed, but if the error condition
-                * is detected, it won't hurt to give it another
-                * try...ICH_FLASH_CYCLE_REPEAT_COUNT times.
-                */
-               hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-               if (hsfsts.hsf_status.flcerr == 1) {
-                       /* Repeat for some time before giving up. */
-                       continue;
-               } else if (hsfsts.hsf_status.flcdone == 0) {
-                       e_dbg("Timeout error - flash cycle "
-                                "did not complete.");
-                       break;
-               }
-       } while (count++ < ICH_FLASH_CYCLE_REPEAT_COUNT);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_write_flash_byte_ich8lan - Write a single byte to NVM
- *  @hw: pointer to the HW structure
- *  @offset: The index of the byte to read.
- *  @data: The byte to write to the NVM.
- *
- *  Writes a single byte to the NVM using the flash access registers.
- **/
-static s32 e1000e_write_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
-                                          u8 data)
-{
-       u16 word = (u16)data;
-
-       return e1000e_write_flash_data_ich8lan(hw, offset, 1, word);
-}
-
-/**
- *  e1000e_retry_write_flash_byte_ich8lan - Writes a single byte to NVM
- *  @hw: pointer to the HW structure
- *  @offset: The offset of the byte to write.
- *  @byte: The byte to write to the NVM.
- *
- *  Writes a single byte to the NVM using the flash access registers.
- *  Goes through a retry algorithm before giving up.
- **/
-static s32 e1000e_retry_write_flash_byte_ich8lan(struct e1000_hw *hw,
-                                                u32 offset, u8 byte)
-{
-       s32 ret_val;
-       u16 program_retries;
-
-       ret_val = e1000e_write_flash_byte_ich8lan(hw, offset, byte);
-       if (ret_val == E1000_SUCCESS)
-               goto out;
-
-       for (program_retries = 0; program_retries < 100; program_retries++) {
-               e_dbg("Retrying Byte %2.2X at offset %u\n", byte, offset);
-               udelay(100);
-               ret_val = e1000e_write_flash_byte_ich8lan(hw, offset, byte);
-               if (ret_val == E1000_SUCCESS)
-                       break;
-       }
-       if (program_retries == 100) {
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_erase_flash_bank_ich8lan - Erase a bank (4k) from NVM
- *  @hw: pointer to the HW structure
- *  @bank: 0 for first bank, 1 for second bank, etc.
- *
- *  Erases the bank specified. Each bank is a 4k block. Banks are 0 based.
- *  bank N is 4096 * N + flash_reg_addr.
- **/
-static s32 e1000e_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       union ich8_hws_flash_status hsfsts;
-       union ich8_hws_flash_ctrl hsflctl;
-       u32 flash_linear_addr;
-       /* bank size is in 16bit words - adjust to bytes */
-       u32 flash_bank_size = nvm->flash_bank_size * 2;
-       s32 ret_val = E1000_SUCCESS;
-       s32 count = 0;
-       s32 j, iteration, sector_size;
-
-       hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
-
-       /*
-        * Determine HW Sector size: Read BERASE bits of hw flash status
-        * register
-        * 00: The Hw sector is 256 bytes, hence we need to erase 16
-        *     consecutive sectors.  The start index for the nth Hw sector
-        *     can be calculated as = bank * 4096 + n * 256
-        * 01: The Hw sector is 4K bytes, hence we need to erase 1 sector.
-        *     The start index for the nth Hw sector can be calculated
-        *     as = bank * 4096
-        * 10: The Hw sector is 8K bytes, nth sector = bank * 8192
-        *     (ich9 only, otherwise error condition)
-        * 11: The Hw sector is 64K bytes, nth sector = bank * 65536
-        */
-       switch (hsfsts.hsf_status.berasesz) {
-       case 0:
-               /* Hw sector size 256 */
-               sector_size = ICH_FLASH_SEG_SIZE_256;
-               iteration = flash_bank_size / ICH_FLASH_SEG_SIZE_256;
-               break;
-       case 1:
-               sector_size = ICH_FLASH_SEG_SIZE_4K;
-               iteration = 1;
-               break;
-       case 2:
-               sector_size = ICH_FLASH_SEG_SIZE_8K;
-               iteration = 1;
-               break;
-       case 3:
-               sector_size = ICH_FLASH_SEG_SIZE_64K;
-               iteration = 1;
-               break;
-       default:
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       /* Start with the base address, then add the sector offset. */
-       flash_linear_addr = hw->nvm.flash_base_addr;
-       flash_linear_addr += (bank) ? flash_bank_size : 0;
-
-       for (j = 0; j < iteration ; j++) {
-               do {
-                       /* Steps */
-                       ret_val = e1000e_flash_cycle_init_ich8lan(hw);
-                       if (ret_val)
-                               goto out;
-
-                       /*
-                        * Write a value 11 (block Erase) in Flash
-                        * Cycle field in hw flash control
-                        */
-                       hsflctl.regval = er16flash(
-                                                             ICH_FLASH_HSFCTL);
-                       hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_ERASE;
-                       ew16flash(ICH_FLASH_HSFCTL,
-                                               hsflctl.regval);
-
-                       /*
-                        * Write the last 24 bits of an index within the
-                        * block into Flash Linear address field in Flash
-                        * Address.
-                        */
-                       flash_linear_addr += (j * sector_size);
-                       ew32flash(ICH_FLASH_FADDR,
-                                             flash_linear_addr);
-
-                       ret_val = e1000e_flash_cycle_ich8lan(hw,
-                                              ICH_FLASH_ERASE_COMMAND_TIMEOUT);
-                       if (ret_val == E1000_SUCCESS)
-                               break;
-
-                       /*
-                        * Check if FCERR is set to 1.  If 1,
-                        * clear it and try the whole sequence
-                        * a few more times else Done
-                        */
-                       hsfsts.regval = er16flash(
-                                                     ICH_FLASH_HSFSTS);
-                       if (hsfsts.hsf_status.flcerr == 1)
-                               /* repeat for some time before giving up */
-                               continue;
-                       else if (hsfsts.hsf_status.flcdone == 0)
-                               goto out;
-               } while (++count < ICH_FLASH_CYCLE_REPEAT_COUNT);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_valid_led_default_ich8lan - Set the default LED settings
- *  @hw: pointer to the HW structure
- *  @data: Pointer to the LED settings
- *
- *  Reads the LED default settings from the NVM to data.  If the NVM LED
- *  settings is all 0's or F's, set the LED default to a valid LED default
- *  setting.
- **/
-static s32 e1000e_valid_led_default_ich8lan(struct e1000_hw *hw, u16 *data)
-{
-       s32 ret_val;
-
-       ret_val = e1000e_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       if (*data == ID_LED_RESERVED_0000 ||
-           *data == ID_LED_RESERVED_FFFF)
-               *data = ID_LED_DEFAULT_ICH8LAN;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_id_led_init_pchlan - store LED configurations
- *  @hw: pointer to the HW structure
- *
- *  PCH does not control LEDs via the LEDCTL register, rather it uses
- *  the PHY LED configuration register.
- *
- *  PCH also does not have an "always on" or "always off" mode which
- *  complicates the ID feature.  Instead of using the "on" mode to indicate
- *  in ledctl_mode2 the LEDs to use for ID (see e1000e_id_led_init()),
- *  use "link_up" mode.  The LEDs will still ID on request if there is no
- *  link based on logic in e1000e_led_[on|off]_pchlan().
- **/
-static s32 e1000e_id_led_init_pchlan(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val;
-       const u32 ledctl_on = E1000_LEDCTL_MODE_LINK_UP;
-       const u32 ledctl_off = E1000_LEDCTL_MODE_LINK_UP | E1000_PHY_LED0_IVRT;
-       u16 data, i, temp, shift;
-
-       /* Get default ID LED modes */
-       ret_val = hw->nvm.ops.valid_led_default(hw, &data);
-       if (ret_val)
-               goto out;
-
-       mac->ledctl_default = er32(LEDCTL);
-       mac->ledctl_mode1 = mac->ledctl_default;
-       mac->ledctl_mode2 = mac->ledctl_default;
-
-       for (i = 0; i < 4; i++) {
-               temp = (data >> (i << 2)) & E1000_LEDCTL_LED0_MODE_MASK;
-               shift = (i * 5);
-               switch (temp) {
-               case ID_LED_ON1_DEF2:
-               case ID_LED_ON1_ON2:
-               case ID_LED_ON1_OFF2:
-                       mac->ledctl_mode1 &= ~(E1000_PHY_LED0_MASK << shift);
-                       mac->ledctl_mode1 |= (ledctl_on << shift);
-                       break;
-               case ID_LED_OFF1_DEF2:
-               case ID_LED_OFF1_ON2:
-               case ID_LED_OFF1_OFF2:
-                       mac->ledctl_mode1 &= ~(E1000_PHY_LED0_MASK << shift);
-                       mac->ledctl_mode1 |= (ledctl_off << shift);
-                       break;
-               default:
-                       /* Do nothing */
-                       break;
-               }
-               switch (temp) {
-               case ID_LED_DEF1_ON2:
-               case ID_LED_ON1_ON2:
-               case ID_LED_OFF1_ON2:
-                       mac->ledctl_mode2 &= ~(E1000_PHY_LED0_MASK << shift);
-                       mac->ledctl_mode2 |= (ledctl_on << shift);
-                       break;
-               case ID_LED_DEF1_OFF2:
-               case ID_LED_ON1_OFF2:
-               case ID_LED_OFF1_OFF2:
-                       mac->ledctl_mode2 &= ~(E1000_PHY_LED0_MASK << shift);
-                       mac->ledctl_mode2 |= (ledctl_off << shift);
-                       break;
-               default:
-                       /* Do nothing */
-                       break;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_get_bus_info_ich8lan - Get/Set the bus type and width
- *  @hw: pointer to the HW structure
- *
- *  ICH8 use the PCI Express bus, but does not contain a PCI Express Capability
- *  register, so the the bus width is hard coded.
- **/
-static s32 e1000e_get_bus_info_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_bus_info *bus = &hw->bus;
-       s32 ret_val;
-
-       ret_val = e1000e_get_bus_info_pcie(hw);
-
-       /*
-        * ICH devices are "PCI Express"-ish.  They have
-        * a configuration space, but do not contain
-        * PCI Express Capability registers, so bus width
-        * must be hardcoded.
-        */
-       if (bus->width == e1000_bus_width_unknown)
-               bus->width = e1000_bus_width_pcie_x1;
-
-       return ret_val;
-}
-
-/**
- *  e1000e_reset_hw_ich8lan - Reset the hardware
- *  @hw: pointer to the HW structure
- *
- *  Does a full reset of the hardware which includes a reset of the PHY and
- *  MAC.
- **/
-static s32 e1000e_reset_hw_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
-       u16 reg;
-       u32 ctrl, kab;
-       s32 ret_val;
-
-       /*
-        * Prevent the PCI-E bus from sticking if there is no TLP connection
-        * on the last TLP read/write transaction when MAC is reset.
-        */
-       ret_val = e1000e_disable_pcie_master(hw);
-       if (ret_val)
-               e_dbg("PCI-E Master disable polling has failed.\n");
-
-       e_dbg("Masking off all interrupts\n");
-       ew32(IMC, 0xffffffff);
-
-       /*
-        * Disable the Transmit and Receive units.  Then delay to allow
-        * any pending transactions to complete before we hit the MAC
-        * with the global reset.
-        */
-       ew32(RCTL, 0);
-       ew32(TCTL, E1000_TCTL_PSP);
-       e1e_flush();
-
-       msleep(10);
-
-       /* Workaround for ICH8 bit corruption issue in FIFO memory */
-       if (hw->mac.type == e1000_ich8lan) {
-               /* Set Tx and Rx buffer allocation to 8k apiece. */
-               ew32(PBA, E1000_PBA_8K);
-               /* Set Packet Buffer Size to 16k. */
-               ew32(PBS, E1000_PBS_16K);
-       }
-
-       if (hw->mac.type == e1000_pchlan) {
-               /* Save the NVM K1 bit setting*/
-               ret_val = e1000e_read_nvm(hw, E1000_NVM_K1_CONFIG, 1, &reg);
-               if (ret_val)
-                       return ret_val;
-
-               if (reg & E1000_NVM_K1_ENABLE)
-                       dev_spec->nvm_k1_enabled = true;
-               else
-                       dev_spec->nvm_k1_enabled = false;
-       }
-
-       ctrl = er32(CTRL);
-
-       if (!e1000e_check_reset_block(hw) && !hw->phy.reset_disable) {
-               /* Clear PHY Reset Asserted bit */
-               if (hw->mac.type >= e1000_pchlan) {
-                       u32 status = er32(STATUS);
-                       ew32(STATUS, status &
-                                       ~E1000_STATUS_PHYRA);
-               }
-
-               /*
-                * PHY HW reset requires MAC CORE reset at the same
-                * time to make sure the interface between MAC and the
-                * external PHY is reset.
-                */
-               ctrl |= E1000_CTRL_PHY_RST;
-       }
-       ret_val = e1000e_acquire_swflag_ich8lan(hw);
-       e_dbg("Issuing a global reset to ich8lan\n");
-       ew32(CTRL, (ctrl | E1000_CTRL_RST));
-       msleep(20);
-
-       if (!ret_val)
-               e1000e_release_swflag_ich8lan(hw);
-
-       if (ctrl & E1000_CTRL_PHY_RST)
-               ret_val = hw->phy.ops.get_cfg_done(hw);
-
-       if (hw->mac.type >= e1000_ich10lan) {
-               e1000e_lan_init_done_ich8lan(hw);
-       } else {
-               ret_val = e1000e_get_auto_rd_done(hw);
-               if (ret_val) {
-                       /*
-                        * When auto config read does not complete, do not
-                        * return with an error. This can happen in situations
-                        * where there is no eeprom and prevents getting link.
-                        */
-                       e_dbg("Auto Read Done did not complete\n");
-               }
-       }
-       /* Dummy read to clear the phy wakeup bit after lcd reset */
-       if (hw->mac.type == e1000_pchlan || hw->mac.type == e1000_pch2lan)
-               e1e_rphy(hw, BM_WUC, &reg);
-
-       ret_val = e1000e_sw_lcd_config_ich8lan(hw);
-       if (ret_val)
-               goto out;
-
-       if (hw->mac.type == e1000_pchlan) {
-               ret_val = e1000e_oem_bits_config_ich8lan(hw, true);
-               if (ret_val)
-                       goto out;
-       }
-       /*
-        * For PCH, this write will make sure that any noise
-        * will be detected as a CRC error and be dropped rather than show up
-        * as a bad packet to the DMA engine.
-        */
-       if (hw->mac.type == e1000_pchlan)
-               ew32(CRC_OFFSET, 0x65656565);
-
-       ew32(IMC, 0xffffffff);
-       er32(ICR);
-
-       kab = er32(KABGTXD);
-       kab |= E1000_KABGTXD_BGSQLBIAS;
-       ew32(KABGTXD, kab);
-
-       if (hw->mac.type == e1000_pchlan)
-               ret_val = e1000e_hv_phy_workarounds_ich8lan(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_init_hw_ich8lan - Initialize the hardware
- *  @hw: pointer to the HW structure
- *
- *  Prepares the hardware for transmit and receive by doing the following:
- *   - initialize hardware bits
- *   - initialize LED identification
- *   - setup receive address registers
- *   - setup flow control
- *   - setup transmit descriptors
- *   - clear statistics
- **/
-static s32 e1000e_init_hw_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 ctrl_ext, txdctl, snoop;
-       s32 ret_val;
-       u16 i;
-
-       e1000e_initialize_hw_bits_ich8lan(hw);
-
-       /* Initialize identification LED */
-       ret_val = mac->ops.id_led_init(hw);
-       if (ret_val)
-               /* This is not fatal and we should not stop init due to this */
-               e_dbg("Error initializing identification LED\n");
-
-       /* Setup the receive address. */
-       e1000e_init_rx_addrs(hw, mac->rar_entry_count);
-
-       /* Zero out the Multicast HASH table */
-       e_dbg("Zeroing the MTA\n");
-       for (i = 0; i < mac->mta_reg_count; i++)
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
-
-       /*
-        * The 82578 Rx buffer will stall if wakeup is enabled in host and
-        * the ME.  Reading the BM_WUC register will clear the host wakeup bit.
-        * Reset the phy after disabling host wakeup to reset the Rx buffer.
-        */
-       if (hw->phy.type == e1000_phy_82578) {
-               e1e_rphy(hw, BM_WUC, &i);
-               ret_val = e1000e_phy_hw_reset_ich8lan(hw);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       /* Setup link and flow control */
-       ret_val = mac->ops.setup_link(hw);
-
-       /* Set the transmit descriptor write-back policy for both queues */
-       txdctl = er32(TXDCTL(0));
-       txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |
-                E1000_TXDCTL_FULL_TX_DESC_WB;
-       txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |
-                E1000_TXDCTL_MAX_TX_DESC_PREFETCH;
-       ew32(TXDCTL(0), txdctl);
-       txdctl = er32(TXDCTL(1));
-       txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |
-                E1000_TXDCTL_FULL_TX_DESC_WB;
-       txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |
-                E1000_TXDCTL_MAX_TX_DESC_PREFETCH;
-       ew32(TXDCTL(1), txdctl);
-
-       /*
-        * ICH8 has opposite polarity of no_snoop bits.
-        * By default, we should use snoop behavior.
-        */
-       if (mac->type == e1000_ich8lan)
-               snoop = PCIE_ICH8_SNOOP_ALL;
-       else
-               snoop = (u32)~(PCIE_NO_SNOOP_ALL);
-       e1000e_set_pcie_no_snoop(hw, snoop);
-
-       ctrl_ext = er32(CTRL_EXT);
-       ctrl_ext |= E1000_CTRL_EXT_RO_DIS;
-       ew32(CTRL_EXT, ctrl_ext);
-
-       /*
-        * Clear all of the statistics registers (clear on read).  It is
-        * important that we do this after we have tried to establish link
-        * because the symbol error count will increment wildly if there
-        * is no link.
-        */
-       e1000e_clear_hw_cntrs_ich8lan(hw);
-
-       return ret_val;
-}
-/**
- *  e1000e_initialize_hw_bits_ich8lan - Initialize required hardware bits
- *  @hw: pointer to the HW structure
- *
- *  Sets/Clears required hardware bits necessary for correctly setting up the
- *  hardware for transmit and receive.
- **/
-static void e1000e_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
-{
-       u32 reg;
-
-       /* Extended Device Control */
-       reg = er32(CTRL_EXT);
-       reg |= (1 << 22);
-       /* Enable PHY low-power state when MAC is at D3 w/o WoL */
-       if (hw->mac.type >= e1000_pchlan)
-               reg |= E1000_CTRL_EXT_PHYPDEN;
-       ew32(CTRL_EXT, reg);
-
-       /* Transmit Descriptor Control 0 */
-       reg = er32(TXDCTL(0));
-       reg |= (1 << 22);
-       ew32(TXDCTL(0), reg);
-
-       /* Transmit Descriptor Control 1 */
-       reg = er32(TXDCTL(1));
-       reg |= (1 << 22);
-       ew32(TXDCTL(1), reg);
-
-       /* Transmit Arbitration Control 0 */
-       reg = er32(TARC(0));
-       if (hw->mac.type == e1000_ich8lan)
-               reg |= (1 << 28) | (1 << 29);
-       reg |= (1 << 23) | (1 << 24) | (1 << 26) | (1 << 27);
-       ew32(TARC(0), reg);
-
-       /* Transmit Arbitration Control 1 */
-       reg = er32(TARC(1));
-       if (er32(TCTL) & E1000_TCTL_MULR)
-               reg &= ~(1 << 28);
-       else
-               reg |= (1 << 28);
-       reg |= (1 << 24) | (1 << 26) | (1 << 30);
-       ew32(TARC(1), reg);
-
-       /* Device Status */
-       if (hw->mac.type == e1000_ich8lan) {
-               reg = er32(STATUS);
-               reg &= ~(1 << 31);
-               ew32(STATUS, reg);
-       }
-
-       return;
-}
-
-/**
- *  e1000e_setup_link_ich8lan - Setup flow control and link settings
- *  @hw: pointer to the HW structure
- *
- *  Determines which flow control settings to use, then configures flow
- *  control.  Calls the appropriate media-specific link configuration
- *  function.  Assuming the adapter has a valid link partner, a valid link
- *  should be established.  Assumes the hardware has previously been reset
- *  and the transmitter and receiver are not enabled.
- **/
-static s32 e1000e_setup_link_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (e1000e_check_reset_block(hw))
-               goto out;
-
-       /*
-        * ICH parts do not have a word in the NVM to determine
-        * the default flow control setting, so we explicitly
-        * set it to full.
-        */
-       if (hw->fc.requested_mode == e1000_fc_default)
-               hw->fc.requested_mode = e1000_fc_full;
-
-       /*
-        * Save off the requested flow control mode for use later.  Depending
-        * on the link partner's capabilities, we may or may not use this mode.
-        */
-       hw->fc.current_mode = hw->fc.requested_mode;
-
-       e_dbg("After fix-ups FlowControl is now = %x\n",
-               hw->fc.current_mode);
-
-       /* Continue to configure the copper link. */
-       ret_val = hw->mac.ops.setup_physical_interface(hw);
-       if (ret_val)
-               goto out;
-
-       ew32(FCTTV, hw->fc.pause_time);
-       if ((hw->phy.type == e1000_phy_82578) ||
-           (hw->phy.type == e1000_phy_82579) ||
-           (hw->phy.type == e1000_phy_82577)) {
-               ret_val = e1e_wphy(hw,
-                                            PHY_REG(BM_PORT_CTRL_PAGE, 27),
-                                            hw->fc.pause_time);
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1000e_set_fc_watermarks(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_setup_copper_link_ich8lan - Configure MAC/PHY interface
- *  @hw: pointer to the HW structure
- *
- *  Configures the kumeran interface to the PHY to wait the appropriate time
- *  when polling the PHY, then call the generic setup_copper_link to finish
- *  configuring the copper link.
- **/
-static s32 e1000e_setup_copper_link_ich8lan(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val;
-       u16 reg_data;
-
-       ctrl = er32(CTRL);
-       ctrl |= E1000_CTRL_SLU;
-       ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       ew32(CTRL, ctrl);
-
-       /*
-        * Set the mac to wait the maximum time between each iteration
-        * and increase the max iterations when polling the phy;
-        * this fixes erroneous timeouts at 10Mbps.
-        */
-       ret_val = e1000e_write_kmrn_reg(hw,
-                                              E1000_KMRNCTRLSTA_TIMEOUTS,
-                                              0xFFFF);
-       if (ret_val)
-               goto out;
-       ret_val = e1000e_read_kmrn_reg(hw,
-                                             E1000_KMRNCTRLSTA_INBAND_PARAM,
-                                             &reg_data);
-       if (ret_val)
-               goto out;
-       reg_data |= 0x3F;
-       ret_val = e1000e_write_kmrn_reg(hw,
-                                              E1000_KMRNCTRLSTA_INBAND_PARAM,
-                                              reg_data);
-       if (ret_val)
-               goto out;
-
-       switch (hw->phy.type) {
-       case e1000_phy_igp_3:
-               ret_val = e1000e_copper_link_setup_igp(hw);
-               if (ret_val)
-                       goto out;
-               break;
-       case e1000_phy_bm:
-       case e1000_phy_82578:
-               ret_val = e1000e_copper_link_setup_m88(hw);
-               if (ret_val)
-                       goto out;
-               break;
-       case e1000_phy_82577:
-       case e1000_phy_82579:
-               ret_val = e1000e_copper_link_setup_82577(hw);
-               if (ret_val)
-                       goto out;
-               break;
-       case e1000_phy_ife:
-               ret_val = e1e_rphy(hw, IFE_PHY_MDIX_CONTROL,
-                                              &reg_data);
-               if (ret_val)
-                       goto out;
-
-               reg_data &= ~IFE_PMC_AUTO_MDIX;
-
-               switch (hw->phy.mdix) {
-               case 1:
-                       reg_data &= ~IFE_PMC_FORCE_MDIX;
-                       break;
-               case 2:
-                       reg_data |= IFE_PMC_FORCE_MDIX;
-                       break;
-               case 0:
-               default:
-                       reg_data |= IFE_PMC_AUTO_MDIX;
-                       break;
-               }
-               ret_val = e1e_wphy(hw, IFE_PHY_MDIX_CONTROL,
-                                               reg_data);
-               if (ret_val)
-                       goto out;
-               break;
-       default:
-               break;
-       }
-       ret_val = e1000e_setup_copper_link(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_get_link_up_info_ich8lan - Get current link speed and duplex
- *  @hw: pointer to the HW structure
- *  @speed: pointer to store current link speed
- *  @duplex: pointer to store the current link duplex
- *
- *  Calls the generic get_speed_and_duplex to retrieve the current link
- *  information and then calls the Kumeran lock loss workaround for links at
- *  gigabit speeds.
- **/
-static s32 e1000e_get_link_up_info_ich8lan(struct e1000_hw *hw, u16 *speed,
-                                          u16 *duplex)
-{
-       s32 ret_val;
-
-       ret_val = e1000e_get_speed_and_duplex_copper(hw, speed, duplex);
-       if (ret_val)
-               goto out;
-
-       if ((hw->mac.type == e1000_ich8lan) &&
-           (hw->phy.type == e1000_phy_igp_3) &&
-           (*speed == SPEED_1000)) {
-               ret_val = e1000e_kmrn_lock_loss_workaround_ich8lan(hw);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_kmrn_lock_loss_workaround_ich8lan - Kumeran workaround
- *  @hw: pointer to the HW structure
- *
- *  Work-around for 82566 Kumeran PCS lock loss:
- *  On link status change (i.e. PCI reset, speed change) and link is up and
- *  speed is gigabit-
- *    0) if workaround is optionally disabled do nothing
- *    1) wait 1ms for Kumeran link to come up
- *    2) check Kumeran Diagnostic register PCS lock loss bit
- *    3) if not set the link is locked (all is good), otherwise...
- *    4) reset the PHY
- *    5) repeat up to 10 times
- *  Note: this is only called for IGP3 copper when speed is 1gb.
- **/
-static s32 e1000e_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw)
-{
-       struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
-       u32 phy_ctrl;
-       s32 ret_val = E1000_SUCCESS;
-       u16 i, data;
-       bool link;
-
-       if (!(dev_spec->kmrn_lock_loss_workaround_enabled))
-               goto out;
-
-       /*
-        * Make sure link is up before proceeding.  If not just return.
-        * Attempting this while link is negotiating fouled up link
-        * stability
-        */
-       ret_val = e1000e_phy_has_link_generic(hw, 1, 0, &link);
-       if (!link) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       for (i = 0; i < 10; i++) {
-               /* read once to clear */
-               ret_val = e1e_rphy(hw, IGP3_KMRN_DIAG, &data);
-               if (ret_val)
-                       goto out;
-               /* and again to get new status */
-               ret_val = e1e_rphy(hw, IGP3_KMRN_DIAG, &data);
-               if (ret_val)
-                       goto out;
-
-               /* check for PCS lock */
-               if (!(data & IGP3_KMRN_DIAG_PCS_LOCK_LOSS)) {
-                       ret_val = E1000_SUCCESS;
-                       goto out;
-               }
-
-               /* Issue PHY reset */
-               e1000e_phy_hw_reset(hw);
-               mdelay(5);
-       }
-       /* Disable GigE link negotiation */
-       phy_ctrl = er32(PHY_CTRL);
-       phy_ctrl |= (E1000_PHY_CTRL_GBE_DISABLE |
-                    E1000_PHY_CTRL_NOND0A_GBE_DISABLE);
-       ew32(PHY_CTRL, phy_ctrl);
-
-       /*
-        * Call gig speed drop workaround on Gig disable before accessing
-        * any PHY registers
-        */
-       e1000e_gig_downshift_workaround_ich8lan(hw);
-
-       /* unable to acquire PCS lock */
-       ret_val = -E1000_ERR_PHY;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_set_kmrn_lock_loss_workaround_ich8lan - Set Kumeran workaround state
- *  @hw: pointer to the HW structure
- *  @state: boolean value used to set the current Kumeran workaround state
- *
- *  If ICH8, set the current Kumeran workaround state (enabled - true
- *  /disabled - false).
- **/
-void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
-                                                 bool state)
-{
-       struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
-
-       if (hw->mac.type != e1000_ich8lan) {
-               e_dbg("Workaround applies to ICH8 only.\n");
-               return;
-       }
-
-       dev_spec->kmrn_lock_loss_workaround_enabled = state;
-
-       return;
-}
-
-/**
- *  e1000e_ipg3_phy_powerdown_workaround_ich8lan - Power down workaround on D3
- *  @hw: pointer to the HW structure
- *
- *  Workaround for 82566 power-down on D3 entry:
- *    1) disable gigabit link
- *    2) write VR power-down enable
- *    3) read it back
- *  Continue if successful, else issue LCD reset and repeat
- **/
-void e1000e_igp3_phy_powerdown_workaround_ich8lan(struct e1000_hw *hw)
-{
-       u32 reg;
-       u16 data;
-       u8  retry = 0;
-
-       if (hw->phy.type != e1000_phy_igp_3)
-               goto out;
-
-       /* Try the workaround twice (if needed) */
-       do {
-               /* Disable link */
-               reg = er32(PHY_CTRL);
-               reg |= (E1000_PHY_CTRL_GBE_DISABLE |
-                       E1000_PHY_CTRL_NOND0A_GBE_DISABLE);
-               ew32(PHY_CTRL, reg);
-
-               /*
-                * Call gig speed drop workaround on Gig disable before
-                * accessing any PHY registers
-                */
-               if (hw->mac.type == e1000_ich8lan)
-                       e1000e_gig_downshift_workaround_ich8lan(hw);
-
-               /* Write VR power-down enable */
-               e1e_rphy(hw, IGP3_VR_CTRL, &data);
-               data &= ~IGP3_VR_CTRL_DEV_POWERDOWN_MODE_MASK;
-               e1e_wphy(hw, IGP3_VR_CTRL,
-                                  data | IGP3_VR_CTRL_MODE_SHUTDOWN);
-
-               /* Read it back and test */
-               e1e_rphy(hw, IGP3_VR_CTRL, &data);
-               data &= IGP3_VR_CTRL_DEV_POWERDOWN_MODE_MASK;
-               if ((data == IGP3_VR_CTRL_MODE_SHUTDOWN) || retry)
-                       break;
-
-               /* Issue PHY reset and repeat at most one more time */
-               reg = er32(CTRL);
-               ew32(CTRL, reg | E1000_CTRL_PHY_RST);
-               retry++;
-       } while (retry);
-
-out:
-       return;
-}
-
-/**
- *  e1000e_gig_downshift_workaround_ich8lan - WoL from S5 stops working
- *  @hw: pointer to the HW structure
- *
- *  Steps to take when dropping from 1Gb/s (eg. link cable removal (LSC),
- *  LPLU, Gig disable, MDIC PHY reset):
- *    1) Set Kumeran Near-end loopback
- *    2) Clear Kumeran Near-end loopback
- *  Should only be called for ICH8[m] devices with IGP_3 Phy.
- **/
-void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 reg_data;
-
-       if ((hw->mac.type != e1000_ich8lan) ||
-           (hw->phy.type != e1000_phy_igp_3))
-               goto out;
-
-       ret_val = e1000e_read_kmrn_reg(hw, E1000_KMRNCTRLSTA_DIAG_OFFSET,
-                                             &reg_data);
-       if (ret_val)
-               goto out;
-       reg_data |= E1000_KMRNCTRLSTA_DIAG_NELPBK;
-       ret_val = e1000e_write_kmrn_reg(hw,
-                                              E1000_KMRNCTRLSTA_DIAG_OFFSET,
-                                              reg_data);
-       if (ret_val)
-               goto out;
-       reg_data &= ~E1000_KMRNCTRLSTA_DIAG_NELPBK;
-       ret_val = e1000e_write_kmrn_reg(hw,
-                                              E1000_KMRNCTRLSTA_DIAG_OFFSET,
-                                              reg_data);
-out:
-       return;
-}
-
-/**
- *  e1000e_disable_gig_wol_ich8lan - disable gig during WoL
- *  @hw: pointer to the HW structure
- *
- *  During S0 to Sx transition, it is possible the link remains at gig
- *  instead of negotiating to a lower speed.  Before going to Sx, set
- *  'LPLU Enabled' and 'Gig Disable' to force link speed negotiation
- *  to a lower speed.
- *
- *  Should only be called for applicable parts.
- **/
-void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)
-{
-       u32 phy_ctrl;
-
-       switch (hw->mac.type) {
-       case e1000_ich8lan:
-       case e1000_ich9lan:
-       case e1000_ich10lan:
-       case e1000_pchlan:
-               phy_ctrl = er32(PHY_CTRL);
-               phy_ctrl |= E1000_PHY_CTRL_D0A_LPLU |
-                           E1000_PHY_CTRL_GBE_DISABLE;
-               ew32(PHY_CTRL, phy_ctrl);
-
-               if (hw->mac.type == e1000_pchlan)
-                       e1000e_phy_hw_reset_ich8lan(hw);
-       default:
-               break;
-       }
-
-       return;
-}
-
-/**
- *  e1000e_cleanup_led_ich8lan - Restore the default LED operation
- *  @hw: pointer to the HW structure
- *
- *  Return the LED back to the default configuration.
- **/
-static s32 e1000e_cleanup_led_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->phy.type == e1000_phy_ife)
-               ret_val = e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED,
-                                             0);
-       else
-               ew32(LEDCTL, hw->mac.ledctl_default);
-
-       return ret_val;
-}
-
-/**
- *  e1000e_led_on_ich8lan - Turn LEDs on
- *  @hw: pointer to the HW structure
- *
- *  Turn on the LEDs.
- **/
-static s32 e1000e_led_on_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->phy.type == e1000_phy_ife)
-               ret_val = e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED,
-                               (IFE_PSCL_PROBE_MODE | IFE_PSCL_PROBE_LEDS_ON));
-       else
-               ew32(LEDCTL, hw->mac.ledctl_mode2);
-
-       return ret_val;
-}
-
-/**
- *  e1000e_led_off_ich8lan - Turn LEDs off
- *  @hw: pointer to the HW structure
- *
- *  Turn off the LEDs.
- **/
-static s32 e1000e_led_off_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->phy.type == e1000_phy_ife)
-               ret_val = e1e_wphy(hw,
-                              IFE_PHY_SPECIAL_CONTROL_LED,
-                              (IFE_PSCL_PROBE_MODE | IFE_PSCL_PROBE_LEDS_OFF));
-       else
-               ew32(LEDCTL, hw->mac.ledctl_mode1);
-
-       return ret_val;
-}
-
-/**
- *  e1000e_setup_led_pchlan - Configures SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This prepares the SW controllable LED for use.
- **/
-static s32 e1000e_setup_led_pchlan(struct e1000_hw *hw)
-{
-       return e1e_wphy(hw, HV_LED_CONFIG,
-                                       (u16)hw->mac.ledctl_mode1);
-}
-
-/**
- *  e1000e_cleanup_led_pchlan - Restore the default LED operation
- *  @hw: pointer to the HW structure
- *
- *  Return the LED back to the default configuration.
- **/
-static s32 e1000e_cleanup_led_pchlan(struct e1000_hw *hw)
-{
-       return e1e_wphy(hw, HV_LED_CONFIG,
-                                       (u16)hw->mac.ledctl_default);
-}
-
-/**
- *  e1000e_led_on_pchlan - Turn LEDs on
- *  @hw: pointer to the HW structure
- *
- *  Turn on the LEDs.
- **/
-static s32 e1000e_led_on_pchlan(struct e1000_hw *hw)
-{
-       u16 data = (u16)hw->mac.ledctl_mode2;
-       u32 i, led;
-
-       /*
-        * If no link, then turn LED on by setting the invert bit
-        * for each LED that's mode is "link_up" in ledctl_mode2.
-        */
-       if (!(er32(STATUS) & E1000_STATUS_LU)) {
-               for (i = 0; i < 3; i++) {
-                       led = (data >> (i * 5)) & E1000_PHY_LED0_MASK;
-                       if ((led & E1000_PHY_LED0_MODE_MASK) !=
-                           E1000_LEDCTL_MODE_LINK_UP)
-                               continue;
-                       if (led & E1000_PHY_LED0_IVRT)
-                               data &= ~(E1000_PHY_LED0_IVRT << (i * 5));
-                       else
-                               data |= (E1000_PHY_LED0_IVRT << (i * 5));
-               }
-       }
-
-       return e1e_wphy(hw, HV_LED_CONFIG, data);
-}
-
-/**
- *  e1000e_led_off_pchlan - Turn LEDs off
- *  @hw: pointer to the HW structure
- *
- *  Turn off the LEDs.
- **/
-static s32 e1000e_led_off_pchlan(struct e1000_hw *hw)
-{
-       u16 data = (u16)hw->mac.ledctl_mode1;
-       u32 i, led;
-
-       /*
-        * If no link, then turn LED off by clearing the invert bit
-        * for each LED that's mode is "link_up" in ledctl_mode1.
-        */
-       if (!(er32(STATUS) & E1000_STATUS_LU)) {
-               for (i = 0; i < 3; i++) {
-                       led = (data >> (i * 5)) & E1000_PHY_LED0_MASK;
-                       if ((led & E1000_PHY_LED0_MODE_MASK) !=
-                           E1000_LEDCTL_MODE_LINK_UP)
-                               continue;
-                       if (led & E1000_PHY_LED0_IVRT)
-                               data &= ~(E1000_PHY_LED0_IVRT << (i * 5));
-                       else
-                               data |= (E1000_PHY_LED0_IVRT << (i * 5));
-               }
-       }
-
-       return e1e_wphy(hw, HV_LED_CONFIG, data);
-}
-
-/**
- *  e1000e_get_cfg_done_ich8lan - Read config done bit
- *  @hw: pointer to the HW structure
- *
- *  Read the management control register for the config done bit for
- *  completion status.  NOTE: silicon which is EEPROM-less will fail trying
- *  to read the config done bit, so an error is *ONLY* logged and returns
- *  E1000_SUCCESS.  If we were to return with error, EEPROM-less silicon
- *  would not be able to be reset or change link.
- **/
-static s32 e1000e_get_cfg_done_ich8lan(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u32 bank = 0;
-
-       if (hw->mac.type >= e1000_pchlan) {
-               u32 status = er32(STATUS);
-
-               if (status & E1000_STATUS_PHYRA) {
-                       ew32(STATUS, status &
-                                       ~E1000_STATUS_PHYRA);
-               } else
-                       e_dbg("PHY Reset Asserted not set - needs delay\n");
-       }
-
-       e1000e_get_cfg_done(hw);
-
-       /* If EEPROM is not marked present, init the IGP 3 PHY manually */
-       if ((hw->mac.type != e1000_ich10lan) &&
-           (hw->mac.type != e1000_pchlan)) {
-               if (((er32(EECD) & E1000_EECD_PRES) == 0) &&
-                   (hw->phy.type == e1000_phy_igp_3)) {
-                       e1000e_phy_init_script_igp3(hw);
-               }
-       } else {
-               if (e1000e_valid_nvm_bank_detect_ich8lan(hw, &bank)) {
-                       /* Maybe we should do a basic PHY config */
-                       e_dbg("EEPROM not present\n");
-                       ret_val = -E1000_ERR_CONFIG;
-               }
-       }
-
-       return ret_val;
-}
-
-/**
- * e1000e_power_down_phy_copper_ich8lan - Remove link during PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, remove the link.
- **/
-static void e1000e_power_down_phy_copper_ich8lan(struct e1000_hw *hw)
-{
-       /* If the management interface is not enabled, then power down */
-       if (!(hw->mac.ops.check_mng_mode(hw) ||
-             e1000e_check_reset_block(hw)))
-               e1000e_power_down_phy_copper(hw);
-
-       return;
-}
-
-/**
- *  e1000e_clear_hw_cntrs_ich8lan - Clear statistical counters
- *  @hw: pointer to the HW structure
- *
- *  Clears hardware counters specific to the silicon family and calls
- *  clear_hw_cntrs_generic to clear all general purpose counters.
- **/
-static void e1000e_clear_hw_cntrs_ich8lan(struct e1000_hw *hw __unused)
-{
-#if 0
-       u16 phy_data;
-
-       e1000e_clear_hw_cntrs_base(hw);
-
-       er32(ALGNERRC);
-       er32(RXERRC);
-       er32(TNCRS);
-       er32(CEXTERR);
-       er32(TSCTC);
-       er32(TSCTFC);
-
-       er32(MGTPRC);
-       er32(MGTPDC);
-       er32(MGTPTC);
-
-       er32(IAC);
-       er32(ICRXOC);
-
-       /* Clear PHY statistics registers */
-       if ((hw->phy.type == e1000_phy_82578) ||
-           (hw->phy.type == e1000_phy_82579) ||
-           (hw->phy.type == e1000_phy_82577)) {
-               e1e_rphy(hw, HV_SCC_UPPER, &phy_data);
-               e1e_rphy(hw, HV_SCC_LOWER, &phy_data);
-               e1e_rphy(hw, HV_ECOL_UPPER, &phy_data);
-               e1e_rphy(hw, HV_ECOL_LOWER, &phy_data);
-               e1e_rphy(hw, HV_MCC_UPPER, &phy_data);
-               e1e_rphy(hw, HV_MCC_LOWER, &phy_data);
-               e1e_rphy(hw, HV_LATECOL_UPPER, &phy_data);
-               e1e_rphy(hw, HV_LATECOL_LOWER, &phy_data);
-               e1e_rphy(hw, HV_COLC_UPPER, &phy_data);
-               e1e_rphy(hw, HV_COLC_LOWER, &phy_data);
-               e1e_rphy(hw, HV_DC_UPPER, &phy_data);
-               e1e_rphy(hw, HV_DC_LOWER, &phy_data);
-               e1e_rphy(hw, HV_TNCRS_UPPER, &phy_data);
-               e1e_rphy(hw, HV_TNCRS_LOWER, &phy_data);
-       }
-#endif
-}
-
-static struct pci_device_id e1000e_ich8lan_nics[] = {
-     PCI_ROM(0x8086, 0x104C, "E1000_DEV_ID_ICH8_IFE", "E1000_DEV_ID_ICH8_IFE", board_ich8lan),
-     PCI_ROM(0x8086, 0x10C5, "E1000_DEV_ID_ICH8_IFE_G", "E1000_DEV_ID_ICH8_IFE_G", board_ich8lan),
-     PCI_ROM(0x8086, 0x10C4, "E1000_DEV_ID_ICH8_IFE_GT", "E1000_DEV_ID_ICH8_IFE_GT", board_ich8lan),
-     PCI_ROM(0x8086, 0x104A, "E1000_DEV_ID_ICH8_IGP_AMT", "E1000_DEV_ID_ICH8_IGP_AMT", board_ich8lan),
-     PCI_ROM(0x8086, 0x104B, "E1000_DEV_ID_ICH8_IGP_C", "E1000_DEV_ID_ICH8_IGP_C", board_ich8lan),
-     PCI_ROM(0x8086, 0x104D, "E1000_DEV_ID_ICH8_IGP_M", "E1000_DEV_ID_ICH8_IGP_M", board_ich8lan),
-     PCI_ROM(0x8086, 0x1049, "E1000_DEV_ID_ICH8_IGP_M_AMT", "E1000_DEV_ID_ICH8_IGP_M_AMT", board_ich8lan),
-     PCI_ROM(0x8086, 0x1501, "E1000_DEV_ID_ICH8_82567V_3", "E1000_DEV_ID_ICH8_82567V_3", board_ich8lan),
-     PCI_ROM(0x8086, 0x10C0, "E1000_DEV_ID_ICH9_IFE", "E1000_DEV_ID_ICH9_IFE", board_ich9lan),
-     PCI_ROM(0x8086, 0x10C2, "E1000_DEV_ID_ICH9_IFE_G", "E1000_DEV_ID_ICH9_IFE_G", board_ich9lan),
-     PCI_ROM(0x8086, 0x10C3, "E1000_DEV_ID_ICH9_IFE_GT", "E1000_DEV_ID_ICH9_IFE_GT", board_ich9lan),
-     PCI_ROM(0x8086, 0x10BD, "E1000_DEV_ID_ICH9_IGP_AMT", "E1000_DEV_ID_ICH9_IGP_AMT", board_ich9lan),
-     PCI_ROM(0x8086, 0x294C, "E1000_DEV_ID_ICH9_IGP_C", "E1000_DEV_ID_ICH9_IGP_C", board_ich9lan),
-     PCI_ROM(0x8086, 0x10E5, "E1000_DEV_ID_ICH9_BM", "E1000_DEV_ID_ICH9_BM", board_ich9lan),
-     PCI_ROM(0x8086, 0x10BF, "E1000_DEV_ID_ICH9_IGP_M", "E1000_DEV_ID_ICH9_IGP_M", board_ich9lan),
-     PCI_ROM(0x8086, 0x10F5, "E1000_DEV_ID_ICH9_IGP_M_AMT", "E1000_DEV_ID_ICH9_IGP_M_AMT", board_ich9lan),
-     PCI_ROM(0x8086, 0x10CB, "E1000_DEV_ID_ICH9_IGP_M_V", "E1000_DEV_ID_ICH9_IGP_M_V", board_ich9lan),
-     PCI_ROM(0x8086, 0x10CC, "E1000_DEV_ID_ICH10_R_BM_LM", "E1000_DEV_ID_ICH10_R_BM_LM", board_ich9lan),
-     PCI_ROM(0x8086, 0x10CD, "E1000_DEV_ID_ICH10_R_BM_LF", "E1000_DEV_ID_ICH10_R_BM_LF", board_ich9lan),
-     PCI_ROM(0x8086, 0x10CE, "E1000_DEV_ID_ICH10_R_BM_V", "E1000_DEV_ID_ICH10_R_BM_V", board_ich9lan),
-     PCI_ROM(0x8086, 0x10DE, "E1000_DEV_ID_ICH10_D_BM_LM", "E1000_DEV_ID_ICH10_D_BM_LM", board_ich10lan),
-     PCI_ROM(0x8086, 0x10DF, "E1000_DEV_ID_ICH10_D_BM_LF", "E1000_DEV_ID_ICH10_D_BM_LF", board_ich10lan),
-     PCI_ROM(0x8086, 0x10EA, "E1000_DEV_ID_PCH_M_HV_LM", "E1000_DEV_ID_PCH_M_HV_LM", board_pchlan),
-     PCI_ROM(0x8086, 0x10EB, "E1000_DEV_ID_PCH_M_HV_LC", "E1000_DEV_ID_PCH_M_HV_LC", board_pchlan),
-     PCI_ROM(0x8086, 0x10EF, "E1000_DEV_ID_PCH_D_HV_DM", "E1000_DEV_ID_PCH_D_HV_DM", board_pchlan),
-     PCI_ROM(0x8086, 0x10F0, "E1000_DEV_ID_PCH_D_HV_DC", "E1000_DEV_ID_PCH_D_HV_DC", board_pchlan),
-     PCI_ROM(0x8086, 0x1502, "E1000_DEV_ID_PCH2_LV_LM", "E1000_DEV_ID_PCH2_LV_LM", board_pch2lan),
-     PCI_ROM(0x8086, 0x1503, "E1000_DEV_ID_PCH2_LV_V", "E1000_DEV_ID_PCH2_LV_V", board_pch2lan),
-};
-
-struct pci_driver e1000e_ich8lan_driver __pci_driver = {
-       .ids = e1000e_ich8lan_nics,
-       .id_count = (sizeof (e1000e_ich8lan_nics) / sizeof (e1000e_ich8lan_nics[0])),
-       .probe = e1000e_probe,
-       .remove = e1000e_remove,
-};
diff --git a/src/drivers/net/e1000e/e1000e_ich8lan.h b/src/drivers/net/e1000e/e1000e_ich8lan.h
deleted file mode 100644 (file)
index 8b145d9..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000E_ICH8LAN_H_
-#define _E1000E_ICH8LAN_H_
-
-#define ICH_FLASH_GFPREG                 0x0000
-#define ICH_FLASH_HSFSTS                 0x0004
-#define ICH_FLASH_HSFCTL                 0x0006
-#define ICH_FLASH_FADDR                  0x0008
-#define ICH_FLASH_FDATA0                 0x0010
-
-/* Requires up to 10 seconds when MNG might be accessing part. */
-#define ICH_FLASH_READ_COMMAND_TIMEOUT   10000000
-#define ICH_FLASH_WRITE_COMMAND_TIMEOUT  10000000
-#define ICH_FLASH_ERASE_COMMAND_TIMEOUT  10000000
-#define ICH_FLASH_LINEAR_ADDR_MASK       0x00FFFFFF
-#define ICH_FLASH_CYCLE_REPEAT_COUNT     10
-
-#define ICH_CYCLE_READ                   0
-#define ICH_CYCLE_WRITE                  2
-#define ICH_CYCLE_ERASE                  3
-
-#define FLASH_GFPREG_BASE_MASK           0x1FFF
-#define FLASH_SECTOR_ADDR_SHIFT          12
-
-#define ICH_FLASH_SEG_SIZE_256           256
-#define ICH_FLASH_SEG_SIZE_4K            4096
-#define ICH_FLASH_SEG_SIZE_8K            8192
-#define ICH_FLASH_SEG_SIZE_64K           65536
-#define ICH_FLASH_SECTOR_SIZE            4096
-
-#define ICH_FLASH_REG_MAPSIZE            0x00A0
-
-#define E1000_ICH_FWSM_RSPCIPHY          0x00000040 /* Reset PHY on PCI Reset */
-#define E1000_ICH_FWSM_DISSW             0x10000000 /* FW Disables SW Writes */
-/* FW established a valid mode */
-#define E1000_ICH_FWSM_FW_VALID          0x00008000
-
-#define E1000_ICH_MNG_IAMT_MODE          0x2
-
-#define ID_LED_DEFAULT_ICH8LAN  ((ID_LED_DEF1_DEF2 << 12) | \
-                                 (ID_LED_OFF1_OFF2 <<  8) | \
-                                 (ID_LED_OFF1_ON2  <<  4) | \
-                                 (ID_LED_DEF1_DEF2))
-
-#define E1000_ICH_NVM_SIG_WORD           0x13
-#define E1000_ICH_NVM_SIG_MASK           0xC000
-#define E1000_ICH_NVM_VALID_SIG_MASK     0xC0
-#define E1000_ICH_NVM_SIG_VALUE          0x80
-
-#define E1000_ICH8_LAN_INIT_TIMEOUT      1500
-
-#define E1000_FEXTNVM_SW_CONFIG        1
-#define E1000_FEXTNVM_SW_CONFIG_ICH8M (1 << 27) /* Bit redefined for ICH8M */
-
-#define PCIE_ICH8_SNOOP_ALL   PCIE_NO_SNOOP_ALL
-
-#define E1000_ICH_RAR_ENTRIES            7
-
-#define PHY_PAGE_SHIFT 5
-#define PHY_REG(page, reg) (((page) << PHY_PAGE_SHIFT) | \
-                           ((reg) & MAX_PHY_REG_ADDRESS))
-#define IGP3_KMRN_DIAG  PHY_REG(770, 19) /* KMRN Diagnostic */
-#define IGP3_VR_CTRL    PHY_REG(776, 18) /* Voltage Regulator Control */
-#define IGP3_CAPABILITY PHY_REG(776, 19) /* Capability */
-#define IGP3_PM_CTRL    PHY_REG(769, 20) /* Power Management Control */
-
-#define IGP3_KMRN_DIAG_PCS_LOCK_LOSS         0x0002
-#define IGP3_VR_CTRL_DEV_POWERDOWN_MODE_MASK 0x0300
-#define IGP3_VR_CTRL_MODE_SHUTDOWN           0x0200
-#define IGP3_PM_CTRL_FORCE_PWR_DOWN          0x0020
-
-/* PHY Wakeup Registers and defines */
-#define BM_RCTL         PHY_REG(BM_WUC_PAGE, 0)
-#define BM_WUC          PHY_REG(BM_WUC_PAGE, 1)
-#define BM_WUFC         PHY_REG(BM_WUC_PAGE, 2)
-#define BM_WUS          PHY_REG(BM_WUC_PAGE, 3)
-#define BM_RAR_L(_i)    (BM_PHY_REG(BM_WUC_PAGE, 16 + ((_i) << 2)))
-#define BM_RAR_M(_i)    (BM_PHY_REG(BM_WUC_PAGE, 17 + ((_i) << 2)))
-#define BM_RAR_H(_i)    (BM_PHY_REG(BM_WUC_PAGE, 18 + ((_i) << 2)))
-#define BM_RAR_CTRL(_i) (BM_PHY_REG(BM_WUC_PAGE, 19 + ((_i) << 2)))
-#define BM_MTA(_i)      (BM_PHY_REG(BM_WUC_PAGE, 128 + ((_i) << 1)))
-
-#define BM_RCTL_UPE           0x0001          /* Unicast Promiscuous Mode */
-#define BM_RCTL_MPE           0x0002          /* Multicast Promiscuous Mode */
-#define BM_RCTL_MO_SHIFT      3               /* Multicast Offset Shift */
-#define BM_RCTL_MO_MASK       (3 << 3)        /* Multicast Offset Mask */
-#define BM_RCTL_BAM           0x0020          /* Broadcast Accept Mode */
-#define BM_RCTL_PMCF          0x0040          /* Pass MAC Control Frames */
-#define BM_RCTL_RFCE          0x0080          /* Rx Flow Control Enable */
-
-#define HV_LED_CONFIG          PHY_REG(768, 30) /* LED Configuration */
-#define HV_MUX_DATA_CTRL               PHY_REG(776, 16)
-#define HV_MUX_DATA_CTRL_GEN_TO_MAC    0x0400
-#define HV_MUX_DATA_CTRL_FORCE_SPEED   0x0004
-#define HV_SCC_UPPER           PHY_REG(778, 16) /* Single Collision Count */
-#define HV_SCC_LOWER           PHY_REG(778, 17)
-#define HV_ECOL_UPPER          PHY_REG(778, 18) /* Excessive Collision Count */
-#define HV_ECOL_LOWER          PHY_REG(778, 19)
-#define HV_MCC_UPPER           PHY_REG(778, 20) /* Multiple Collision Count */
-#define HV_MCC_LOWER           PHY_REG(778, 21)
-#define HV_LATECOL_UPPER       PHY_REG(778, 23) /* Late Collision Count */
-#define HV_LATECOL_LOWER       PHY_REG(778, 24)
-#define HV_COLC_UPPER          PHY_REG(778, 25) /* Collision Count */
-#define HV_COLC_LOWER          PHY_REG(778, 26)
-#define HV_DC_UPPER            PHY_REG(778, 27) /* Defer Count */
-#define HV_DC_LOWER            PHY_REG(778, 28)
-#define HV_TNCRS_UPPER         PHY_REG(778, 29) /* Transmit with no CRS */
-#define HV_TNCRS_LOWER         PHY_REG(778, 30)
-
-#define E1000_FCRTV_PCH     0x05F40 /* PCH Flow Control Refresh Timer Value */
-
-#define E1000_NVM_K1_CONFIG 0x1B /* NVM K1 Config Word */
-#define E1000_NVM_K1_ENABLE 0x1  /* NVM Enable K1 bit */
-
-/* SMBus Address Phy Register */
-#define HV_SMB_ADDR            PHY_REG(768, 26)
-#define HV_SMB_ADDR_PEC_EN     0x0200
-#define HV_SMB_ADDR_VALID      0x0080
-
-/* PHY Power Management Control */
-#define HV_PM_CTRL             PHY_REG(770, 17)
-
-/* Strapping Option Register - RO */
-#define E1000_STRAP                     0x0000C
-#define E1000_STRAP_SMBUS_ADDRESS_MASK  0x00FE0000
-#define E1000_STRAP_SMBUS_ADDRESS_SHIFT 17
-
-/* OEM Bits Phy Register */
-#define HV_OEM_BITS            PHY_REG(768, 25)
-#define HV_OEM_BITS_LPLU       0x0004 /* Low Power Link Up */
-#define HV_OEM_BITS_GBE_DIS    0x0040 /* Gigabit Disable */
-#define HV_OEM_BITS_RESTART_AN 0x0400 /* Restart Auto-negotiation */
-
-#define LCD_CFG_PHY_ADDR_BIT   0x0020 /* Phy address bit from LCD Config word */
-
-#define SW_FLAG_TIMEOUT    1000 /* SW Semaphore flag timeout in milliseconds */
-
-/*
- * Additional interrupts need to be handled for ICH family:
- *  DSW = The FW changed the status of the DISSW bit in FWSM
- *  PHYINT = The LAN connected device generates an interrupt
- *  EPRST = Manageability reset event
- */
-#define IMS_ICH_ENABLE_MASK (\
-    E1000_IMS_DSW   | \
-    E1000_IMS_PHYINT | \
-    E1000_IMS_EPRST)
-
-/* Additional interrupt register bit definitions */
-#define E1000_ICR_LSECPNC       0x00004000          /* PN threshold - client */
-#define E1000_IMS_LSECPNC       E1000_ICR_LSECPNC   /* PN threshold - client */
-#define E1000_ICS_LSECPNC       E1000_ICR_LSECPNC   /* PN threshold - client */
-
-/* Security Processing bit Indication */
-#define E1000_RXDEXT_LINKSEC_STATUS_LSECH       0x01000000
-#define E1000_RXDEXT_LINKSEC_ERROR_BIT_MASK     0x60000000
-#define E1000_RXDEXT_LINKSEC_ERROR_NO_SA_MATCH  0x20000000
-#define E1000_RXDEXT_LINKSEC_ERROR_REPLAY_ERROR 0x40000000
-#define E1000_RXDEXT_LINKSEC_ERROR_BAD_SIG      0x60000000
-
-
-void e1000e_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
-                                                 bool state);
-void e1000e_igp3_phy_powerdown_workaround_ich8lan(struct e1000_hw *hw);
-void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw);
-void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw);
-s32 e1000e_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable);
-s32 e1000e_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_config);
-
-#endif
diff --git a/src/drivers/net/e1000e/e1000e_mac.c b/src/drivers/net/e1000e/e1000e_mac.c
deleted file mode 100644 (file)
index d96b279..0000000
+++ /dev/null
@@ -1,1883 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include "e1000e.h"
-
-static u32 e1000e_hash_mc_addr_generic(struct e1000_hw *hw, u8 *mc_addr);
-static s32 e1000e_set_default_fc_generic(struct e1000_hw *hw);
-static s32 e1000e_commit_fc_settings_generic(struct e1000_hw *hw);
-static s32 e1000e_poll_fiber_serdes_link_generic(struct e1000_hw *hw);
-static s32 e1000e_validate_mdi_setting_generic(struct e1000_hw *hw);
-static void e1000e_set_lan_id_multi_port_pcie(struct e1000_hw *hw);
-
-/**
- *  e1000e_init_mac_ops_generic - Initialize MAC function pointers
- *  @hw: pointer to the HW structure
- *
- *  Setups up the function pointers to no-op functions
- **/
-void e1000e_init_mac_ops_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       /* General Setup */
-       mac->ops.set_lan_id = e1000e_set_lan_id_multi_port_pcie;
-       mac->ops.read_mac_addr = e1000e_read_mac_addr_generic;
-       mac->ops.config_collision_dist = e1000e_config_collision_dist;
-       /* LINK */
-       mac->ops.wait_autoneg = e1000e_wait_autoneg;
-       /* Management */
-#if 0
-       mac->ops.mng_host_if_write = e1000e_mng_host_if_write_generic;
-       mac->ops.mng_write_cmd_header = e1000e_mng_write_cmd_header_generic;
-       mac->ops.mng_enable_host_if = e1000e_mng_enable_host_if_generic;
-#endif
-       /* VLAN, MC, etc. */
-       mac->ops.rar_set = e1000e_rar_set;
-       mac->ops.validate_mdi_setting = e1000e_validate_mdi_setting_generic;
-}
-
-/**
- *  e1000e_get_bus_info_pcie - Get PCIe bus information
- *  @hw: pointer to the HW structure
- *
- *  Determines and stores the system bus information for a particular
- *  network interface.  The following bus information is determined and stored:
- *  bus speed, bus width, type (PCIe), and PCIe function.
- **/
-s32 e1000e_get_bus_info_pcie(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_bus_info *bus = &hw->bus;
-
-       s32 ret_val;
-       u16 pcie_link_status;
-
-       bus->type = e1000_bus_type_pci_express;
-       bus->speed = e1000_bus_speed_2500;
-
-       ret_val = e1000e_read_pcie_cap_reg(hw,
-                                         PCIE_LINK_STATUS,
-                                         &pcie_link_status);
-       if (ret_val)
-               bus->width = e1000_bus_width_unknown;
-       else
-               bus->width = (enum e1000_bus_width)((pcie_link_status &
-                                               PCIE_LINK_WIDTH_MASK) >>
-                                              PCIE_LINK_WIDTH_SHIFT);
-
-       mac->ops.set_lan_id(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_set_lan_id_multi_port_pcie - Set LAN id for PCIe multiple port devices
- *
- *  @hw: pointer to the HW structure
- *
- *  Determines the LAN function id by reading memory-mapped registers
- *  and swaps the port value if requested.
- **/
-static void e1000e_set_lan_id_multi_port_pcie(struct e1000_hw *hw)
-{
-       struct e1000_bus_info *bus = &hw->bus;
-       u32 reg;
-
-       /*
-        * The status register reports the correct function number
-        * for the device regardless of function swap state.
-        */
-       reg = er32(STATUS);
-       bus->func = (reg & E1000_STATUS_FUNC_MASK) >> E1000_STATUS_FUNC_SHIFT;
-}
-
-/**
- *  e1000e_set_lan_id_single_port - Set LAN id for a single port device
- *  @hw: pointer to the HW structure
- *
- *  Sets the LAN function id to zero for a single port device.
- **/
-void e1000e_set_lan_id_single_port(struct e1000_hw *hw)
-{
-       struct e1000_bus_info *bus = &hw->bus;
-
-       bus->func = 0;
-}
-
-/**
- *  e1000e_clear_vfta_generic - Clear VLAN filter table
- *  @hw: pointer to the HW structure
- *
- *  Clears the register array which contains the VLAN filter table by
- *  setting all the values to 0.
- **/
-void e1000e_clear_vfta_generic(struct e1000_hw *hw)
-{
-       u32 offset;
-
-       for (offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++) {
-               E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, offset, 0);
-               e1e_flush();
-       }
-}
-
-/**
- *  e1000e_write_vfta_generic - Write value to VLAN filter table
- *  @hw: pointer to the HW structure
- *  @offset: register offset in VLAN filter table
- *  @value: register value written to VLAN filter table
- *
- *  Writes value at the given offset in the register array which stores
- *  the VLAN filter table.
- **/
-void e1000e_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value)
-{
-       E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, offset, value);
-       e1e_flush();
-}
-
-/**
- *  e1000e_init_rx_addrs - Initialize receive address's
- *  @hw: pointer to the HW structure
- *  @rar_count: receive address registers
- *
- *  Setups the receive address registers by setting the base receive address
- *  register to the devices MAC address and clearing all the other receive
- *  address registers to 0.
- **/
-void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
-{
-       u32 i;
-       u8 mac_addr[ETH_ADDR_LEN] = {0};
-
-       /* Setup the receive address */
-       e_dbg("Programming MAC Address into RAR[0]\n");
-
-       hw->mac.ops.rar_set(hw, hw->mac.addr, 0);
-
-       /* Zero out the other (rar_entry_count - 1) receive addresses */
-       e_dbg("Clearing RAR[1-%u]\n", rar_count-1);
-       for (i = 1; i < rar_count; i++)
-               hw->mac.ops.rar_set(hw, mac_addr, i);
-}
-
-/**
- *  e1000e_check_alt_mac_addr_generic - Check for alternate MAC addr
- *  @hw: pointer to the HW structure
- *
- *  Checks the nvm for an alternate MAC address.  An alternate MAC address
- *  can be setup by pre-boot software and must be treated like a permanent
- *  address and must override the actual permanent MAC address. If an
- *  alternate MAC address is found it is programmed into RAR0, replacing
- *  the permanent address that was installed into RAR0 by the Si on reset.
- *  This function will return SUCCESS unless it encounters an error while
- *  reading the EEPROM.
- **/
-s32 e1000e_check_alt_mac_addr_generic(struct e1000_hw *hw)
-{
-       u32 i;
-       s32 ret_val = E1000_SUCCESS;
-       u16 offset, nvm_alt_mac_addr_offset, nvm_data;
-       u8 alt_mac_addr[ETH_ADDR_LEN];
-
-       ret_val = e1000e_read_nvm(hw, NVM_ALT_MAC_ADDR_PTR, 1,
-                                &nvm_alt_mac_addr_offset);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       if (nvm_alt_mac_addr_offset == 0xFFFF) {
-               /* There is no Alternate MAC Address */
-               goto out;
-       }
-
-       if (hw->bus.func == E1000_FUNC_1)
-               nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN1;
-       for (i = 0; i < ETH_ADDR_LEN; i += 2) {
-               offset = nvm_alt_mac_addr_offset + (i >> 1);
-               ret_val = e1000e_read_nvm(hw, offset, 1, &nvm_data);
-               if (ret_val) {
-                       e_dbg("NVM Read Error\n");
-                       goto out;
-               }
-
-               alt_mac_addr[i] = (u8)(nvm_data & 0xFF);
-               alt_mac_addr[i + 1] = (u8)(nvm_data >> 8);
-       }
-
-       /* if multicast bit is set, the alternate address will not be used */
-       if (alt_mac_addr[0] & 0x01) {
-               e_dbg("Ignoring Alternate Mac Address with MC bit set\n");
-               goto out;
-       }
-
-       /*
-        * We have a valid alternate MAC address, and we want to treat it the
-        * same as the normal permanent MAC address stored by the HW into the
-        * RAR. Do this by mapping this address into RAR0.
-        */
-       hw->mac.ops.rar_set(hw, alt_mac_addr, 0);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_rar_set - Set receive address register
- *  @hw: pointer to the HW structure
- *  @addr: pointer to the receive address
- *  @index: receive address array register
- *
- *  Sets the receive address array register at index to the address passed
- *  in by addr.
- **/
-void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
-{
-       u32 rar_low, rar_high;
-
-       /*
-        * HW expects these in little endian so we reverse the byte order
-        * from network order (big endian) to little endian
-        */
-       rar_low = ((u32) addr[0] |
-                  ((u32) addr[1] << 8) |
-                  ((u32) addr[2] << 16) | ((u32) addr[3] << 24));
-
-       rar_high = ((u32) addr[4] | ((u32) addr[5] << 8));
-
-       /* If MAC address zero, no need to set the AV bit */
-       if (rar_low || rar_high)
-               rar_high |= E1000_RAH_AV;
-
-       /*
-        * Some bridges will combine consecutive 32-bit writes into
-        * a single burst write, which will malfunction on some parts.
-        * The flushes avoid this.
-        */
-       ew32(RAL(index), rar_low);
-       e1e_flush();
-       ew32(RAH(index), rar_high);
-       e1e_flush();
-}
-
-/**
- *  e1000e_mta_set_generic - Set multicast filter table address
- *  @hw: pointer to the HW structure
- *  @hash_value: determines the MTA register and bit to set
- *
- *  The multicast table address is a register array of 32-bit registers.
- *  The hash_value is used to determine what register the bit is in, the
- *  current value is read, the new bit is OR'd in and the new value is
- *  written back into the register.
- **/
-void e1000e_mta_set_generic(struct e1000_hw *hw, u32 hash_value)
-{
-       u32 hash_bit, hash_reg, mta;
-
-       /*
-        * The MTA is a register array of 32-bit registers. It is
-        * treated like an array of (32*mta_reg_count) bits.  We want to
-        * set bit BitArray[hash_value]. So we figure out what register
-        * the bit is in, read it, OR in the new bit, then write
-        * back the new value.  The (hw->mac.mta_reg_count - 1) serves as a
-        * mask to bits 31:5 of the hash value which gives us the
-        * register we're modifying.  The hash bit within that register
-        * is determined by the lower 5 bits of the hash value.
-        */
-       hash_reg = (hash_value >> 5) & (hw->mac.mta_reg_count - 1);
-       hash_bit = hash_value & 0x1F;
-
-       mta = E1000_READ_REG_ARRAY(hw, E1000_MTA, hash_reg);
-
-       mta |= (1 << hash_bit);
-
-       E1000_WRITE_REG_ARRAY(hw, E1000_MTA, hash_reg, mta);
-       e1e_flush();
-}
-
-/**
- *  e1000e_update_mc_addr_list_generic - Update Multicast addresses
- *  @hw: pointer to the HW structure
- *  @mc_addr_list: array of multicast addresses to program
- *  @mc_addr_count: number of multicast addresses to program
- *
- *  Updates entire Multicast Table Array.
- *  The caller must have a packed mc_addr_list of multicast addresses.
- **/
-void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
-                                       u8 *mc_addr_list, u32 mc_addr_count)
-{
-       u32 hash_value, hash_bit, hash_reg;
-       int i;
-
-       /* clear mta_shadow */
-       memset(&hw->mac.mta_shadow, 0, sizeof(hw->mac.mta_shadow));
-
-       /* update mta_shadow from mc_addr_list */
-       for (i = 0; (u32) i < mc_addr_count; i++) {
-               hash_value = e1000e_hash_mc_addr_generic(hw, mc_addr_list);
-
-               hash_reg = (hash_value >> 5) & (hw->mac.mta_reg_count - 1);
-               hash_bit = hash_value & 0x1F;
-
-               hw->mac.mta_shadow[hash_reg] |= (1 << hash_bit);
-               mc_addr_list += (ETH_ADDR_LEN);
-       }
-
-       /* replace the entire MTA table */
-       for (i = hw->mac.mta_reg_count - 1; i >= 0; i--)
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, hw->mac.mta_shadow[i]);
-       e1e_flush();
-}
-
-/**
- *  e1000e_hash_mc_addr_generic - Generate a multicast hash value
- *  @hw: pointer to the HW structure
- *  @mc_addr: pointer to a multicast address
- *
- *  Generates a multicast address hash value which is used to determine
- *  the multicast filter table array address and new table value.  See
- *  e1000e_mta_set_generic()
- **/
-static u32 e1000e_hash_mc_addr_generic(struct e1000_hw *hw, u8 *mc_addr)
-{
-       u32 hash_value, hash_mask;
-       u8 bit_shift = 0;
-
-       /* Register count multiplied by bits per register */
-       hash_mask = (hw->mac.mta_reg_count * 32) - 1;
-
-       /*
-        * For a mc_filter_type of 0, bit_shift is the number of left-shifts
-        * where 0xFF would still fall within the hash mask.
-        */
-       while (hash_mask >> bit_shift != 0xFF)
-               bit_shift++;
-
-       /*
-        * The portion of the address that is used for the hash table
-        * is determined by the mc_filter_type setting.
-        * The algorithm is such that there is a total of 8 bits of shifting.
-        * The bit_shift for a mc_filter_type of 0 represents the number of
-        * left-shifts where the MSB of mc_addr[5] would still fall within
-        * the hash_mask.  Case 0 does this exactly.  Since there are a total
-        * of 8 bits of shifting, then mc_addr[4] will shift right the
-        * remaining number of bits. Thus 8 - bit_shift.  The rest of the
-        * cases are a variation of this algorithm...essentially raising the
-        * number of bits to shift mc_addr[5] left, while still keeping the
-        * 8-bit shifting total.
-        *
-        * For example, given the following Destination MAC Address and an
-        * mta register count of 128 (thus a 4096-bit vector and 0xFFF mask),
-        * we can see that the bit_shift for case 0 is 4.  These are the hash
-        * values resulting from each mc_filter_type...
-        * [0] [1] [2] [3] [4] [5]
-        * 01  AA  00  12  34  56
-        * LSB                 MSB
-        *
-        * case 0: hash_value = ((0x34 >> 4) | (0x56 << 4)) & 0xFFF = 0x563
-        * case 1: hash_value = ((0x34 >> 3) | (0x56 << 5)) & 0xFFF = 0xAC6
-        * case 2: hash_value = ((0x34 >> 2) | (0x56 << 6)) & 0xFFF = 0x163
-        * case 3: hash_value = ((0x34 >> 0) | (0x56 << 8)) & 0xFFF = 0x634
-        */
-       switch (hw->mac.mc_filter_type) {
-       default:
-       case 0:
-               break;
-       case 1:
-               bit_shift += 1;
-               break;
-       case 2:
-               bit_shift += 2;
-               break;
-       case 3:
-               bit_shift += 4;
-               break;
-       }
-
-       hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) |
-                                 (((u16) mc_addr[5]) << bit_shift)));
-
-       return hash_value;
-}
-
-/**
- *  e1000e_clear_hw_cntrs_base - Clear base hardware counters
- *  @hw: pointer to the HW structure
- *
- *  Clears the base hardware counters by reading the counter registers.
- **/
-void e1000e_clear_hw_cntrs_base(struct e1000_hw *hw __unused)
-{
-#if 0
-       er32(CRCERRS);
-       er32(SYMERRS);
-       er32(MPC);
-       er32(SCC);
-       er32(ECOL);
-       er32(MCC);
-       er32(LATECOL);
-       er32(COLC);
-       er32(DC);
-       er32(SEC);
-       er32(RLEC);
-       er32(XONRXC);
-       er32(XONTXC);
-       er32(XOFFRXC);
-       er32(XOFFTXC);
-       er32(FCRUC);
-       er32(GPRC);
-       er32(BPRC);
-       er32(MPRC);
-       er32(GPTC);
-       er32(GORCL);
-       er32(GORCH);
-       er32(GOTCL);
-       er32(GOTCH);
-       er32(RNBC);
-       er32(RUC);
-       er32(RFC);
-       er32(ROC);
-       er32(RJC);
-       er32(TORL);
-       er32(TORH);
-       er32(TOTL);
-       er32(TOTH);
-       er32(TPR);
-       er32(TPT);
-       er32(MPTC);
-       er32(BPTC);
-#endif
-}
-
-/**
- *  e1000e_check_for_copper_link - Check for link (Copper)
- *  @hw: pointer to the HW structure
- *
- *  Checks to see of the link status of the hardware has changed.  If a
- *  change in link status has been detected, then we read the PHY registers
- *  to get the current speed/duplex if link exists.
- **/
-s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val;
-       bool link;
-
-       /*
-        * We only want to go out to the PHY registers to see if Auto-Neg
-        * has completed and/or if our link status has changed.  The
-        * get_link_status flag is set upon receiving a Link Status
-        * Change or Rx Sequence Error interrupt.
-        */
-       if (!mac->get_link_status) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       /*
-        * First we want to see if the MII Status Register reports
-        * link.  If so, then we want to get the current speed/duplex
-        * of the PHY.
-        */
-       ret_val = e1000e_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link)
-               goto out; /* No link detected */
-
-       mac->get_link_status = false;
-
-       /*
-        * Check if there was DownShift, must be checked
-        * immediately after link-up
-        */
-       e1000e_check_downshift(hw);
-
-       /*
-        * If we are forcing speed/duplex, then we simply return since
-        * we have already determined whether we have link or not.
-        */
-       if (!mac->autoneg) {
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       /*
-        * Auto-Neg is enabled.  Auto Speed Detection takes care
-        * of MAC speed/duplex configuration.  So we only need to
-        * configure Collision Distance in the MAC.
-        */
-       e1000e_config_collision_dist(hw);
-
-       /*
-        * Configure Flow Control now that Auto-Neg has completed.
-        * First, we need to restore the desired flow control
-        * settings because we may have had to re-autoneg with a
-        * different link partner.
-        */
-       ret_val = e1000e_config_fc_after_link_up(hw);
-       if (ret_val)
-               e_dbg("Error configuring flow control\n");
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_check_for_fiber_link - Check for link (Fiber)
- *  @hw: pointer to the HW structure
- *
- *  Checks for link up on the hardware.  If link is not up and we have
- *  a signal, then we need to force link up.
- **/
-s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 rxcw;
-       u32 ctrl;
-       u32 status;
-       s32 ret_val = E1000_SUCCESS;
-
-       ctrl = er32(CTRL);
-       status = er32(STATUS);
-       rxcw = er32(RXCW);
-
-       /*
-        * If we don't have link (auto-negotiation failed or link partner
-        * cannot auto-negotiate), the cable is plugged in (we have signal),
-        * and our link partner is not trying to auto-negotiate with us (we
-        * are receiving idles or data), we need to force link up. We also
-        * need to give auto-negotiation time to complete, in case the cable
-        * was just plugged in. The autoneg_failed flag does this.
-        */
-       /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
-       if ((ctrl & E1000_CTRL_SWDPIN1) && (!(status & E1000_STATUS_LU)) &&
-           (!(rxcw & E1000_RXCW_C))) {
-               if (mac->autoneg_failed == 0) {
-                       mac->autoneg_failed = 1;
-                       goto out;
-               }
-               e_dbg("NOT RXing /C/, disable AutoNeg and force link.\n");
-
-               /* Disable auto-negotiation in the TXCW register */
-               ew32(TXCW, (mac->txcw & ~E1000_TXCW_ANE));
-
-               /* Force link-up and also force full-duplex. */
-               ctrl = er32(CTRL);
-               ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FD);
-               ew32(CTRL, ctrl);
-
-               /* Configure Flow Control after forcing link up. */
-               ret_val = e1000e_config_fc_after_link_up(hw);
-               if (ret_val) {
-                       e_dbg("Error configuring flow control\n");
-                       goto out;
-               }
-       } else if ((ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
-               /*
-                * If we are forcing link and we are receiving /C/ ordered
-                * sets, re-enable auto-negotiation in the TXCW register
-                * and disable forced link in the Device Control register
-                * in an attempt to auto-negotiate with our link partner.
-                */
-               e_dbg("RXing /C/, enable AutoNeg and stop forcing link.\n");
-               ew32(TXCW, mac->txcw);
-               ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
-
-               mac->serdes_has_link = true;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_check_for_serdes_link - Check for link (Serdes)
- *  @hw: pointer to the HW structure
- *
- *  Checks for link up on the hardware.  If link is not up and we have
- *  a signal, then we need to force link up.
- **/
-s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 rxcw;
-       u32 ctrl;
-       u32 status;
-       s32 ret_val = E1000_SUCCESS;
-
-       ctrl = er32(CTRL);
-       status = er32(STATUS);
-       rxcw = er32(RXCW);
-
-       /*
-        * If we don't have link (auto-negotiation failed or link partner
-        * cannot auto-negotiate), and our link partner is not trying to
-        * auto-negotiate with us (we are receiving idles or data),
-        * we need to force link up. We also need to give auto-negotiation
-        * time to complete.
-        */
-       /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
-       if ((!(status & E1000_STATUS_LU)) && (!(rxcw & E1000_RXCW_C))) {
-               if (mac->autoneg_failed == 0) {
-                       mac->autoneg_failed = 1;
-                       goto out;
-               }
-               e_dbg("NOT RXing /C/, disable AutoNeg and force link.\n");
-
-               /* Disable auto-negotiation in the TXCW register */
-               ew32(TXCW, (mac->txcw & ~E1000_TXCW_ANE));
-
-               /* Force link-up and also force full-duplex. */
-               ctrl = er32(CTRL);
-               ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FD);
-               ew32(CTRL, ctrl);
-
-               /* Configure Flow Control after forcing link up. */
-               ret_val = e1000e_config_fc_after_link_up(hw);
-               if (ret_val) {
-                       e_dbg("Error configuring flow control\n");
-                       goto out;
-               }
-       } else if ((ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
-               /*
-                * If we are forcing link and we are receiving /C/ ordered
-                * sets, re-enable auto-negotiation in the TXCW register
-                * and disable forced link in the Device Control register
-                * in an attempt to auto-negotiate with our link partner.
-                */
-               e_dbg("RXing /C/, enable AutoNeg and stop forcing link.\n");
-               ew32(TXCW, mac->txcw);
-               ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
-
-               mac->serdes_has_link = true;
-       } else if (!(E1000_TXCW_ANE & er32(TXCW))) {
-               /*
-                * If we force link for non-auto-negotiation switch, check
-                * link status based on MAC synchronization for internal
-                * serdes media type.
-                */
-               /* SYNCH bit and IV bit are sticky. */
-               udelay(10);
-               rxcw = er32(RXCW);
-               if (rxcw & E1000_RXCW_SYNCH) {
-                       if (!(rxcw & E1000_RXCW_IV)) {
-                               mac->serdes_has_link = true;
-                               e_dbg("SERDES: Link up - forced.\n");
-                       }
-               } else {
-                       mac->serdes_has_link = false;
-                       e_dbg("SERDES: Link down - force failed.\n");
-               }
-       }
-
-       if (E1000_TXCW_ANE & er32(TXCW)) {
-               status = er32(STATUS);
-               if (status & E1000_STATUS_LU) {
-                       /* SYNCH bit and IV bit are sticky, so reread rxcw. */
-                       udelay(10);
-                       rxcw = er32(RXCW);
-                       if (rxcw & E1000_RXCW_SYNCH) {
-                               if (!(rxcw & E1000_RXCW_IV)) {
-                                       mac->serdes_has_link = true;
-                                       e_dbg("SERDES: Link up - autoneg "
-                                          "completed sucessfully.\n");
-                               } else {
-                                       mac->serdes_has_link = false;
-                                       e_dbg("SERDES: Link down - invalid"
-                                          "codewords detected in autoneg.\n");
-                               }
-                       } else {
-                               mac->serdes_has_link = false;
-                               e_dbg("SERDES: Link down - no sync.\n");
-                       }
-               } else {
-                       mac->serdes_has_link = false;
-                       e_dbg("SERDES: Link down - autoneg failed\n");
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_setup_link - Setup flow control and link settings
- *  @hw: pointer to the HW structure
- *
- *  Determines which flow control settings to use, then configures flow
- *  control.  Calls the appropriate media-specific link configuration
- *  function.  Assuming the adapter has a valid link partner, a valid link
- *  should be established.  Assumes the hardware has previously been reset
- *  and the transmitter and receiver are not enabled.
- **/
-s32 e1000e_setup_link(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       /*
-        * In the case of the phy reset being blocked, we already have a link.
-        * We do not need to set it up again.
-        */
-       if (hw->phy.ops.check_reset_block)
-               if (e1000e_check_reset_block(hw))
-                       goto out;
-
-       /*
-        * If requested flow control is set to default, set flow control
-        * based on the EEPROM flow control settings.
-        */
-       if (hw->fc.requested_mode == e1000_fc_default) {
-               ret_val = e1000e_set_default_fc_generic(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       /*
-        * Save off the requested flow control mode for use later.  Depending
-        * on the link partner's capabilities, we may or may not use this mode.
-        */
-       hw->fc.current_mode = hw->fc.requested_mode;
-
-       e_dbg("After fix-ups FlowControl is now = %x\n",
-               hw->fc.current_mode);
-
-       /* Call the necessary media_type subroutine to configure the link. */
-       ret_val = hw->mac.ops.setup_physical_interface(hw);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Initialize the flow control address, type, and PAUSE timer
-        * registers to their default values.  This is done even if flow
-        * control is disabled, because it does not hurt anything to
-        * initialize these registers.
-        */
-       e_dbg("Initializing the Flow Control address, type and timer regs\n");
-       ew32(FCT, FLOW_CONTROL_TYPE);
-       ew32(FCAH, FLOW_CONTROL_ADDRESS_HIGH);
-       ew32(FCAL, FLOW_CONTROL_ADDRESS_LOW);
-
-       ew32(FCTTV, hw->fc.pause_time);
-
-       ret_val = e1000e_set_fc_watermarks(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_setup_fiber_serdes_link - Setup link for fiber/serdes
- *  @hw: pointer to the HW structure
- *
- *  Configures collision distance and flow control for fiber and serdes
- *  links.  Upon successful setup, poll for link.
- **/
-s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val = E1000_SUCCESS;
-
-       ctrl = er32(CTRL);
-
-       /* Take the link out of reset */
-       ctrl &= ~E1000_CTRL_LRST;
-
-       e1000e_config_collision_dist(hw);
-
-       ret_val = e1000e_commit_fc_settings_generic(hw);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Since auto-negotiation is enabled, take the link out of reset (the
-        * link will be in reset, because we previously reset the chip). This
-        * will restart auto-negotiation.  If auto-negotiation is successful
-        * then the link-up status bit will be set and the flow control enable
-        * bits (RFCE and TFCE) will be set according to their negotiated value.
-        */
-       e_dbg("Auto-negotiation enabled\n");
-
-       ew32(CTRL, ctrl);
-       e1e_flush();
-       msleep(1);
-
-       /*
-        * For these adapters, the SW definable pin 1 is set when the optics
-        * detect a signal.  If we have a signal, then poll for a "Link-Up"
-        * indication.
-        */
-       if (hw->phy.media_type == e1000_media_type_internal_serdes ||
-           (er32(CTRL) & E1000_CTRL_SWDPIN1)) {
-               ret_val = e1000e_poll_fiber_serdes_link_generic(hw);
-       } else {
-               e_dbg("No signal detected\n");
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_config_collision_dist - Configure collision distance
- *  @hw: pointer to the HW structure
- *
- *  Configures the collision distance to the default value and is used
- *  during link setup. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-void e1000e_config_collision_dist(struct e1000_hw *hw)
-{
-       u32 tctl;
-
-       tctl = er32(TCTL);
-
-       tctl &= ~E1000_TCTL_COLD;
-       tctl |= E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT;
-
-       ew32(TCTL, tctl);
-       e1e_flush();
-}
-
-/**
- *  e1000e_poll_fiber_serdes_link_generic - Poll for link up
- *  @hw: pointer to the HW structure
- *
- *  Polls for link up by reading the status register, if link fails to come
- *  up with auto-negotiation, then the link is forced if a signal is detected.
- **/
-static s32 e1000e_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 i, status;
-       s32 ret_val = E1000_SUCCESS;
-
-       /*
-        * If we have a signal (the cable is plugged in, or assumed true for
-        * serdes media) then poll for a "Link-Up" indication in the Device
-        * Status Register.  Time-out if a link isn't seen in 500 milliseconds
-        * seconds (Auto-negotiation should complete in less than 500
-        * milliseconds even if the other end is doing it in SW).
-        */
-       for (i = 0; i < FIBER_LINK_UP_LIMIT; i++) {
-               msleep(10);
-               status = er32(STATUS);
-               if (status & E1000_STATUS_LU)
-                       break;
-       }
-       if (i == FIBER_LINK_UP_LIMIT) {
-               e_dbg("Never got a valid link from auto-neg!!!\n");
-               mac->autoneg_failed = 1;
-               /*
-                * AutoNeg failed to achieve a link, so we'll call
-                * mac->check_for_link. This routine will force the
-                * link up if we detect a signal. This will allow us to
-                * communicate with non-autonegotiating link partners.
-                */
-               ret_val = hw->mac.ops.check_for_link(hw);
-               if (ret_val) {
-                       e_dbg("Error while checking for link\n");
-                       goto out;
-               }
-               mac->autoneg_failed = 0;
-       } else {
-               mac->autoneg_failed = 0;
-               e_dbg("Valid Link Found\n");
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_commit_fc_settings_generic - Configure flow control
- *  @hw: pointer to the HW structure
- *
- *  Write the flow control settings to the Transmit Config Word Register (TXCW)
- *  base on the flow control settings in e1000_mac_info.
- **/
-static s32 e1000e_commit_fc_settings_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 txcw;
-       s32 ret_val = E1000_SUCCESS;
-
-       /*
-        * Check for a software override of the flow control settings, and
-        * setup the device accordingly.  If auto-negotiation is enabled, then
-        * software will have to set the "PAUSE" bits to the correct value in
-        * the Transmit Config Word Register (TXCW) and re-start auto-
-        * negotiation.  However, if auto-negotiation is disabled, then
-        * software will have to manually configure the two flow control enable
-        * bits in the CTRL register.
-        *
-        * The possible values of the "fc" parameter are:
-        *      0:  Flow control is completely disabled
-        *      1:  Rx flow control is enabled (we can receive pause frames,
-        *          but not send pause frames).
-        *      2:  Tx flow control is enabled (we can send pause frames but we
-        *          do not support receiving pause frames).
-        *      3:  Both Rx and Tx flow control (symmetric) are enabled.
-        */
-       switch (hw->fc.current_mode) {
-       case e1000_fc_none:
-               /* Flow control completely disabled by a software over-ride. */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD);
-               break;
-       case e1000_fc_rx_pause:
-               /*
-                * Rx Flow control is enabled and Tx Flow control is disabled
-                * by a software over-ride. Since there really isn't a way to
-                * advertise that we are capable of Rx Pause ONLY, we will
-                * advertise that we support both symmetric and asymmetric RX
-                * PAUSE.  Later, we will disable the adapter's ability to send
-                * PAUSE frames.
-                */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
-               break;
-       case e1000_fc_tx_pause:
-               /*
-                * Tx Flow control is enabled, and Rx Flow control is disabled,
-                * by a software over-ride.
-                */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_ASM_DIR);
-               break;
-       case e1000_fc_full:
-               /*
-                * Flow control (both Rx and Tx) is enabled by a software
-                * over-ride.
-                */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
-               break;
-       default:
-               e_dbg("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-               break;
-       }
-
-       ew32(TXCW, txcw);
-       mac->txcw = txcw;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_set_fc_watermarks - Set flow control high/low watermarks
- *  @hw: pointer to the HW structure
- *
- *  Sets the flow control high/low threshold (watermark) registers.  If
- *  flow control XON frame transmission is enabled, then set XON frame
- *  transmission as well.
- **/
-s32 e1000e_set_fc_watermarks(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u32 fcrtl = 0, fcrth = 0;
-
-       /*
-        * Set the flow control receive threshold registers.  Normally,
-        * these registers will be set to a default threshold that may be
-        * adjusted later by the driver's runtime code.  However, if the
-        * ability to transmit pause frames is not enabled, then these
-        * registers will be set to 0.
-        */
-       if (hw->fc.current_mode & e1000_fc_tx_pause) {
-               /*
-                * We need to set up the Receive Threshold high and low water
-                * marks as well as (optionally) enabling the transmission of
-                * XON frames.
-                */
-               fcrtl = hw->fc.low_water;
-               if (hw->fc.send_xon)
-                       fcrtl |= E1000_FCRTL_XONE;
-
-               fcrth = hw->fc.high_water;
-       }
-       ew32(FCRTL, fcrtl);
-       ew32(FCRTH, fcrth);
-
-       return ret_val;
-}
-
-/**
- *  e1000e_set_default_fc_generic - Set flow control default values
- *  @hw: pointer to the HW structure
- *
- *  Read the EEPROM for the default values for flow control and store the
- *  values.
- **/
-static s32 e1000e_set_default_fc_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 nvm_data;
-
-       /*
-        * Read and store word 0x0F of the EEPROM. This word contains bits
-        * that determine the hardware's default PAUSE (flow control) mode,
-        * a bit that determines whether the HW defaults to enabling or
-        * disabling auto-negotiation, and the direction of the
-        * SW defined pins. If there is no SW over-ride of the flow
-        * control setting, then the variable hw->fc will
-        * be initialized based on a value in the EEPROM.
-        */
-       ret_val = e1000e_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &nvm_data);
-
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0)
-               hw->fc.requested_mode = e1000_fc_none;
-       else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) ==
-                NVM_WORD0F_ASM_DIR)
-               hw->fc.requested_mode = e1000_fc_tx_pause;
-       else
-               hw->fc.requested_mode = e1000_fc_full;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_force_mac_fc - Force the MAC's flow control settings
- *  @hw: pointer to the HW structure
- *
- *  Force the MAC's flow control settings.  Sets the TFCE and RFCE bits in the
- *  device control register to reflect the adapter settings.  TFCE and RFCE
- *  need to be explicitly set by software when a copper PHY is used because
- *  autonegotiation is managed by the PHY rather than the MAC.  Software must
- *  also configure these bits when link is forced on a fiber connection.
- **/
-s32 e1000e_force_mac_fc(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val = E1000_SUCCESS;
-
-       ctrl = er32(CTRL);
-
-       /*
-        * Because we didn't get link via the internal auto-negotiation
-        * mechanism (we either forced link or we got link via PHY
-        * auto-neg), we have to manually enable/disable transmit an
-        * receive flow control.
-        *
-        * The "Case" statement below enables/disable flow control
-        * according to the "hw->fc.current_mode" parameter.
-        *
-        * The possible values of the "fc" parameter are:
-        *      0:  Flow control is completely disabled
-        *      1:  Rx flow control is enabled (we can receive pause
-        *          frames but not send pause frames).
-        *      2:  Tx flow control is enabled (we can send pause frames
-        *          frames but we do not receive pause frames).
-        *      3:  Both Rx and Tx flow control (symmetric) is enabled.
-        *  other:  No other values should be possible at this point.
-        */
-       e_dbg("hw->fc.current_mode = %u\n", hw->fc.current_mode);
-
-       switch (hw->fc.current_mode) {
-       case e1000_fc_none:
-               ctrl &= (~(E1000_CTRL_TFCE | E1000_CTRL_RFCE));
-               break;
-       case e1000_fc_rx_pause:
-               ctrl &= (~E1000_CTRL_TFCE);
-               ctrl |= E1000_CTRL_RFCE;
-               break;
-       case e1000_fc_tx_pause:
-               ctrl &= (~E1000_CTRL_RFCE);
-               ctrl |= E1000_CTRL_TFCE;
-               break;
-       case e1000_fc_full:
-               ctrl |= (E1000_CTRL_TFCE | E1000_CTRL_RFCE);
-               break;
-       default:
-               e_dbg("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ew32(CTRL, ctrl);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_config_fc_after_link_up - Configures flow control after link
- *  @hw: pointer to the HW structure
- *
- *  Checks the status of auto-negotiation after link up to ensure that the
- *  speed and duplex were not forced.  If the link needed to be forced, then
- *  flow control needs to be forced also.  If auto-negotiation is enabled
- *  and did not fail, then we configure flow control based on our link
- *  partner.
- **/
-s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = E1000_SUCCESS;
-       u16 mii_status_reg, mii_nway_adv_reg, mii_nway_lp_ability_reg;
-       u16 speed, duplex;
-
-       /*
-        * Check for the case where we have fiber media and auto-neg failed
-        * so we had to force link.  In this case, we need to force the
-        * configuration of the MAC to match the "fc" parameter.
-        */
-       if (mac->autoneg_failed) {
-               if (hw->phy.media_type == e1000_media_type_fiber ||
-                   hw->phy.media_type == e1000_media_type_internal_serdes)
-                       ret_val = e1000e_force_mac_fc(hw);
-       } else {
-               if (hw->phy.media_type == e1000_media_type_copper)
-                       ret_val = e1000e_force_mac_fc(hw);
-       }
-
-       if (ret_val) {
-               e_dbg("Error forcing flow control settings\n");
-               goto out;
-       }
-
-       /*
-        * Check for the case where we have copper media and auto-neg is
-        * enabled.  In this case, we need to check and see if Auto-Neg
-        * has completed, and if so, how the PHY and link partner has
-        * flow control configured.
-        */
-       if ((hw->phy.media_type == e1000_media_type_copper) && mac->autoneg) {
-               /*
-                * Read the MII Status Register and check to see if AutoNeg
-                * has completed.  We read this twice because this reg has
-                * some "sticky" (latched) bits.
-                */
-               ret_val = e1e_rphy(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       goto out;
-               ret_val = e1e_rphy(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       goto out;
-
-               if (!(mii_status_reg & MII_SR_AUTONEG_COMPLETE)) {
-                       e_dbg("Copper PHY and Auto Neg "
-                                "has not completed.\n");
-                       goto out;
-               }
-
-               /*
-                * The AutoNeg process has completed, so we now need to
-                * read both the Auto Negotiation Advertisement
-                * Register (Address 4) and the Auto_Negotiation Base
-                * Page Ability Register (Address 5) to determine how
-                * flow control was negotiated.
-                */
-               ret_val = e1e_rphy(hw, PHY_AUTONEG_ADV,
-                                            &mii_nway_adv_reg);
-               if (ret_val)
-                       goto out;
-               ret_val = e1e_rphy(hw, PHY_LP_ABILITY,
-                                            &mii_nway_lp_ability_reg);
-               if (ret_val)
-                       goto out;
-
-               /*
-                * Two bits in the Auto Negotiation Advertisement Register
-                * (Address 4) and two bits in the Auto Negotiation Base
-                * Page Ability Register (Address 5) determine flow control
-                * for both the PHY and the link partner.  The following
-                * table, taken out of the IEEE 802.3ab/D6.0 dated March 25,
-                * 1999, describes these PAUSE resolution bits and how flow
-                * control is determined based upon these settings.
-                * NOTE:  DC = Don't Care
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | NIC Resolution
-                *-------|---------|-------|---------|--------------------
-                *   0   |    0    |  DC   |   DC    | e1000_fc_none
-                *   0   |    1    |   0   |   DC    | e1000_fc_none
-                *   0   |    1    |   1   |    0    | e1000_fc_none
-                *   0   |    1    |   1   |    1    | e1000_fc_tx_pause
-                *   1   |    0    |   0   |   DC    | e1000_fc_none
-                *   1   |   DC    |   1   |   DC    | e1000_fc_full
-                *   1   |    1    |   0   |    0    | e1000_fc_none
-                *   1   |    1    |   0   |    1    | e1000_fc_rx_pause
-                *
-                * Are both PAUSE bits set to 1?  If so, this implies
-                * Symmetric Flow Control is enabled at both ends.  The
-                * ASM_DIR bits are irrelevant per the spec.
-                *
-                * For Symmetric Flow Control:
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-                *-------|---------|-------|---------|--------------------
-                *   1   |   DC    |   1   |   DC    | E1000_fc_full
-                *
-                */
-               if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                   (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE)) {
-                       /*
-                        * Now we need to check if the user selected Rx ONLY
-                        * of pause frames.  In this case, we had to advertise
-                        * FULL flow control because we could not advertise RX
-                        * ONLY. Hence, we must now check to see if we need to
-                        * turn OFF  the TRANSMISSION of PAUSE frames.
-                        */
-                       if (hw->fc.requested_mode == e1000_fc_full) {
-                               hw->fc.current_mode = e1000_fc_full;
-                               e_dbg("Flow Control = FULL.\r\n");
-                       } else {
-                               hw->fc.current_mode = e1000_fc_rx_pause;
-                               e_dbg("Flow Control = "
-                                        "RX PAUSE frames only.\r\n");
-                       }
-               }
-               /*
-                * For receiving PAUSE frames ONLY.
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-                *-------|---------|-------|---------|--------------------
-                *   0   |    1    |   1   |    1    | e1000_fc_tx_pause
-                */
-               else if (!(mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                         (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
-                         (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
-                         (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-                       hw->fc.current_mode = e1000_fc_tx_pause;
-                       e_dbg("Flow Control = TX PAUSE frames only.\r\n");
-               }
-               /*
-                * For transmitting PAUSE frames ONLY.
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-                *-------|---------|-------|---------|--------------------
-                *   1   |    1    |   0   |    1    | e1000_fc_rx_pause
-                */
-               else if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                        (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
-                        !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
-                        (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-                       hw->fc.current_mode = e1000_fc_rx_pause;
-                       e_dbg("Flow Control = RX PAUSE frames only.\r\n");
-               } else {
-                       /*
-                        * Per the IEEE spec, at this point flow control
-                        * should be disabled.
-                        */
-                       hw->fc.current_mode = e1000_fc_none;
-                       e_dbg("Flow Control = NONE.\r\n");
-               }
-
-               /*
-                * Now we need to do one last check...  If we auto-
-                * negotiated to HALF DUPLEX, flow control should not be
-                * enabled per IEEE 802.3 spec.
-                */
-               ret_val = mac->ops.get_link_up_info(hw, &speed, &duplex);
-               if (ret_val) {
-                       e_dbg("Error getting link speed and duplex\n");
-                       goto out;
-               }
-
-               if (duplex == HALF_DUPLEX)
-                       hw->fc.current_mode = e1000_fc_none;
-
-               /*
-                * Now we call a subroutine to actually force the MAC
-                * controller to use the correct flow control settings.
-                */
-               ret_val = e1000e_force_mac_fc(hw);
-               if (ret_val) {
-                       e_dbg("Error forcing flow control settings\n");
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_get_speed_and_duplex_copper - Retrieve current speed/duplex
- *  @hw: pointer to the HW structure
- *  @speed: stores the current speed
- *  @duplex: stores the current duplex
- *
- *  Read the status register for the current speed/duplex and store the current
- *  speed and duplex for copper connections.
- **/
-s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
-                                              u16 *duplex)
-{
-       u32 status;
-
-       status = er32(STATUS);
-       if (status & E1000_STATUS_SPEED_1000) {
-               *speed = SPEED_1000;
-               e_dbg("1000 Mbs, ");
-       } else if (status & E1000_STATUS_SPEED_100) {
-               *speed = SPEED_100;
-               e_dbg("100 Mbs, ");
-       } else {
-               *speed = SPEED_10;
-               e_dbg("10 Mbs, ");
-       }
-
-       if (status & E1000_STATUS_FD) {
-               *duplex = FULL_DUPLEX;
-               e_dbg("Full Duplex\n");
-       } else {
-               *duplex = HALF_DUPLEX;
-               e_dbg("Half Duplex\n");
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_get_speed_and_duplex_fiber_generic - Retrieve current speed/duplex
- *  @hw: pointer to the HW structure
- *  @speed: stores the current speed
- *  @duplex: stores the current duplex
- *
- *  Sets the speed and duplex to gigabit full duplex (the only possible option)
- *  for fiber/serdes links.
- **/
-s32 e1000e_get_speed_and_duplex_fiber_serdes(struct e1000_hw *hw __unused,
-                                                    u16 *speed, u16 *duplex)
-{
-       *speed = SPEED_1000;
-       *duplex = FULL_DUPLEX;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_get_hw_semaphore - Acquire hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Acquire the HW semaphore to access the PHY or NVM
- **/
-s32 e1000e_get_hw_semaphore(struct e1000_hw *hw)
-{
-       u32 swsm;
-       s32 ret_val = E1000_SUCCESS;
-       s32 timeout = hw->nvm.word_size + 1;
-       s32 i = 0;
-
-       /* Get the SW semaphore */
-       while (i < timeout) {
-               swsm = er32(SWSM);
-               if (!(swsm & E1000_SWSM_SMBI))
-                       break;
-
-               udelay(50);
-               i++;
-       }
-
-       if (i == timeout) {
-               e_dbg("Driver can't access device - SMBI bit is set.\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       /* Get the FW semaphore. */
-       for (i = 0; i < timeout; i++) {
-               swsm = er32(SWSM);
-               ew32(SWSM, swsm | E1000_SWSM_SWESMBI);
-
-               /* Semaphore acquired if bit latched */
-               if (er32(SWSM) & E1000_SWSM_SWESMBI)
-                       break;
-
-               udelay(50);
-       }
-
-       if (i == timeout) {
-               /* Release semaphores */
-               e1000e_put_hw_semaphore(hw);
-               e_dbg("Driver can't access the NVM\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_put_hw_semaphore - Release hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Release hardware semaphore used to access the PHY or NVM
- **/
-void e1000e_put_hw_semaphore(struct e1000_hw *hw)
-{
-       u32 swsm;
-
-       swsm = er32(SWSM);
-       swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
-       ew32(SWSM, swsm);
-}
-/**
- *  e1000e_get_auto_rd_done - Check for auto read completion
- *  @hw: pointer to the HW structure
- *
- *  Check EEPROM for Auto Read done bit.
- **/
-s32 e1000e_get_auto_rd_done(struct e1000_hw *hw)
-{
-       s32 i = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       while (i < AUTO_READ_DONE_TIMEOUT) {
-               if (er32(EECD) & E1000_EECD_AUTO_RD)
-                       break;
-               msleep(1);
-               i++;
-       }
-
-       if (i == AUTO_READ_DONE_TIMEOUT) {
-               e_dbg("Auto read by HW from NVM has not completed.\n");
-               ret_val = -E1000_ERR_RESET;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_valid_led_default - Verify a valid default LED config
- *  @hw: pointer to the HW structure
- *  @data: pointer to the NVM (EEPROM)
- *
- *  Read the EEPROM for the current default LED configuration.  If the
- *  LED configuration is not valid, set to a valid LED configuration.
- **/
-s32 e1000e_valid_led_default(struct e1000_hw *hw, u16 *data)
-{
-       s32 ret_val;
-
-       ret_val = e1000e_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               goto out;
-       }
-
-       if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF)
-               *data = ID_LED_DEFAULT;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_id_led_init -
- *  @hw: pointer to the HW structure
- *
- **/
-s32 e1000e_id_led_init(struct e1000_hw *hw __unused)
-{
-#if 0
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val;
-       const u32 ledctl_mask = 0x000000FF;
-       const u32 ledctl_on = E1000_LEDCTL_MODE_LED_ON;
-       const u32 ledctl_off = E1000_LEDCTL_MODE_LED_OFF;
-       u16 data, i, temp;
-       const u16 led_mask = 0x0F;
-
-       ret_val = hw->nvm.ops.valid_led_default(hw, &data);
-       if (ret_val)
-               goto out;
-
-       mac->ledctl_default = er32(LEDCTL);
-       mac->ledctl_mode1 = mac->ledctl_default;
-       mac->ledctl_mode2 = mac->ledctl_default;
-
-       for (i = 0; i < 4; i++) {
-               temp = (data >> (i << 2)) & led_mask;
-               switch (temp) {
-               case ID_LED_ON1_DEF2:
-               case ID_LED_ON1_ON2:
-               case ID_LED_ON1_OFF2:
-                       mac->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode1 |= ledctl_on << (i << 3);
-                       break;
-               case ID_LED_OFF1_DEF2:
-               case ID_LED_OFF1_ON2:
-               case ID_LED_OFF1_OFF2:
-                       mac->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode1 |= ledctl_off << (i << 3);
-                       break;
-               default:
-                       /* Do nothing */
-                       break;
-               }
-               switch (temp) {
-               case ID_LED_DEF1_ON2:
-               case ID_LED_ON1_ON2:
-               case ID_LED_OFF1_ON2:
-                       mac->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode2 |= ledctl_on << (i << 3);
-                       break;
-               case ID_LED_DEF1_OFF2:
-               case ID_LED_ON1_OFF2:
-               case ID_LED_OFF1_OFF2:
-                       mac->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode2 |= ledctl_off << (i << 3);
-                       break;
-               default:
-                       /* Do nothing */
-                       break;
-               }
-       }
-
-out:
-       return ret_val;
-#endif
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_setup_led_generic - Configures SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This prepares the SW controllable LED for use and saves the current state
- *  of the LED so it can be later restored.
- **/
-s32 e1000e_setup_led_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ledctl;
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->mac.ops.setup_led != e1000e_setup_led_generic) {
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       if (hw->phy.media_type == e1000_media_type_fiber) {
-               ledctl = er32(LEDCTL);
-               hw->mac.ledctl_default = ledctl;
-               /* Turn off LED0 */
-               ledctl &= ~(E1000_LEDCTL_LED0_IVRT |
-                           E1000_LEDCTL_LED0_BLINK |
-                           E1000_LEDCTL_LED0_MODE_MASK);
-               ledctl |= (E1000_LEDCTL_MODE_LED_OFF <<
-                          E1000_LEDCTL_LED0_MODE_SHIFT);
-               ew32(LEDCTL, ledctl);
-       } else if (hw->phy.media_type == e1000_media_type_copper) {
-               ew32(LEDCTL, hw->mac.ledctl_mode1);
-       }
-
-out:
-       return ret_val;
-#endif
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_cleanup_led_generic - Set LED config to default operation
- *  @hw: pointer to the HW structure
- *
- *  Remove the current LED configuration and set the LED configuration
- *  to the default value, saved from the EEPROM.
- **/
-s32 e1000e_cleanup_led_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->mac.ops.cleanup_led != e1000e_cleanup_led_generic) {
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ew32(LEDCTL, hw->mac.ledctl_default);
-
-out:
-       return ret_val;
-#endif
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_blink_led - Blink LED
- *  @hw: pointer to the HW structure
- *
- *  Blink the LEDs which are set to be on.
- **/
-s32 e1000e_blink_led(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ledctl_blink = 0;
-       u32 i;
-
-       if (hw->phy.media_type == e1000_media_type_fiber) {
-               /* always blink LED0 for PCI-E fiber */
-               ledctl_blink = E1000_LEDCTL_LED0_BLINK |
-                    (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED0_MODE_SHIFT);
-       } else {
-               /*
-                * set the blink bit for each LED that's "on" (0x0E)
-                * in ledctl_mode2
-                */
-               ledctl_blink = hw->mac.ledctl_mode2;
-               for (i = 0; i < 4; i++)
-                       if (((hw->mac.ledctl_mode2 >> (i * 8)) & 0xFF) ==
-                           E1000_LEDCTL_MODE_LED_ON)
-                               ledctl_blink |= (E1000_LEDCTL_LED0_BLINK <<
-                                                (i * 8));
-       }
-
-       ew32(LEDCTL, ledctl_blink);
-#endif
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_led_on_generic - Turn LED on
- *  @hw: pointer to the HW structure
- *
- *  Turn LED on.
- **/
-s32 e1000e_led_on_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ctrl;
-
-       switch (hw->phy.media_type) {
-       case e1000_media_type_fiber:
-               ctrl = er32(CTRL);
-               ctrl &= ~E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-               ew32(CTRL, ctrl);
-               break;
-       case e1000_media_type_copper:
-               ew32(LEDCTL, hw->mac.ledctl_mode2);
-               break;
-       default:
-               break;
-       }
-#endif
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_led_off_generic - Turn LED off
- *  @hw: pointer to the HW structure
- *
- *  Turn LED off.
- **/
-s32 e1000e_led_off_generic(struct e1000_hw *hw __unused)
-{
-#if 0
-       u32 ctrl;
-
-       switch (hw->phy.media_type) {
-       case e1000_media_type_fiber:
-               ctrl = er32(CTRL);
-               ctrl |= E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-               ew32(CTRL, ctrl);
-               break;
-       case e1000_media_type_copper:
-               ew32(LEDCTL, hw->mac.ledctl_mode1);
-               break;
-       default:
-               break;
-       }
-#endif
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_set_pcie_no_snoop - Set PCI-express capabilities
- *  @hw: pointer to the HW structure
- *  @no_snoop: bitmap of snoop events
- *
- *  Set the PCI-express register to snoop for events enabled in 'no_snoop'.
- **/
-void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop)
-{
-       u32 gcr;
-
-       if (hw->bus.type != e1000_bus_type_pci_express)
-               goto out;
-
-       if (no_snoop) {
-               gcr = er32(GCR);
-               gcr &= ~(PCIE_NO_SNOOP_ALL);
-               gcr |= no_snoop;
-               ew32(GCR, gcr);
-       }
-out:
-       return;
-}
-
-/**
- *  e1000e_disable_pcie_master - Disables PCI-express master access
- *  @hw: pointer to the HW structure
- *
- *  Returns 0 (E1000_SUCCESS) if successful, else returns -10
- *  (-E1000_ERR_MASTER_REQUESTS_PENDING) if master disable bit has not caused
- *  the master requests to be disabled.
- *
- *  Disables PCI-Express master access and verifies there are no pending
- *  requests.
- **/
-s32 e1000e_disable_pcie_master(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 timeout = MASTER_DISABLE_TIMEOUT;
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->bus.type != e1000_bus_type_pci_express)
-               goto out;
-
-       ctrl = er32(CTRL);
-       ctrl |= E1000_CTRL_GIO_MASTER_DISABLE;
-       ew32(CTRL, ctrl);
-
-       while (timeout) {
-               if (!(er32(STATUS) &
-                     E1000_STATUS_GIO_MASTER_ENABLE))
-                       break;
-               udelay(100);
-               timeout--;
-       }
-
-       if (!timeout) {
-               e_dbg("Master requests are pending.\n");
-               ret_val = -E1000_ERR_MASTER_REQUESTS_PENDING;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_reset_adaptive - Reset Adaptive Interframe Spacing
- *  @hw: pointer to the HW structure
- *
- *  Reset the Adaptive Interframe Spacing throttle to default values.
- **/
-void e1000e_reset_adaptive(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-
-       if (!mac->adaptive_ifs) {
-               e_dbg("Not in Adaptive IFS mode!\n");
-               goto out;
-       }
-
-       mac->current_ifs_val = 0;
-       mac->ifs_min_val = IFS_MIN;
-       mac->ifs_max_val = IFS_MAX;
-       mac->ifs_step_size = IFS_STEP;
-       mac->ifs_ratio = IFS_RATIO;
-
-       mac->in_ifs_mode = false;
-       ew32(AIT, 0);
-out:
-       return;
-}
-
-/**
- *  e1000e_update_adaptive - Update Adaptive Interframe Spacing
- *  @hw: pointer to the HW structure
- *
- *  Update the Adaptive Interframe Spacing Throttle value based on the
- *  time between transmitted packets and time between collisions.
- **/
-void e1000e_update_adaptive(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-
-       if (!mac->adaptive_ifs) {
-               e_dbg("Not in Adaptive IFS mode!\n");
-               goto out;
-       }
-
-       if ((mac->collision_delta * mac->ifs_ratio) > mac->tx_packet_delta) {
-               if (mac->tx_packet_delta > MIN_NUM_XMITS) {
-                       mac->in_ifs_mode = true;
-                       if (mac->current_ifs_val < mac->ifs_max_val) {
-                               if (!mac->current_ifs_val)
-                                       mac->current_ifs_val = mac->ifs_min_val;
-                               else
-                                       mac->current_ifs_val +=
-                                               mac->ifs_step_size;
-                               ew32(AIT, mac->current_ifs_val);
-                       }
-               }
-       } else {
-               if (mac->in_ifs_mode &&
-                   (mac->tx_packet_delta <= MIN_NUM_XMITS)) {
-                       mac->current_ifs_val = 0;
-                       mac->in_ifs_mode = false;
-                       ew32(AIT, 0);
-               }
-       }
-out:
-       return;
-}
-
-/**
- *  e1000e_validate_mdi_setting_generic - Verify MDI/MDIx settings
- *  @hw: pointer to the HW structure
- *
- *  Verify that when not using auto-negotiation that MDI/MDIx is correctly
- *  set, which is forced to MDI mode only.
- **/
-static s32 e1000e_validate_mdi_setting_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (!hw->mac.autoneg && (hw->phy.mdix == 0 || hw->phy.mdix == 3)) {
-               e_dbg("Invalid MDI setting detected\n");
-               hw->phy.mdix = 1;
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
diff --git a/src/drivers/net/e1000e/e1000e_mac.h b/src/drivers/net/e1000e/e1000e_mac.h
deleted file mode 100644 (file)
index 5b8a425..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000E_MAC_H_
-#define _E1000E_MAC_H_
-
-/*
- * Functions that should not be called directly from drivers but can be used
- * by other files in this 'shared code'
- */
-void e1000e_init_mac_ops_generic(struct e1000_hw *hw);
-s32  e1000e_blink_led(struct e1000_hw *hw);
-s32  e1000e_check_for_copper_link(struct e1000_hw *hw);
-s32  e1000e_check_for_fiber_link(struct e1000_hw *hw);
-s32  e1000e_check_for_serdes_link(struct e1000_hw *hw);
-s32  e1000e_cleanup_led_generic(struct e1000_hw *hw);
-s32  e1000e_config_fc_after_link_up(struct e1000_hw *hw);
-s32  e1000e_disable_pcie_master(struct e1000_hw *hw);
-s32  e1000e_force_mac_fc(struct e1000_hw *hw);
-s32  e1000e_get_auto_rd_done(struct e1000_hw *hw);
-s32  e1000e_get_bus_info_pcie(struct e1000_hw *hw);
-void e1000e_set_lan_id_single_port(struct e1000_hw *hw);
-s32  e1000e_get_hw_semaphore(struct e1000_hw *hw);
-s32  e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed,
-                                               u16 *duplex);
-s32  e1000e_get_speed_and_duplex_fiber_serdes(struct e1000_hw *hw,
-                                                     u16 *speed, u16 *duplex);
-s32  e1000e_id_led_init(struct e1000_hw *hw);
-s32  e1000e_led_on_generic(struct e1000_hw *hw);
-s32  e1000e_led_off_generic(struct e1000_hw *hw);
-void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
-                                      u8 *mc_addr_list, u32 mc_addr_count);
-s32  e1000e_set_fc_watermarks(struct e1000_hw *hw);
-s32  e1000e_setup_fiber_serdes_link(struct e1000_hw *hw);
-s32  e1000e_setup_led_generic(struct e1000_hw *hw);
-s32  e1000e_setup_link(struct e1000_hw *hw);
-
-void e1000e_clear_hw_cntrs_base(struct e1000_hw *hw);
-void e1000e_clear_vfta_generic(struct e1000_hw *hw);
-void e1000e_config_collision_dist(struct e1000_hw *hw);
-void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);
-void e1000e_mta_set_generic(struct e1000_hw *hw, u32 hash_value);
-void e1000e_pcix_mmrbc_workaround_generic(struct e1000_hw *hw);
-void e1000e_put_hw_semaphore(struct e1000_hw *hw);
-void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
-s32  e1000e_check_alt_mac_addr_generic(struct e1000_hw *hw);
-void e1000e_reset_adaptive(struct e1000_hw *hw);
-void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop);
-void e1000e_update_adaptive(struct e1000_hw *hw);
-void e1000e_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value);
-
-#endif
diff --git a/src/drivers/net/e1000e/e1000e_main.c b/src/drivers/net/e1000e/e1000e_main.c
deleted file mode 100644 (file)
index 69a5bc2..0000000
+++ /dev/null
@@ -1,1282 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  Portions Copyright(c) 2010 Marty Connor <mdc@etherboot.org>
-  Portions Copyright(c) 2010 Entity Cyber, Inc.
-  Portions Copyright(c) 2010 Northrop Grumman Corporation
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include "e1000e.h"
-
-static s32 e1000e_get_variants_82571(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       static int global_quad_port_a; /* global port a indication */
-       struct pci_device *pdev = adapter->pdev;
-       u16 eeprom_data = 0;
-       int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1;
-
-       /* tag quad port adapters first, it's used below */
-       switch (pdev->device) {
-       case E1000_DEV_ID_82571EB_QUAD_COPPER:
-       case E1000_DEV_ID_82571EB_QUAD_FIBER:
-       case E1000_DEV_ID_82571EB_QUAD_COPPER_LP:
-       case E1000_DEV_ID_82571PT_QUAD_COPPER:
-               adapter->flags |= FLAG_IS_QUAD_PORT;
-               /* mark the first port */
-               if (global_quad_port_a == 0)
-                       adapter->flags |= FLAG_IS_QUAD_PORT_A;
-               /* Reset for multiple quad port adapters */
-               global_quad_port_a++;
-               if (global_quad_port_a == 4)
-                       global_quad_port_a = 0;
-               break;
-       default:
-               break;
-       }
-
-       switch (adapter->hw.mac.type) {
-       case e1000_82571:
-               /* these dual ports don't have WoL on port B at all */
-               if (((pdev->device == E1000_DEV_ID_82571EB_FIBER) ||
-                    (pdev->device == E1000_DEV_ID_82571EB_SERDES) ||
-                    (pdev->device == E1000_DEV_ID_82571EB_COPPER)) &&
-                   (is_port_b))
-                       adapter->flags &= ~FLAG_HAS_WOL;
-               /* quad ports only support WoL on port A */
-               if (adapter->flags & FLAG_IS_QUAD_PORT &&
-                   (!(adapter->flags & FLAG_IS_QUAD_PORT_A)))
-                       adapter->flags &= ~FLAG_HAS_WOL;
-               /* Does not support WoL on any port */
-               if (pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD)
-                       adapter->flags &= ~FLAG_HAS_WOL;
-               break;
-
-       case e1000_82573:
-               if (pdev->device == E1000_DEV_ID_82573L) {
-                       if (e1000e_read_nvm(&adapter->hw, NVM_INIT_3GIO_3, 1,
-                                          &eeprom_data) < 0)
-                               break;
-                       if (!(eeprom_data & NVM_WORD1A_ASPM_MASK)) {
-                               adapter->flags |= FLAG_HAS_JUMBO_FRAMES;
-                               adapter->max_hw_frame_size = DEFAULT_JUMBO;
-                       }
-               }
-               break;
-
-       default:
-               break;
-       }
-
-       return 0;
-}
-
-static struct e1000_info e1000_82571_info = {
-       .mac                    = e1000_82571,
-       .flags                  = FLAG_HAS_HW_VLAN_FILTER
-                                 | FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_HAS_WOL
-                                 | FLAG_APME_IN_CTRL3
-                                 | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_HAS_SMART_POWER_DOWN
-                                 | FLAG_RESET_OVERWRITES_LAA /* errata */
-                                 | FLAG_TARC_SPEED_MODE_BIT /* errata */
-                                 | FLAG_APME_CHECK_PORT_B,
-       .pba                    = 38,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .init_ops               = e1000e_init_function_pointers_82571,
-       .get_variants           = e1000e_get_variants_82571,
-};
-
-static struct e1000_info e1000_82572_info = {
-       .mac                    = e1000_82572,
-       .flags                  = FLAG_HAS_HW_VLAN_FILTER
-                                 | FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_HAS_WOL
-                                 | FLAG_APME_IN_CTRL3
-                                 | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_TARC_SPEED_MODE_BIT, /* errata */
-       .pba                    = 38,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .init_ops               = e1000e_init_function_pointers_82571,
-       .get_variants           = e1000e_get_variants_82571,
-};
-
-static struct e1000_info e1000_82573_info = {
-       .mac                    = e1000_82573,
-       .flags                  = FLAG_HAS_HW_VLAN_FILTER
-                                 | FLAG_HAS_WOL
-                                 | FLAG_APME_IN_CTRL3
-                                 | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_SMART_POWER_DOWN
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_ERT
-                                 | FLAG_HAS_SWSM_ON_LOAD,
-       .pba                    = 20,
-       .max_hw_frame_size      = ETH_FRAME_LEN + ETH_FCS_LEN,
-       .init_ops               = e1000e_init_function_pointers_82571,
-       .get_variants           = e1000e_get_variants_82571,
-};
-
-static struct e1000_info e1000_82574_info = {
-       .mac                    = e1000_82574,
-       .flags                  = FLAG_HAS_HW_VLAN_FILTER
-#ifdef CONFIG_E1000E_MSIX
-                                 | FLAG_HAS_MSIX
-#endif
-                                 | FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_HAS_WOL
-                                 | FLAG_APME_IN_CTRL3
-                                 | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_SMART_POWER_DOWN
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD,
-       .pba                    = 20,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .init_ops               = e1000e_init_function_pointers_82571,
-       .get_variants           = e1000e_get_variants_82571,
-};
-
-static struct e1000_info e1000_82583_info = {
-       .mac                    = e1000_82583,
-       .flags                  = FLAG_HAS_HW_VLAN_FILTER
-                                 | FLAG_HAS_WOL
-                                 | FLAG_APME_IN_CTRL3
-                                 | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_SMART_POWER_DOWN
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD,
-       .pba                    = 20,
-       .max_hw_frame_size      = ETH_FRAME_LEN + ETH_FCS_LEN,
-       .init_ops               = e1000e_init_function_pointers_82571,
-       .get_variants           = e1000e_get_variants_82571,
-};
-
-static struct e1000_info e1000_es2_info = {
-       .mac                    = e1000_80003es2lan,
-       .flags                  = FLAG_HAS_HW_VLAN_FILTER
-                                 | FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_HAS_WOL
-                                 | FLAG_APME_IN_CTRL3
-                                 | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_RX_NEEDS_RESTART /* errata */
-                                 | FLAG_TARC_SET_BIT_ZERO /* errata */
-                                 | FLAG_APME_CHECK_PORT_B
-                                 | FLAG_DISABLE_FC_PAUSE_TIME /* errata */
-                                 | FLAG_TIPG_MEDIUM_FOR_80003ESLAN,
-       .pba                    = 38,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .init_ops               = e1000e_init_function_pointers_80003es2lan,
-       .get_variants           = NULL,
-};
-
-static s32 e1000e_get_variants_ich8lan(struct e1000_adapter *adapter)
-{
-       if (adapter->hw.phy.type == e1000_phy_ife) {
-               adapter->flags &= ~FLAG_HAS_JUMBO_FRAMES;
-               adapter->max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN;
-       }
-
-       if ((adapter->hw.mac.type == e1000_ich8lan) &&
-           (adapter->hw.phy.type == e1000_phy_igp_3))
-               adapter->flags |= FLAG_LSC_GIG_SPEED_DROP;
-
-       return 0;
-}
-
-static struct e1000_info e1000_ich8_info = {
-       .mac                    = e1000_ich8lan,
-       .flags                  = FLAG_HAS_WOL
-                                 | FLAG_IS_ICH
-                                 | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_FLASH
-                                 | FLAG_APME_IN_WUC,
-       .pba                    = 8,
-       .max_hw_frame_size      = ETH_FRAME_LEN + ETH_FCS_LEN,
-       .init_ops               = e1000e_init_function_pointers_ich8lan,
-       .get_variants           = e1000e_get_variants_ich8lan,
-};
-
-static struct e1000_info e1000_ich9_info = {
-       .mac                    = e1000_ich9lan,
-       .flags                  = FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_IS_ICH
-                                 | FLAG_HAS_WOL
-                                 | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_ERT
-                                 | FLAG_HAS_FLASH
-                                 | FLAG_APME_IN_WUC,
-       .pba                    = 10,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .init_ops               = e1000e_init_function_pointers_ich8lan,
-       .get_variants           = e1000e_get_variants_ich8lan,
-};
-
-static struct e1000_info e1000_ich10_info = {
-       .mac                    = e1000_ich10lan,
-       .flags                  = FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_IS_ICH
-                                 | FLAG_HAS_WOL
-                                 | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_ERT
-                                 | FLAG_HAS_FLASH
-                                 | FLAG_APME_IN_WUC,
-       .pba                    = 10,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .init_ops               = e1000e_init_function_pointers_ich8lan,
-       .get_variants           = e1000e_get_variants_ich8lan,
-};
-
-static struct e1000_info e1000_pch_info = {
-       .mac                    = e1000_pchlan,
-       .flags                  = FLAG_IS_ICH
-                                 | FLAG_HAS_WOL
-                                 | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_FLASH
-                                 | FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_DISABLE_FC_PAUSE_TIME /* errata */
-                                 | FLAG_APME_IN_WUC,
-       .pba                    = 26,
-       .max_hw_frame_size      = 4096,
-       .init_ops               = e1000e_init_function_pointers_ich8lan,
-       .get_variants           = e1000e_get_variants_ich8lan,
-};
-
-static struct e1000_info e1000_pch2_info = {
-       .mac                    = e1000_pch2lan,
-       .flags                  = FLAG_IS_ICH
-                                 | FLAG_HAS_WOL
-                                 | FLAG_RX_CSUM_ENABLED
-                                 | FLAG_HAS_CTRLEXT_ON_LOAD
-                                 | FLAG_HAS_AMT
-                                 | FLAG_HAS_FLASH
-                                 | FLAG_HAS_JUMBO_FRAMES
-                                 | FLAG_APME_IN_WUC,
-       .pba                    = 26,
-       .max_hw_frame_size      = DEFAULT_JUMBO,
-       .init_ops               = e1000e_init_function_pointers_ich8lan,
-       .get_variants           = e1000e_get_variants_ich8lan,
-};
-
-static const struct e1000_info *e1000_info_tbl[] = {
-       [board_82571]           = &e1000_82571_info,
-       [board_82572]           = &e1000_82572_info,
-       [board_82573]           = &e1000_82573_info,
-       [board_82574]           = &e1000_82574_info,
-       [board_82583]           = &e1000_82583_info,
-       [board_80003es2lan]     = &e1000_es2_info,
-       [board_ich8lan]         = &e1000_ich8_info,
-       [board_ich9lan]         = &e1000_ich9_info,
-       [board_ich10lan]        = &e1000_ich10_info,
-       [board_pchlan]          = &e1000_pch_info,
-       [board_pch2lan]         = &e1000_pch2_info,
-};
-
-/* Low-level support routines */
-
-s32 e1000e_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
-{
-       u16 cap_offset;
-
-       cap_offset = pci_find_capability(hw->adapter->pdev, PCI_CAP_ID_EXP);
-       if (!cap_offset)
-               return -E1000_ERR_CONFIG;
-
-       pci_read_config_word(hw->adapter->pdev, cap_offset + reg, value);
-
-       return E1000_SUCCESS;
-}
-
-/**
- * e1000e_irq_disable - Mask off interrupt generation on the NIC
- **/
-static void e1000e_irq_disable(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       ew32(IMC, ~0);
-       e1e_flush();
-}
-
-/**
- * e1000e_irq_enable - Enable default interrupt generation settings
- **/
-static void e1000e_irq_enable(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       ew32(IMS, IMS_ENABLE_MASK);
-       e1e_flush();
-}
-
-/**
- * e1000_get_hw_control - get control of the h/w from f/w
- * @adapter: address of board private structure
- *
- * e1000_get_hw_control sets {CTRL_EXT|SWSM}:DRV_LOAD bit.
- * For ASF and Pass Through versions of f/w this means that
- * the driver is loaded. For AMT version (only with 82573)
- * of the f/w this means that the network i/f is open.
- **/
-static void e1000e_get_hw_control(struct e1000_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl_ext;
-       u32 swsm;
-
-       /* Let firmware know the driver has taken over */
-       if (adapter->flags & FLAG_HAS_SWSM_ON_LOAD) {
-               swsm = er32(SWSM);
-               ew32(SWSM, swsm | E1000_SWSM_DRV_LOAD);
-       } else if (adapter->flags & FLAG_HAS_CTRLEXT_ON_LOAD) {
-               ctrl_ext = er32(CTRL_EXT);
-               ew32(CTRL_EXT, ctrl_ext | E1000_CTRL_EXT_DRV_LOAD);
-       }
-}
-
-/**
- * e1000e_power_up_phy - restore link in case the phy was powered down
- * @adapter: address of board private structure
- *
- * The phy may be powered down to save power and turn off link when the
- * driver is unloaded and wake on lan is not enabled (among others)
- * *** this routine MUST be followed by a call to e1000e_reset ***
- **/
-void e1000e_power_up_phy(struct e1000_adapter *adapter)
-{
-       if (adapter->hw.phy.ops.power_up)
-               adapter->hw.phy.ops.power_up(&adapter->hw);
-
-       adapter->hw.mac.ops.setup_link(&adapter->hw);
-}
-
-/**
- * e1000_power_down_phy - Power down the PHY
- *
- * Power down the PHY so no link is implied when interface is down.
- * The PHY cannot be powered down if management or WoL is active.
- */
-void e1000e_power_down_phy(struct e1000_adapter *adapter)
-{
-       /* WoL is enabled */
-       if (adapter->wol)
-               return;
-
-       if (adapter->hw.phy.ops.power_down)
-               adapter->hw.phy.ops.power_down(&adapter->hw);
-}
-
-/**
- * e1000e_reset - bring the hardware into a known good state
- *
- * This function boots the hardware and enables some settings that
- * require a configuration cycle of the hardware - those cannot be
- * set/changed during runtime. After reset the device needs to be
- * properly configured for Rx, Tx etc.
- */
-void e1000e_reset(struct e1000_adapter *adapter)
-{
-       struct e1000_mac_info *mac = &adapter->hw.mac;
-       struct e1000_fc_info *fc = &adapter->hw.fc;
-       u32 pba = adapter->pba;
-       struct e1000_hw *hw = &adapter->hw;
-
-       /* Reset Packet Buffer Allocation to default */
-       ew32(PBA, pba);
-
-       hw->fc.requested_mode = e1000_fc_none;
-       fc->current_mode = fc->requested_mode;
-
-       /* Allow time for pending master requests to run */
-       mac->ops.reset_hw(hw);
-
-       /*
-        * For parts with AMT enabled, let the firmware know
-        * that the network interface is in control
-        */
-       if (adapter->flags & FLAG_HAS_AMT)
-               e1000e_get_hw_control(adapter);
-
-       ew32(WUC, 0);
-       if (adapter->flags2 & FLAG2_HAS_PHY_WAKEUP)
-               e1e_wphy(&adapter->hw, BM_WUC, 0);
-
-       if (mac->ops.init_hw(hw))
-               DBG("Hardware Error\n");
-
-       /* additional part of the flow-control workaround above */
-       if (hw->mac.type == e1000_pchlan)
-               ew32(FCRTV_PCH, 0x1000);
-
-       e1000e_reset_adaptive(hw);
-
-       e1000e_get_phy_info(hw);
-
-       if ((adapter->flags & FLAG_HAS_SMART_POWER_DOWN) &&
-           !(adapter->flags & FLAG_SMART_POWER_DOWN)) {
-               u16 phy_data = 0;
-               /*
-                * speed up time to link by disabling smart power down, ignore
-                * the return value of this function because there is nothing
-                * different we would do if it failed
-                */
-               e1e_rphy(hw, IGP02E1000_PHY_POWER_MGMT, &phy_data);
-               phy_data &= ~IGP02E1000_PM_SPD;
-               e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, phy_data);
-       }
-}
-
-static int e1000e_sw_init(struct e1000_adapter *adapter)
-{
-       s32 rc;
-
-       /* Set various function pointers */
-       adapter->ei->init_ops(&adapter->hw);
-
-       rc = adapter->hw.mac.ops.init_params(&adapter->hw);
-       if (rc)
-               return rc;
-
-       rc = adapter->hw.nvm.ops.init_params(&adapter->hw);
-       if (rc)
-               return rc;
-
-       rc = adapter->hw.phy.ops.init_params(&adapter->hw);
-       if (rc)
-               return rc;
-
-       /* Explicitly disable IRQ since the NIC can be in any state. */
-       e1000e_irq_disable(adapter);
-
-       return E1000_SUCCESS;
-}
-
-/* TX support routines */
-
-/**
- * e1000_setup_tx_resources - allocate Tx resources (Descriptors)
- *
- * @v adapter  e1000 private structure
- *
- * @ret rc      Returns 0 on success, negative on failure
- **/
-static int e1000e_setup_tx_resources ( struct e1000_adapter *adapter )
-{
-       DBGP ( "e1000_setup_tx_resources\n" );
-
-       /* Allocate transmit descriptor ring memory.
-          It must not cross a 64K boundary because of hardware errata #23
-          so we use malloc_dma() requesting a 128 byte block that is
-          128 byte aligned. This should guarantee that the memory
-          allocated will not cross a 64K boundary, because 128 is an
-          even multiple of 65536 ( 65536 / 128 == 512 ), so all possible
-          allocations of 128 bytes on a 128 byte boundary will not
-          cross 64K bytes.
-        */
-
-       adapter->tx_base =
-               malloc_dma ( adapter->tx_ring_size, adapter->tx_ring_size );
-
-       if ( ! adapter->tx_base ) {
-               return -ENOMEM;
-       }
-
-       memset ( adapter->tx_base, 0, adapter->tx_ring_size );
-
-       DBG ( "adapter->tx_base = %#08lx\n", virt_to_bus ( adapter->tx_base ) );
-
-       return 0;
-}
-
-/**
- * e1000_process_tx_packets - process transmitted packets
- *
- * @v netdev   network interface device structure
- **/
-static void e1000e_process_tx_packets ( struct net_device *netdev )
-{
-       struct e1000_adapter *adapter = netdev_priv ( netdev );
-       uint32_t i;
-       uint32_t tx_status;
-       struct e1000_tx_desc *tx_curr_desc;
-
-       /* Check status of transmitted packets
-        */
-       DBG ( "process_tx_packets: tx_head = %d, tx_tail = %d\n", adapter->tx_head,
-             adapter->tx_tail );
-
-       while ( ( i = adapter->tx_head ) != adapter->tx_tail ) {
-
-               tx_curr_desc = ( void * )  ( adapter->tx_base ) +
-                                          ( i * sizeof ( *adapter->tx_base ) );
-
-               tx_status = tx_curr_desc->upper.data;
-
-               DBG ( "  tx_curr_desc = %#08lx\n", virt_to_bus ( tx_curr_desc ) );
-               DBG ( "  tx_status = %#08x\n", tx_status );
-
-               /* if the packet at tx_head is not owned by hardware it is for us */
-               if ( ! ( tx_status & E1000_TXD_STAT_DD ) )
-                       break;
-
-               DBG ( "Sent packet. tx_head: %d tx_tail: %d tx_status: %#08x\n",
-                     adapter->tx_head, adapter->tx_tail, tx_status );
-
-               if ( tx_status & ( E1000_TXD_STAT_EC | E1000_TXD_STAT_LC |
-                                  E1000_TXD_STAT_TU ) ) {
-                       netdev_tx_complete_err ( netdev, adapter->tx_iobuf[i], -EINVAL );
-                       DBG ( "Error transmitting packet, tx_status: %#08x\n",
-                             tx_status );
-               } else {
-                       netdev_tx_complete ( netdev, adapter->tx_iobuf[i] );
-                       DBG ( "Success transmitting packet, tx_status: %#08x\n",
-                             tx_status );
-               }
-
-               /* Decrement count of used descriptors, clear this descriptor
-                */
-               adapter->tx_fill_ctr--;
-               memset ( tx_curr_desc, 0, sizeof ( *tx_curr_desc ) );
-
-               adapter->tx_head = ( adapter->tx_head + 1 ) % NUM_TX_DESC;
-       }
-}
-
-static void e1000e_free_tx_resources ( struct e1000_adapter *adapter )
-{
-       DBGP ( "e1000_free_tx_resources\n" );
-
-       free_dma ( adapter->tx_base, adapter->tx_ring_size );
-}
-
-/**
- * e1000_configure_tx - Configure 8254x Transmit Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Tx unit of the MAC after a reset.
- **/
-static void e1000e_configure_tx ( struct e1000_adapter *adapter )
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 tctl, tipg, tarc;
-       u32 ipgr1, ipgr2;
-
-       DBGP ( "e1000_configure_tx\n" );
-
-       /* disable transmits while setting up the descriptors */
-       tctl = E1000_READ_REG ( hw, E1000_TCTL );
-       E1000_WRITE_REG ( hw, E1000_TCTL, tctl & ~E1000_TCTL_EN );
-       e1e_flush();
-       mdelay(10);
-
-       E1000_WRITE_REG ( hw, E1000_TDBAH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_TDBAL(0), virt_to_bus ( adapter->tx_base ) );
-       E1000_WRITE_REG ( hw, E1000_TDLEN(0), adapter->tx_ring_size );
-
-       DBG ( "E1000_TDBAL(0): %#08x\n",  E1000_READ_REG ( hw, E1000_TDBAL(0) ) );
-       DBG ( "E1000_TDLEN(0): %d\n",     E1000_READ_REG ( hw, E1000_TDLEN(0) ) );
-
-       /* Setup the HW Tx Head and Tail descriptor pointers */
-       E1000_WRITE_REG ( hw, E1000_TDH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_TDT(0), 0 );
-
-       adapter->tx_head = 0;
-       adapter->tx_tail = 0;
-       adapter->tx_fill_ctr = 0;
-
-       /* Set the default values for the Tx Inter Packet Gap timer */
-       tipg = DEFAULT_82543_TIPG_IPGT_COPPER;          /*  8  */
-       ipgr1 = DEFAULT_82543_TIPG_IPGR1;               /*  8  */
-       ipgr2 = DEFAULT_82543_TIPG_IPGR2;               /*  6  */
-
-       if (adapter->flags & FLAG_TIPG_MEDIUM_FOR_80003ESLAN)
-               ipgr2 = DEFAULT_80003ES2LAN_TIPG_IPGR2; /*  7  */
-
-       tipg |= ipgr1 << E1000_TIPG_IPGR1_SHIFT;
-       tipg |= ipgr2 << E1000_TIPG_IPGR2_SHIFT;
-       ew32(TIPG, tipg);
-
-       /* Program the Transmit Control Register */
-       tctl = er32(TCTL);
-       tctl &= ~E1000_TCTL_CT;
-       tctl |= E1000_TCTL_PSP | E1000_TCTL_RTLC |
-               (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT);
-
-       if (adapter->flags & FLAG_TARC_SPEED_MODE_BIT) {
-               tarc = er32(TARC(0));
-               /*
-                * set the speed mode bit, we'll clear it if we're not at
-                * gigabit link later
-                */
-#define SPEED_MODE_BIT (1 << 21)
-               tarc |= SPEED_MODE_BIT;
-               ew32(TARC(0), tarc);
-       }
-
-       /* errata: program both queues to unweighted RR */
-       if (adapter->flags & FLAG_TARC_SET_BIT_ZERO) {
-               tarc = er32(TARC(0));
-               tarc |= 1;
-               ew32(TARC(0), tarc);
-               tarc = er32(TARC(1));
-               tarc |= 1;
-               ew32(TARC(1), tarc);
-       }
-
-       /* Setup Transmit Descriptor Settings for eop descriptor */
-       adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS;
-
-       /* enable Report Status bit */
-       adapter->txd_cmd |= E1000_TXD_CMD_RS;
-
-       /*
-        * enable transmits in the hardware, need to do this
-        * after setting TARC(0)
-        */
-       tctl |= E1000_TCTL_EN;
-       ew32(TCTL, tctl);
-       e1e_flush();
-
-       e1000e_config_collision_dist(hw);
-}
-
-/* RX support routines */
-
-static void e1000e_free_rx_resources ( struct e1000_adapter *adapter )
-{
-       int i;
-
-       DBGP ( "e1000_free_rx_resources\n" );
-
-       free_dma ( adapter->rx_base, adapter->rx_ring_size );
-
-       for ( i = 0; i < NUM_RX_DESC; i++ ) {
-               free_iob ( adapter->rx_iobuf[i] );
-       }
-}
-
-/**
- * e1000_refill_rx_ring - allocate Rx io_buffers
- *
- * @v adapter  e1000 private structure
- *
- * @ret rc      Returns 0 on success, negative on failure
- **/
-static int e1000e_refill_rx_ring ( struct e1000_adapter *adapter )
-{
-       int i, rx_curr;
-       int rc = 0;
-       struct e1000_rx_desc *rx_curr_desc;
-       struct e1000_hw *hw = &adapter->hw;
-       struct io_buffer *iob;
-
-       DBGP ("e1000_refill_rx_ring\n");
-
-       for ( i = 0; i < NUM_RX_DESC; i++ ) {
-               rx_curr = ( ( adapter->rx_curr + i ) % NUM_RX_DESC );
-               rx_curr_desc = adapter->rx_base + rx_curr;
-
-               if ( rx_curr_desc->status & E1000_RXD_STAT_DD )
-                       continue;
-
-               if ( adapter->rx_iobuf[rx_curr] != NULL )
-                       continue;
-
-               DBG2 ( "Refilling rx desc %d\n", rx_curr );
-
-               iob = alloc_iob ( MAXIMUM_ETHERNET_VLAN_SIZE );
-               adapter->rx_iobuf[rx_curr] = iob;
-
-               if ( ! iob ) {
-                       DBG ( "alloc_iob failed\n" );
-                       rc = -ENOMEM;
-                       break;
-               } else {
-                       rx_curr_desc->buffer_addr = virt_to_bus ( iob->data );
-
-                       E1000_WRITE_REG ( hw, E1000_RDT(0), rx_curr );
-               }
-       }
-       return rc;
-}
-
-/**
- * e1000_setup_rx_resources - allocate Rx resources (Descriptors)
- *
- * @v adapter  e1000 private structure
- *
- * @ret rc      Returns 0 on success, negative on failure
- **/
-static int e1000e_setup_rx_resources ( struct e1000_adapter *adapter )
-{
-       int i, rc = 0;
-
-       DBGP ( "e1000_setup_rx_resources\n" );
-
-       /* Allocate receive descriptor ring memory.
-          It must not cross a 64K boundary because of hardware errata
-        */
-
-       adapter->rx_base =
-               malloc_dma ( adapter->rx_ring_size, adapter->rx_ring_size );
-
-       if ( ! adapter->rx_base ) {
-               return -ENOMEM;
-       }
-       memset ( adapter->rx_base, 0, adapter->rx_ring_size );
-
-       for ( i = 0; i < NUM_RX_DESC; i++ ) {
-               /* let e1000_refill_rx_ring() io_buffer allocations */
-               adapter->rx_iobuf[i] = NULL;
-       }
-
-       /* allocate io_buffers */
-       rc = e1000e_refill_rx_ring ( adapter );
-       if ( rc < 0 )
-               e1000e_free_rx_resources ( adapter );
-
-       return rc;
-}
-
-/**
- * e1000_configure_rx - Configure 8254x Receive Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Rx unit of the MAC after a reset.
- **/
-static void e1000e_configure_rx ( struct e1000_adapter *adapter )
-{
-       struct e1000_hw *hw = &adapter->hw;
-       uint32_t rctl;
-
-       DBGP ( "e1000_configure_rx\n" );
-
-       /* disable receives while setting up the descriptors */
-       rctl = E1000_READ_REG ( hw, E1000_RCTL );
-       E1000_WRITE_REG ( hw, E1000_RCTL, rctl & ~E1000_RCTL_EN );
-       e1e_flush();
-       mdelay(10);
-
-       adapter->rx_curr = 0;
-
-       /* Setup the HW Rx Head and Tail Descriptor Pointers and
-        * the Base and Length of the Rx Descriptor Ring */
-
-       E1000_WRITE_REG ( hw, E1000_RDBAL(0), virt_to_bus ( adapter->rx_base ) );
-       E1000_WRITE_REG ( hw, E1000_RDBAH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_RDLEN(0), adapter->rx_ring_size );
-
-       E1000_WRITE_REG ( hw, E1000_RDH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_RDT(0), NUM_RX_DESC - 1 );
-
-       /* Enable Receives */
-       rctl |=  E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
-                E1000_RCTL_MPE | E1000_RCTL_SECRC;
-       E1000_WRITE_REG ( hw, E1000_RCTL, rctl );
-       e1e_flush();
-
-       DBG ( "E1000_RDBAL(0): %#08x\n",  E1000_READ_REG ( hw, E1000_RDBAL(0) ) );
-       DBG ( "E1000_RDLEN(0): %d\n",     E1000_READ_REG ( hw, E1000_RDLEN(0) ) );
-       DBG ( "E1000_RCTL:  %#08x\n",  E1000_READ_REG ( hw, E1000_RCTL ) );
-}
-
-/**
- * e1000_process_rx_packets - process received packets
- *
- * @v netdev   network interface device structure
- **/
-static void e1000e_process_rx_packets ( struct net_device *netdev )
-{
-       struct e1000_adapter *adapter = netdev_priv ( netdev );
-       uint32_t i;
-       uint32_t rx_status;
-       uint32_t rx_len;
-       uint32_t rx_err;
-       struct e1000_rx_desc *rx_curr_desc;
-
-       /* Process received packets
-        */
-       while ( 1 ) {
-
-               i = adapter->rx_curr;
-
-               rx_curr_desc = ( void * )  ( adapter->rx_base ) +
-                                 ( i * sizeof ( *adapter->rx_base ) );
-               rx_status = rx_curr_desc->status;
-
-               DBG2 ( "Before DD Check RX_status: %#08x\n", rx_status );
-
-               if ( ! ( rx_status & E1000_RXD_STAT_DD ) )
-                       break;
-
-               if ( adapter->rx_iobuf[i] == NULL )
-                       break;
-
-               DBG ( "E1000_RCTL = %#08x\n", E1000_READ_REG ( &adapter->hw, E1000_RCTL ) );
-
-               rx_len = rx_curr_desc->length;
-
-               DBG ( "Received packet, rx_curr: %d  rx_status: %#08x  rx_len: %d\n",
-                     i, rx_status, rx_len );
-
-               rx_err = rx_curr_desc->errors;
-
-               iob_put ( adapter->rx_iobuf[i], rx_len );
-
-               if ( rx_err & E1000_RXD_ERR_FRAME_ERR_MASK ) {
-
-                       netdev_rx_err ( netdev, adapter->rx_iobuf[i], -EINVAL );
-                       DBG ( "e1000_poll: Corrupted packet received!"
-                             " rx_err: %#08x\n", rx_err );
-               } else  {
-                       /* Add this packet to the receive queue. */
-                       netdev_rx ( netdev, adapter->rx_iobuf[i] );
-               }
-               adapter->rx_iobuf[i] = NULL;
-
-               memset ( rx_curr_desc, 0, sizeof ( *rx_curr_desc ) );
-
-               adapter->rx_curr = ( adapter->rx_curr + 1 ) % NUM_RX_DESC;
-       }
-}
-
-/** Functions that implement the iPXE driver API **/
-
-/**
- * e1000_close - Disables a network interface
- *
- * @v netdev   network interface device structure
- *
- **/
-static void e1000e_close ( struct net_device *netdev )
-{
-       struct e1000_adapter *adapter = netdev_priv ( netdev );
-       struct e1000_hw *hw = &adapter->hw;
-       uint32_t rctl;
-
-       DBGP ( "e1000_close\n" );
-
-       /* Disable and acknowledge interrupts */
-       e1000e_irq_disable ( adapter );
-       E1000_READ_REG ( hw, E1000_ICR );
-
-       /* disable receives */
-       rctl = E1000_READ_REG ( hw, E1000_RCTL );
-       E1000_WRITE_REG ( hw, E1000_RCTL, rctl & ~E1000_RCTL_EN );
-       e1e_flush();
-
-       e1000e_reset ( adapter );
-
-       e1000e_free_tx_resources ( adapter );
-       e1000e_free_rx_resources ( adapter );
-}
-
-/**
- * e1000_transmit - Transmit a packet
- *
- * @v netdev   Network device
- * @v iobuf    I/O buffer
- *
- * @ret rc      Returns 0 on success, negative on failure
- */
-static int e1000e_transmit ( struct net_device *netdev, struct io_buffer *iobuf )
-{
-       struct e1000_adapter *adapter = netdev_priv( netdev );
-       struct e1000_hw *hw = &adapter->hw;
-       uint32_t tx_curr = adapter->tx_tail;
-       struct e1000_tx_desc *tx_curr_desc;
-
-       DBGP ("e1000_transmit\n");
-
-       if ( adapter->tx_fill_ctr == NUM_TX_DESC ) {
-               DBG ("TX overflow\n");
-               return -ENOBUFS;
-       }
-
-       /* Save pointer to iobuf we have been given to transmit,
-          netdev_tx_complete() will need it later
-        */
-       adapter->tx_iobuf[tx_curr] = iobuf;
-
-       tx_curr_desc = ( void * ) ( adapter->tx_base ) +
-                      ( tx_curr * sizeof ( *adapter->tx_base ) );
-
-       DBG ( "tx_curr_desc = %#08lx\n", virt_to_bus ( tx_curr_desc ) );
-       DBG ( "tx_curr_desc + 16 = %#08lx\n", virt_to_bus ( tx_curr_desc ) + 16 );
-       DBG ( "iobuf->data = %#08lx\n", virt_to_bus ( iobuf->data ) );
-
-       /* Add the packet to TX ring
-        */
-       tx_curr_desc->buffer_addr = virt_to_bus ( iobuf->data );
-       tx_curr_desc->upper.data = 0;
-       tx_curr_desc->lower.data = adapter->txd_cmd | iob_len ( iobuf );
-
-       DBG ( "TX fill: %d tx_curr: %d addr: %#08lx len: %zd\n", adapter->tx_fill_ctr,
-             tx_curr, virt_to_bus ( iobuf->data ), iob_len ( iobuf ) );
-
-       /* Point to next free descriptor */
-       adapter->tx_tail = ( adapter->tx_tail + 1 ) % NUM_TX_DESC;
-       adapter->tx_fill_ctr++;
-
-       /* Write new tail to NIC, making packet available for transmit
-        */
-       E1000_WRITE_REG ( hw, E1000_TDT(0), adapter->tx_tail );
-       e1e_flush();
-
-       return 0;
-}
-
-/**
- * e1000_poll - Poll for received packets
- *
- * @v netdev   Network device
- */
-static void e1000e_poll ( struct net_device *netdev )
-{
-       struct e1000_adapter *adapter = netdev_priv( netdev );
-       struct e1000_hw *hw = &adapter->hw;
-
-       uint32_t icr;
-
-       DBGP ( "e1000_poll\n" );
-
-       /* Acknowledge interrupts */
-       icr = E1000_READ_REG ( hw, E1000_ICR );
-       if ( ! icr )
-               return;
-
-       DBG ( "e1000_poll: intr_status = %#08x\n", icr );
-
-       e1000e_process_tx_packets ( netdev );
-
-       e1000e_process_rx_packets ( netdev );
-
-       e1000e_refill_rx_ring(adapter);
-}
-
-/**
- * e1000_irq - enable or Disable interrupts
- *
- * @v adapter  e1000 adapter
- * @v action   requested interrupt action
- **/
-static void e1000e_irq ( struct net_device *netdev, int enable )
-{
-       struct e1000_adapter *adapter = netdev_priv ( netdev );
-
-       DBGP ( "e1000_irq\n" );
-
-       if ( enable ) {
-               e1000e_irq_enable ( adapter );
-       } else {
-               e1000e_irq_disable ( adapter );
-       }
-}
-
-static struct net_device_operations e1000e_operations;
-
-/**
- * e1000_probe - Initial configuration of e1000 NIC
- *
- * @v pci      PCI device
- * @v id       PCI IDs
- *
- * @ret rc     Return status code
- **/
-int e1000e_probe ( struct pci_device *pdev )
-{
-       int i, err;
-       struct net_device *netdev;
-       struct e1000_adapter *adapter;
-       unsigned long mmio_start, mmio_len;
-       unsigned long flash_start, flash_len;
-       struct e1000_hw *hw;
-       const struct e1000_info *ei = e1000_info_tbl[pdev->id->driver_data];
-
-       DBGP ( "e1000_probe\n" );
-
-       err = -ENOMEM;
-
-       /* Allocate net device ( also allocates memory for netdev->priv
-          and makes netdev-priv point to it ) */
-       netdev = alloc_etherdev ( sizeof ( struct e1000_adapter ) );
-       if ( ! netdev ) {
-                DBG ( "err_alloc_etherdev\n" );
-               goto err_alloc_etherdev;
-        }
-
-       /* Associate e1000-specific network operations operations with
-        * generic network device layer */
-       netdev_init ( netdev, &e1000e_operations );
-
-       /* Associate this network device with given PCI device */
-       pci_set_drvdata ( pdev, netdev );
-       netdev->dev = &pdev->dev;
-
-       /* Initialize driver private storage */
-       adapter = netdev_priv ( netdev );
-       memset ( adapter, 0, ( sizeof ( *adapter ) ) );
-
-       adapter->pdev       = pdev;
-
-       adapter->ioaddr     = pdev->ioaddr;
-       adapter->hw.io_base = pdev->ioaddr;
-
-       hw                  = &adapter->hw;
-       hw->device_id       = pdev->device;
-
-       adapter->irqno      = pdev->irq;
-       adapter->netdev     = netdev;
-       adapter->hw.back    = adapter;
-
-       adapter->ei         = ei;
-       adapter->pba        = ei->pba;
-       adapter->flags      = ei->flags;
-       adapter->flags2     = ei->flags2;
-
-       adapter->hw.adapter  = adapter;
-       adapter->hw.mac.type = ei->mac;
-       adapter->max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN;
-
-       adapter->tx_ring_size = sizeof ( *adapter->tx_base ) * NUM_TX_DESC;
-       adapter->rx_ring_size = sizeof ( *adapter->rx_base ) * NUM_RX_DESC;
-
-       /* Fix up PCI device */
-       adjust_pci_device ( pdev );
-
-       err = -EIO;
-
-       mmio_start = pci_bar_start ( pdev, PCI_BASE_ADDRESS_0 );
-       mmio_len   = pci_bar_size  ( pdev, PCI_BASE_ADDRESS_0 );
-
-       DBG ( "mmio_start: %#08lx\n", mmio_start );
-       DBG ( "mmio_len: %#08lx\n", mmio_len );
-
-       adapter->hw.hw_addr = ioremap ( mmio_start, mmio_len );
-       DBG ( "adapter->hw.hw_addr: %p\n", adapter->hw.hw_addr );
-
-       if ( ! adapter->hw.hw_addr ) {
-                DBG ( "err_ioremap\n" );
-               goto err_ioremap;
-        }
-
-       /* Flash BAR mapping depends on mac_type */
-       if ( ( adapter->flags & FLAG_HAS_FLASH) && ( pdev->ioaddr ) ) {
-               flash_start = pci_bar_start ( pdev, PCI_BASE_ADDRESS_1 );
-               flash_len = pci_bar_size ( pdev, PCI_BASE_ADDRESS_1 );
-               adapter->hw.flash_address = ioremap ( flash_start, flash_len );
-               if ( ! adapter->hw.flash_address ) {
-                        DBG ( "err_flashmap\n" );
-                       goto err_flashmap;
-               }
-       }
-
-       /* setup adapter struct */
-       err = e1000e_sw_init ( adapter );
-       if (err) {
-                DBG ( "err_sw_init\n" );
-               goto err_sw_init;
-        }
-
-       if (ei->get_variants) {
-               err = ei->get_variants(adapter);
-               if (err) {
-                        DBG ( "err_hw_initr\n" );
-                       goto err_hw_init;
-                }
-       }
-
-       /* Copper options */
-       if (adapter->hw.phy.media_type == e1000_media_type_copper) {
-               adapter->hw.phy.mdix = AUTO_ALL_MODES;
-               adapter->hw.phy.disable_polarity_correction = 0;
-               adapter->hw.phy.ms_type = e1000_ms_hw_default;
-       }
-
-       DBG ( "adapter->hw.mac.type: %#08x\n", adapter->hw.mac.type );
-
-       /* Force auto-negotiation */
-       adapter->hw.mac.autoneg = 1;
-       adapter->fc_autoneg = 1;
-       adapter->hw.phy.autoneg_wait_to_complete = true;
-       adapter->hw.mac.adaptive_ifs = true;
-       adapter->hw.fc.requested_mode = e1000_fc_default;
-       adapter->hw.fc.current_mode = e1000_fc_default;
-
-       /*
-        * before reading the NVM, reset the controller to
-        * put the device in a known good starting state
-        */
-       adapter->hw.mac.ops.reset_hw(&adapter->hw);
-
-       /*
-        * systems with ASPM and others may see the checksum fail on the first
-        * attempt. Let's give it a few tries
-        */
-       for (i = 0;; i++) {
-               if (e1000e_validate_nvm_checksum(&adapter->hw) >= 0)
-                       break;
-               if (i == 2) {
-                       DBG("The NVM Checksum Is Not Valid\n");
-                       err = -EIO;
-                       goto err_eeprom;
-               }
-       }
-
-       /* copy the MAC address out of the EEPROM */
-       if ( e1000e_read_mac_addr ( &adapter->hw ) )
-               DBG ( "EEPROM Read Error\n" );
-
-       memcpy ( netdev->hw_addr, adapter->hw.mac.perm_addr, ETH_ALEN );
-
-       /* reset the hardware with the new settings */
-       e1000e_reset ( adapter );
-
-       if ( ( err = register_netdev ( netdev ) ) != 0) {
-                DBG ( "err_register\n" );
-               goto err_register;
-        }
-
-       /* Mark as link up; we don't yet handle link state */
-       netdev_link_up ( netdev );
-
-       for (i = 0; i < 6; i++)
-               DBG ("%02x%s", netdev->ll_addr[i], i == 5 ? "\n" : ":");
-
-       DBG ( "e1000e_probe succeeded!\n" );
-
-       /* No errors, return success */
-       return 0;
-
-/* Error return paths */
-err_register:
-err_hw_init:
-err_eeprom:
-err_flashmap:
-       if (!e1000e_check_reset_block(&adapter->hw))
-               e1000e_phy_hw_reset(&adapter->hw);
-       if (adapter->hw.flash_address)
-               iounmap(adapter->hw.flash_address);
-err_sw_init:
-       iounmap ( adapter->hw.hw_addr );
-err_ioremap:
-       netdev_put ( netdev );
-err_alloc_etherdev:
-       return err;
-}
-
-/**
- * e1000e_remove - Device Removal Routine
- *
- * @v pdev PCI device information struct
- *
- **/
-void e1000e_remove ( struct pci_device *pdev )
-{
-       struct net_device *netdev = pci_get_drvdata ( pdev );
-       struct e1000_adapter *adapter = netdev_priv ( netdev );
-
-       DBGP ( "e1000e_remove\n" );
-
-       if ( adapter->hw.flash_address )
-               iounmap ( adapter->hw.flash_address );
-       if  ( adapter->hw.hw_addr )
-               iounmap ( adapter->hw.hw_addr );
-
-       unregister_netdev ( netdev );
-       e1000e_reset  ( adapter );
-       netdev_nullify ( netdev );
-       netdev_put ( netdev );
-}
-
-/**
- * e1000e_open - Called when a network interface is made active
- *
- * @v netdev   network interface device structure
- * @ret rc     Return status code, 0 on success, negative value on failure
- *
- **/
-static int e1000e_open ( struct net_device *netdev )
-{
-       struct e1000_adapter *adapter = netdev_priv(netdev);
-       int err;
-
-       DBGP ( "e1000e_open\n" );
-
-       /* allocate transmit descriptors */
-       err = e1000e_setup_tx_resources ( adapter );
-       if ( err ) {
-               DBG ( "Error setting up TX resources!\n" );
-               goto err_setup_tx;
-       }
-
-       /* allocate receive descriptors */
-       err = e1000e_setup_rx_resources ( adapter );
-       if ( err ) {
-               DBG ( "Error setting up RX resources!\n" );
-               goto err_setup_rx;
-       }
-
-       e1000e_configure_tx ( adapter );
-
-       e1000e_configure_rx ( adapter );
-
-       DBG ( "E1000_RXDCTL(0): %#08x\n",  E1000_READ_REG ( &adapter->hw, E1000_RXDCTL(0) ) );
-
-       return 0;
-
-err_setup_rx:
-        DBG ( "err_setup_rx\n" );
-       e1000e_free_tx_resources ( adapter );
-err_setup_tx:
-        DBG ( "err_setup_tx\n" );
-       e1000e_reset ( adapter );
-
-       return err;
-}
-
-/** e1000e net device operations */
-static struct net_device_operations e1000e_operations = {
-       .open           = e1000e_open,
-       .close          = e1000e_close,
-       .transmit       = e1000e_transmit,
-       .poll           = e1000e_poll,
-       .irq            = e1000e_irq,
-};
diff --git a/src/drivers/net/e1000e/e1000e_manage.c b/src/drivers/net/e1000e/e1000e_manage.c
deleted file mode 100644 (file)
index e093536..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#if 0
-
-#include "e1000e.h"
-
-static u8 e1000e_calculate_checksum(u8 *buffer, u32 length);
-
-/**
- *  e1000e_calculate_checksum - Calculate checksum for buffer
- *  @buffer: pointer to EEPROM
- *  @length: size of EEPROM to calculate a checksum for
- *
- *  Calculates the checksum for some buffer on a specified length.  The
- *  checksum calculated is returned.
- **/
-static u8 e1000e_calculate_checksum(u8 *buffer, u32 length)
-{
-       u32 i;
-       u8  sum = 0;
-
-       if (!buffer)
-               return 0;
-       for (i = 0; i < length; i++)
-               sum += buffer[i];
-
-       return (u8) (0 - sum);
-}
-
-/**
- *  e1000e_mng_enable_host_if_generic - Checks host interface is enabled
- *  @hw: pointer to the HW structure
- *
- *  Returns E1000_success upon success, else E1000_ERR_HOST_INTERFACE_COMMAND
- *
- *  This function checks whether the HOST IF is enabled for command operation
- *  and also checks whether the previous command is completed.  It busy waits
- *  in case of previous command is not completed.
- **/
-s32 e1000e_mng_enable_host_if_generic(struct e1000_hw *hw)
-{
-       u32 hicr;
-       s32 ret_val = E1000_SUCCESS;
-       u8  i;
-
-       /* Check that the host interface is enabled. */
-       hicr = er32(HICR);
-       if ((hicr & E1000_HICR_EN) == 0) {
-               e_dbg("E1000_HOST_EN bit disabled.\n");
-               ret_val = -E1000_ERR_HOST_INTERFACE_COMMAND;
-               goto out;
-       }
-       /* check the previous command is completed */
-       for (i = 0; i < E1000_MNG_DHCP_COMMAND_TIMEOUT; i++) {
-               hicr = er32(HICR);
-               if (!(hicr & E1000_HICR_C))
-                       break;
-               mdelay(1);
-       }
-
-       if (i == E1000_MNG_DHCP_COMMAND_TIMEOUT) {
-               e_dbg("Previous command timeout failed .\n");
-               ret_val = -E1000_ERR_HOST_INTERFACE_COMMAND;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_check_mng_mode_generic - Generic check management mode
- *  @hw: pointer to the HW structure
- *
- *  Reads the firmware semaphore register and returns true (>0) if
- *  manageability is enabled, else false (0).
- **/
-bool e1000e_check_mng_mode_generic(struct e1000_hw *hw)
-{
-       u32 fwsm;
-
-       fwsm = er32(FWSM);
-       return (fwsm & E1000_FWSM_MODE_MASK) ==
-               (E1000_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT);
-}
-
-/**
- *  e1000e_enable_tx_pkt_filtering - Enable packet filtering on TX
- *  @hw: pointer to the HW structure
- *
- *  Enables packet filtering on transmit packets if manageability is enabled
- *  and host interface is enabled.
- **/
-bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw)
-{
-       struct e1000_host_mng_dhcp_cookie *hdr = &hw->mng_cookie;
-       u32 *buffer = (u32 *)&hw->mng_cookie;
-       u32 offset;
-       s32 ret_val, hdr_csum, csum;
-       u8 i, len;
-       bool tx_filter = true;
-
-       /* No manageability, no filtering */
-       if (!hw->mac.ops.check_mng_mode(hw)) {
-               tx_filter = false;
-               goto out;
-       }
-
-       /*
-        * If we can't read from the host interface for whatever
-        * reason, disable filtering.
-        */
-       ret_val = hw->mac.ops.mng_enable_host_if(hw);
-       if (ret_val != E1000_SUCCESS) {
-               tx_filter = false;
-               goto out;
-       }
-
-       /* Read in the header.  Length and offset are in dwords. */
-       len    = E1000_MNG_DHCP_COOKIE_LENGTH >> 2;
-       offset = E1000_MNG_DHCP_COOKIE_OFFSET >> 2;
-       for (i = 0; i < len; i++) {
-               *(buffer + i) = E1000_READ_REG_ARRAY_DWORD(hw,
-                                                          E1000_HOST_IF,
-                                                          offset + i);
-       }
-       hdr_csum = hdr->checksum;
-       hdr->checksum = 0;
-       csum = e1000e_calculate_checksum((u8 *)hdr,
-                                       E1000_MNG_DHCP_COOKIE_LENGTH);
-       /*
-        * If either the checksums or signature don't match, then
-        * the cookie area isn't considered valid, in which case we
-        * take the safe route of assuming Tx filtering is enabled.
-        */
-       if (hdr_csum != csum)
-               goto out;
-       if (hdr->signature != E1000_IAMT_SIGNATURE)
-               goto out;
-
-       /* Cookie area is valid, make the final check for filtering. */
-       if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING))
-               tx_filter = false;
-
-out:
-       hw->mac.tx_pkt_filtering = tx_filter;
-       return tx_filter;
-}
-
-/**
- *  e1000e_mng_write_dhcp_info - Writes DHCP info to host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface
- *  @length: size of the buffer
- *
- *  Writes the DHCP information to the host interface.
- **/
-s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer,
-                                      u16 length)
-{
-       struct e1000_host_mng_command_header hdr;
-       s32 ret_val;
-       u32 hicr;
-
-       hdr.command_id = E1000_MNG_DHCP_TX_PAYLOAD_CMD;
-       hdr.command_length = length;
-       hdr.reserved1 = 0;
-       hdr.reserved2 = 0;
-       hdr.checksum = 0;
-
-       /* Enable the host interface */
-       ret_val = hw->mac.ops.mng_enable_host_if(hw);
-       if (ret_val)
-               goto out;
-
-       /* Populate the host interface with the contents of "buffer". */
-       ret_val = hw->mac.ops.mng_host_if_write(hw, buffer, length,
-                                         sizeof(hdr), &(hdr.checksum));
-       if (ret_val)
-               goto out;
-
-       /* Write the manageability command header */
-       ret_val = hw->mac.ops.mng_write_cmd_header(hw, &hdr);
-       if (ret_val)
-               goto out;
-
-       /* Tell the ARC a new command is pending. */
-       hicr = er32(HICR);
-       ew32(HICR, hicr | E1000_HICR_C);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_mng_write_cmd_header_generic - Writes manageability command header
- *  @hw: pointer to the HW structure
- *  @hdr: pointer to the host interface command header
- *
- *  Writes the command header after does the checksum calculation.
- **/
-s32 e1000e_mng_write_cmd_header_generic(struct e1000_hw *hw,
-                                    struct e1000_host_mng_command_header *hdr)
-{
-       u16 i, length = sizeof(struct e1000_host_mng_command_header);
-
-       /* Write the whole command header structure with new checksum. */
-
-       hdr->checksum = e1000e_calculate_checksum((u8 *)hdr, length);
-
-       length >>= 2;
-       /* Write the relevant command block into the ram area. */
-       for (i = 0; i < length; i++) {
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, i,
-                                           *((u32 *) hdr + i));
-               e1e_flush();
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_mng_host_if_write_generic - Write to the manageability host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface buffer
- *  @length: size of the buffer
- *  @offset: location in the buffer to write to
- *  @sum: sum of the data (not checksum)
- *
- *  This function writes the buffer content at the offset given on the host if.
- *  It also does alignment considerations to do the writes in most efficient
- *  way.  Also fills up the sum of the buffer in *buffer parameter.
- **/
-s32 e1000e_mng_host_if_write_generic(struct e1000_hw *hw, u8 *buffer,
-                                    u16 length, u16 offset, u8 *sum)
-{
-       u8 *tmp;
-       u8 *bufptr = buffer;
-       u32 data = 0;
-       s32 ret_val = E1000_SUCCESS;
-       u16 remaining, i, j, prev_bytes;
-
-       /* sum = only sum of the data and it is not checksum */
-
-       if (length == 0 || offset + length > E1000_HI_MAX_MNG_DATA_LENGTH) {
-               ret_val = -E1000_ERR_PARAM;
-               goto out;
-       }
-
-       tmp = (u8 *)&data;
-       prev_bytes = offset & 0x3;
-       offset >>= 2;
-
-       if (prev_bytes) {
-               data = E1000_READ_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset);
-               for (j = prev_bytes; j < sizeof(u32); j++) {
-                       *(tmp + j) = *bufptr++;
-                       *sum += *(tmp + j);
-               }
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset, data);
-               length -= j - prev_bytes;
-               offset++;
-       }
-
-       remaining = length & 0x3;
-       length -= remaining;
-
-       /* Calculate length in DWORDs */
-       length >>= 2;
-
-       /*
-        * The device driver writes the relevant command block into the
-        * ram area.
-        */
-       for (i = 0; i < length; i++) {
-               for (j = 0; j < sizeof(u32); j++) {
-                       *(tmp + j) = *bufptr++;
-                       *sum += *(tmp + j);
-               }
-
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset + i,
-                                           data);
-       }
-       if (remaining) {
-               for (j = 0; j < sizeof(u32); j++) {
-                       if (j < remaining)
-                               *(tmp + j) = *bufptr++;
-                       else
-                               *(tmp + j) = 0;
-
-                       *sum += *(tmp + j);
-               }
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset + i, data);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_enable_mng_pass_thru - Enable processing of ARP's
- *  @hw: pointer to the HW structure
- *
- *  Verifies the hardware needs to allow ARPs to be processed by the host.
- **/
-bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
-{
-       u32 manc;
-       u32 fwsm, factps;
-       bool ret_val = false;
-
-       if (!hw->mac.asf_firmware_present)
-               goto out;
-
-       manc = er32(MANC);
-
-       if (!(manc & E1000_MANC_RCV_TCO_EN) ||
-           !(manc & E1000_MANC_EN_MAC_ADDR_FILTER))
-               goto out;
-
-       if (hw->mac.arc_subsystem_valid) {
-               fwsm = er32(FWSM);
-               factps = er32(FACTPS);
-
-               if (!(factps & E1000_FACTPS_MNGCG) &&
-                   ((fwsm & E1000_FWSM_MODE_MASK) ==
-                    (e1000_mng_mode_pt << E1000_FWSM_MODE_SHIFT))) {
-                       ret_val = true;
-                       goto out;
-               }
-       } else {
-               if ((manc & E1000_MANC_SMBUS_EN) &&
-                   !(manc & E1000_MANC_ASF_EN)) {
-                       ret_val = true;
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-#endif
-
diff --git a/src/drivers/net/e1000e/e1000e_manage.h b/src/drivers/net/e1000e/e1000e_manage.h
deleted file mode 100644 (file)
index f136aee..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000E_MANAGE_H_
-#define _E1000E_MANAGE_H_
-
-bool e1000e_check_mng_mode_generic(struct e1000_hw *hw);
-bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw);
-s32  e1000e_mng_enable_host_if_generic(struct e1000_hw *hw);
-s32  e1000e_mng_host_if_write_generic(struct e1000_hw *hw, u8 *buffer,
-                                     u16 length, u16 offset, u8 *sum);
-s32  e1000e_mng_write_cmd_header_generic(struct e1000_hw *hw,
-                                    struct e1000_host_mng_command_header *hdr);
-#if 0
-s32  e1000e_mng_write_dhcp_info(struct e1000_hw *hw,
-                                       u8 *buffer, u16 length);
-#endif
-bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw);
-
-enum e1000_mng_mode {
-       e1000_mng_mode_none = 0,
-       e1000_mng_mode_asf,
-       e1000_mng_mode_pt,
-       e1000_mng_mode_ipmi,
-       e1000_mng_mode_host_if_only
-};
-
-#define E1000_FACTPS_MNGCG    0x20000000
-
-#define E1000_FWSM_MODE_MASK  0xE
-#define E1000_FWSM_MODE_SHIFT 1
-
-#define E1000_MNG_IAMT_MODE                  0x3
-#define E1000_MNG_DHCP_COOKIE_LENGTH         0x10
-#define E1000_MNG_DHCP_COOKIE_OFFSET         0x6F0
-#define E1000_MNG_DHCP_COMMAND_TIMEOUT       10
-#define E1000_MNG_DHCP_TX_PAYLOAD_CMD        64
-#define E1000_MNG_DHCP_COOKIE_STATUS_PARSING 0x1
-#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN    0x2
-
-#define E1000_VFTA_ENTRY_SHIFT               5
-#define E1000_VFTA_ENTRY_MASK                0x7F
-#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK      0x1F
-
-#define E1000_HI_MAX_BLOCK_BYTE_LENGTH       1792 /* Num of bytes in range */
-#define E1000_HI_MAX_BLOCK_DWORD_LENGTH      448 /* Num of dwords in range */
-#define E1000_HI_COMMAND_TIMEOUT             500 /* Process HI command limit */
-
-#define E1000_HICR_EN              0x01  /* Enable bit - RO */
-/* Driver sets this bit when done to put command in RAM */
-#define E1000_HICR_C               0x02
-#define E1000_HICR_SV              0x04  /* Status Validity */
-#define E1000_HICR_FW_RESET_ENABLE 0x40
-#define E1000_HICR_FW_RESET        0x80
-
-/* Intel(R) Active Management Technology signature */
-#define E1000_IAMT_SIGNATURE  0x544D4149
-
-#endif
diff --git a/src/drivers/net/e1000e/e1000e_nvm.c b/src/drivers/net/e1000e/e1000e_nvm.c
deleted file mode 100644 (file)
index f49d421..0000000
+++ /dev/null
@@ -1,596 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include "e1000e.h"
-
-static void e1000e_stop_nvm(struct e1000_hw *hw);
-static void e1000e_reload_nvm(struct e1000_hw *hw);
-
-/**
- *  e1000e_init_nvm_ops_generic - Initialize NVM function pointers
- *  @hw: pointer to the HW structure
- *
- *  Setups up the function pointers to no-op functions
- **/
-void e1000e_init_nvm_ops_generic(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       /* Initialize function pointers */
-       nvm->ops.reload = e1000e_reload_nvm;
-}
-
-/**
- *  e1000e_raise_eec_clk - Raise EEPROM clock
- *  @hw: pointer to the HW structure
- *  @eecd: pointer to the EEPROM
- *
- *  Enable/Raise the EEPROM clock bit.
- **/
-static void e1000e_raise_eec_clk(struct e1000_hw *hw, u32 *eecd)
-{
-       *eecd = *eecd | E1000_EECD_SK;
-       ew32(EECD, *eecd);
-       e1e_flush();
-       udelay(hw->nvm.delay_usec);
-}
-
-/**
- *  e1000e_lower_eec_clk - Lower EEPROM clock
- *  @hw: pointer to the HW structure
- *  @eecd: pointer to the EEPROM
- *
- *  Clear/Lower the EEPROM clock bit.
- **/
-static void e1000e_lower_eec_clk(struct e1000_hw *hw, u32 *eecd)
-{
-       *eecd = *eecd & ~E1000_EECD_SK;
-       ew32(EECD, *eecd);
-       e1e_flush();
-       udelay(hw->nvm.delay_usec);
-}
-
-/**
- *  e1000e_shift_out_eec_bits - Shift data bits our to the EEPROM
- *  @hw: pointer to the HW structure
- *  @data: data to send to the EEPROM
- *  @count: number of bits to shift out
- *
- *  We need to shift 'count' bits out to the EEPROM.  So, the value in the
- *  "data" parameter will be shifted out to the EEPROM one bit at a time.
- *  In order to do this, "data" must be broken down into bits.
- **/
-static void e1000e_shift_out_eec_bits(struct e1000_hw *hw, u16 data, u16 count)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = er32(EECD);
-       u32 mask;
-
-       mask = 0x01 << (count - 1);
-       if (nvm->type == e1000_nvm_eeprom_spi)
-               eecd |= E1000_EECD_DO;
-
-       do {
-               eecd &= ~E1000_EECD_DI;
-
-               if (data & mask)
-                       eecd |= E1000_EECD_DI;
-
-               ew32(EECD, eecd);
-               e1e_flush();
-
-               udelay(nvm->delay_usec);
-
-               e1000e_raise_eec_clk(hw, &eecd);
-               e1000e_lower_eec_clk(hw, &eecd);
-
-               mask >>= 1;
-       } while (mask);
-
-       eecd &= ~E1000_EECD_DI;
-       ew32(EECD, eecd);
-}
-
-/**
- *  e1000e_shift_in_eec_bits - Shift data bits in from the EEPROM
- *  @hw: pointer to the HW structure
- *  @count: number of bits to shift in
- *
- *  In order to read a register from the EEPROM, we need to shift 'count' bits
- *  in from the EEPROM.  Bits are "shifted in" by raising the clock input to
- *  the EEPROM (setting the SK bit), and then reading the value of the data out
- *  "DO" bit.  During this "shifting in" process the data in "DI" bit should
- *  always be clear.
- **/
-static u16 e1000e_shift_in_eec_bits(struct e1000_hw *hw, u16 count)
-{
-       u32 eecd;
-       u32 i;
-       u16 data;
-
-       eecd = er32(EECD);
-       eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);
-       data = 0;
-
-       for (i = 0; i < count; i++) {
-               data <<= 1;
-               e1000e_raise_eec_clk(hw, &eecd);
-
-               eecd = er32(EECD);
-
-               eecd &= ~E1000_EECD_DI;
-               if (eecd & E1000_EECD_DO)
-                       data |= 1;
-
-               e1000e_lower_eec_clk(hw, &eecd);
-       }
-
-       return data;
-}
-
-/**
- *  e1000e_poll_eerd_eewr_done - Poll for EEPROM read/write completion
- *  @hw: pointer to the HW structure
- *  @ee_reg: EEPROM flag for polling
- *
- *  Polls the EEPROM status bit for either read or write completion based
- *  upon the value of 'ee_reg'.
- **/
-s32 e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg)
-{
-       u32 attempts = 100000;
-       u32 i, reg = 0;
-       s32 ret_val = -E1000_ERR_NVM;
-
-       for (i = 0; i < attempts; i++) {
-               if (ee_reg == E1000_NVM_POLL_READ)
-                       reg = er32(EERD);
-               else
-                       reg = er32(EEWR);
-
-               if (reg & E1000_NVM_RW_REG_DONE) {
-                       ret_val = E1000_SUCCESS;
-                       break;
-               }
-
-               udelay(5);
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000e_acquire_nvm - Generic request for access to EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Set the EEPROM access request bit and wait for EEPROM access grant bit.
- *  Return successful if access grant bit set, else clear the request for
- *  EEPROM access and return -E1000_ERR_NVM (-1).
- **/
-s32 e1000e_acquire_nvm(struct e1000_hw *hw)
-{
-       u32 eecd = er32(EECD);
-       s32 timeout = E1000_NVM_GRANT_ATTEMPTS;
-       s32 ret_val = E1000_SUCCESS;
-
-       ew32(EECD, eecd | E1000_EECD_REQ);
-       eecd = er32(EECD);
-       while (timeout) {
-               if (eecd & E1000_EECD_GNT)
-                       break;
-               udelay(5);
-               eecd = er32(EECD);
-               timeout--;
-       }
-
-       if (!timeout) {
-               eecd &= ~E1000_EECD_REQ;
-               ew32(EECD, eecd);
-               e_dbg("Could not acquire NVM grant\n");
-               ret_val = -E1000_ERR_NVM;
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000e_standby_nvm - Return EEPROM to standby state
- *  @hw: pointer to the HW structure
- *
- *  Return the EEPROM to a standby state.
- **/
-static void e1000e_standby_nvm(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = er32(EECD);
-
-       if (nvm->type == e1000_nvm_eeprom_spi) {
-               /* Toggle CS to flush commands */
-               eecd |= E1000_EECD_CS;
-               ew32(EECD, eecd);
-               e1e_flush();
-               udelay(nvm->delay_usec);
-               eecd &= ~E1000_EECD_CS;
-               ew32(EECD, eecd);
-               e1e_flush();
-               udelay(nvm->delay_usec);
-       }
-}
-
-/**
- *  e1000e_stop_nvm - Terminate EEPROM command
- *  @hw: pointer to the HW structure
- *
- *  Terminates the current command by inverting the EEPROM's chip select pin.
- **/
-static void e1000e_stop_nvm(struct e1000_hw *hw)
-{
-       u32 eecd;
-
-       eecd = er32(EECD);
-       if (hw->nvm.type == e1000_nvm_eeprom_spi) {
-               /* Pull CS high */
-               eecd |= E1000_EECD_CS;
-               e1000e_lower_eec_clk(hw, &eecd);
-       }
-}
-
-/**
- *  e1000e_release_nvm - Release exclusive access to EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Stop any current commands to the EEPROM and clear the EEPROM request bit.
- **/
-void e1000e_release_nvm(struct e1000_hw *hw)
-{
-       u32 eecd;
-
-       e1000e_stop_nvm(hw);
-
-       eecd = er32(EECD);
-       eecd &= ~E1000_EECD_REQ;
-       ew32(EECD, eecd);
-}
-
-/**
- *  e1000e_ready_nvm_eeprom - Prepares EEPROM for read/write
- *  @hw: pointer to the HW structure
- *
- *  Setups the EEPROM for reading and writing.
- **/
-static s32 e1000e_ready_nvm_eeprom(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = er32(EECD);
-       s32 ret_val = E1000_SUCCESS;
-       u16 timeout = 0;
-       u8 spi_stat_reg;
-
-       if (nvm->type == e1000_nvm_eeprom_spi) {
-               /* Clear SK and CS */
-               eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-               ew32(EECD, eecd);
-               udelay(1);
-               timeout = NVM_MAX_RETRY_SPI;
-
-               /*
-                * Read "Status Register" repeatedly until the LSB is cleared.
-                * The EEPROM will signal that the command has been completed
-                * by clearing bit 0 of the internal status register.  If it's
-                * not cleared within 'timeout', then error out.
-                */
-               while (timeout) {
-                       e1000e_shift_out_eec_bits(hw, NVM_RDSR_OPCODE_SPI,
-                                                hw->nvm.opcode_bits);
-                       spi_stat_reg = (u8)e1000e_shift_in_eec_bits(hw, 8);
-                       if (!(spi_stat_reg & NVM_STATUS_RDY_SPI))
-                               break;
-
-                       udelay(5);
-                       e1000e_standby_nvm(hw);
-                       timeout--;
-               }
-
-               if (!timeout) {
-                       e_dbg("SPI NVM Status error\n");
-                       ret_val = -E1000_ERR_NVM;
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_nvm_eerd - Reads EEPROM using EERD register
- *  @hw: pointer to the HW structure
- *  @offset: offset of word in the EEPROM to read
- *  @words: number of words to read
- *  @data: word read from the EEPROM
- *
- *  Reads a 16 bit word from the EEPROM using the EERD register.
- **/
-s32 e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 i, eerd = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       /*
-        * A check for invalid values:  offset too large, too many words,
-        * too many words for the offset, and not enough words.
-        */
-       if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-           (words == 0)) {
-               e_dbg("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       for (i = 0; i < words; i++) {
-               eerd = ((offset+i) << E1000_NVM_RW_ADDR_SHIFT) +
-                      E1000_NVM_RW_REG_START;
-
-               ew32(EERD, eerd);
-               ret_val = e1000e_poll_eerd_eewr_done(hw, E1000_NVM_POLL_READ);
-               if (ret_val)
-                       break;
-
-               data[i] = (er32(EERD) >>
-                          E1000_NVM_RW_REG_DATA);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_write_nvm_spi - Write to EEPROM using SPI
- *  @hw: pointer to the HW structure
- *  @offset: offset within the EEPROM to be written to
- *  @words: number of words to write
- *  @data: 16 bit word(s) to be written to the EEPROM
- *
- *  Writes data to EEPROM at offset using SPI interface.
- *
- *  If e1000e_update_nvm_checksum is not called after this function , the
- *  EEPROM will most likely contain an invalid checksum.
- **/
-s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       s32 ret_val;
-       u16 widx = 0;
-
-       /*
-        * A check for invalid values:  offset too large, too many words,
-        * and not enough words.
-        */
-       if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-           (words == 0)) {
-               e_dbg("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       ret_val = nvm->ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       while (widx < words) {
-               u8 write_opcode = NVM_WRITE_OPCODE_SPI;
-
-               ret_val = e1000e_ready_nvm_eeprom(hw);
-               if (ret_val)
-                       goto release;
-
-               e1000e_standby_nvm(hw);
-
-               /* Send the WRITE ENABLE command (8 bit opcode) */
-               e1000e_shift_out_eec_bits(hw, NVM_WREN_OPCODE_SPI,
-                                        nvm->opcode_bits);
-
-               e1000e_standby_nvm(hw);
-
-               /*
-                * Some SPI eeproms use the 8th address bit embedded in the
-                * opcode
-                */
-               if ((nvm->address_bits == 8) && (offset >= 128))
-                       write_opcode |= NVM_A8_OPCODE_SPI;
-
-               /* Send the Write command (8-bit opcode + addr) */
-               e1000e_shift_out_eec_bits(hw, write_opcode, nvm->opcode_bits);
-               e1000e_shift_out_eec_bits(hw, (u16)((offset + widx) * 2),
-                                        nvm->address_bits);
-
-               /* Loop to allow for up to whole page write of eeprom */
-               while (widx < words) {
-                       u16 word_out = data[widx];
-                       word_out = (word_out >> 8) | (word_out << 8);
-                       e1000e_shift_out_eec_bits(hw, word_out, 16);
-                       widx++;
-
-                       if ((((offset + widx) * 2) % nvm->page_size) == 0) {
-                               e1000e_standby_nvm(hw);
-                               break;
-                       }
-               }
-       }
-
-       msleep(10);
-release:
-       nvm->ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_pba_num - Read device part number
- *  @hw: pointer to the HW structure
- *  @pba_num: pointer to device part number
- *
- *  Reads the product board assembly (PBA) number from the EEPROM and stores
- *  the value in pba_num.
- **/
-s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num)
-{
-       s32  ret_val;
-       u16 nvm_data;
-
-       ret_val = e1000e_read_nvm(hw, NVM_PBA_OFFSET_0, 1, &nvm_data);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               goto out;
-       }
-       *pba_num = (u32)(nvm_data << 16);
-
-       ret_val = e1000e_read_nvm(hw, NVM_PBA_OFFSET_1, 1, &nvm_data);
-       if (ret_val) {
-               e_dbg("NVM Read Error\n");
-               goto out;
-       }
-       *pba_num |= nvm_data;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_mac_addr_generic - Read device MAC address
- *  @hw: pointer to the HW structure
- *
- *  Reads the device MAC address from the EEPROM and stores the value.
- *  Since devices with two ports use the same EEPROM, we increment the
- *  last bit in the MAC address for the second port.
- **/
-s32 e1000e_read_mac_addr_generic(struct e1000_hw *hw)
-{
-       u32 rar_high;
-       u32 rar_low;
-       u16 i;
-
-       rar_high = er32(RAH(0));
-       rar_low = er32(RAL(0));
-
-       for (i = 0; i < E1000_RAL_MAC_ADDR_LEN; i++)
-               hw->mac.perm_addr[i] = (u8)(rar_low >> (i*8));
-
-       for (i = 0; i < E1000_RAH_MAC_ADDR_LEN; i++)
-               hw->mac.perm_addr[i+4] = (u8)(rar_high >> (i*8));
-
-       for (i = 0; i < ETH_ADDR_LEN; i++)
-               hw->mac.addr[i] = hw->mac.perm_addr[i];
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_validate_nvm_checksum_generic - Validate EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Calculates the EEPROM checksum by reading/adding each word of the EEPROM
- *  and then verifies that the sum of the EEPROM is equal to 0xBABA.
- **/
-s32 e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 checksum = 0;
-       u16 i, nvm_data;
-
-       for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
-               ret_val = e1000e_read_nvm(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       e_dbg("NVM Read Error\n");
-                       goto out;
-               }
-               checksum += nvm_data;
-       }
-
-       if (checksum != (u16) NVM_SUM) {
-               e_dbg("NVM Checksum Invalid\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_update_nvm_checksum_generic - Update EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Updates the EEPROM checksum by reading/adding each word of the EEPROM
- *  up to the checksum.  Then calculates the EEPROM checksum and writes the
- *  value to the EEPROM.
- **/
-s32 e1000e_update_nvm_checksum_generic(struct e1000_hw *hw)
-{
-       s32  ret_val;
-       u16 checksum = 0;
-       u16 i, nvm_data;
-
-       for (i = 0; i < NVM_CHECKSUM_REG; i++) {
-               ret_val = e1000e_read_nvm(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       e_dbg("NVM Read Error while updating checksum.\n");
-                       goto out;
-               }
-               checksum += nvm_data;
-       }
-       checksum = (u16) NVM_SUM - checksum;
-       ret_val = e1000e_write_nvm(hw, NVM_CHECKSUM_REG, 1, &checksum);
-       if (ret_val)
-               e_dbg("NVM Write Error while updating checksum.\n");
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_reload_nvm - Reloads EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Reloads the EEPROM by setting the "Reinitialize from EEPROM" bit in the
- *  extended control register.
- **/
-static void e1000e_reload_nvm(struct e1000_hw *hw)
-{
-       u32 ctrl_ext;
-
-       udelay(10);
-       ctrl_ext = er32(CTRL_EXT);
-       ctrl_ext |= E1000_CTRL_EXT_EE_RST;
-       ew32(CTRL_EXT, ctrl_ext);
-       e1e_flush();
-}
-
diff --git a/src/drivers/net/e1000e/e1000e_nvm.h b/src/drivers/net/e1000e/e1000e_nvm.h
deleted file mode 100644 (file)
index 1a8e0f3..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000E_NVM_H_
-#define _E1000E_NVM_H_
-
-void e1000e_init_nvm_ops_generic(struct e1000_hw *hw);
-s32  e1000e_acquire_nvm(struct e1000_hw *hw);
-
-s32  e1000e_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);
-s32  e1000e_read_mac_addr_generic(struct e1000_hw *hw);
-s32  e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num);
-s32  e1000e_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words,
-                         u16 *data);
-s32  e1000e_valid_led_default(struct e1000_hw *hw, u16 *data);
-s32  e1000e_validate_nvm_checksum_generic(struct e1000_hw *hw);
-s32  e1000e_write_nvm_eewr(struct e1000_hw *hw, u16 offset,
-                          u16 words, u16 *data);
-s32  e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words,
-                         u16 *data);
-s32  e1000e_update_nvm_checksum_generic(struct e1000_hw *hw);
-void e1000e_release_nvm(struct e1000_hw *hw);
-
-#define E1000_STM_OPCODE  0xDB00
-
-#endif
diff --git a/src/drivers/net/e1000e/e1000e_phy.c b/src/drivers/net/e1000e/e1000e_phy.c
deleted file mode 100644 (file)
index 133109d..0000000
+++ /dev/null
@@ -1,3326 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#include "e1000e.h"
-
-static s32 e1000e_copper_link_autoneg(struct e1000_hw *hw);
-static s32 e1000e_phy_setup_autoneg(struct e1000_hw *hw);
-static u32 e1000e_get_phy_addr_for_bm_page(u32 page, u32 reg);
-static s32 e1000e_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
-                                          u16 *data, bool read);
-static u32 e1000e_get_phy_addr_for_hv_page(u32 page);
-static s32 e1000e_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
-                                          u16 *data, bool read);
-#if 0
-/* Cable length tables */
-static const u16 e1000_m88_cable_length_table[] =
-       { 0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };
-#define M88E1000_CABLE_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_m88_cable_length_table) / \
-                 sizeof(e1000_m88_cable_length_table[0]))
-
-static const u16 e1000_igp_2_cable_length_table[] =
-    { 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21,
-      0, 0, 0, 3, 6, 10, 13, 16, 19, 23, 26, 29, 32, 35, 38, 41,
-      6, 10, 14, 18, 22, 26, 30, 33, 37, 41, 44, 48, 51, 54, 58, 61,
-      21, 26, 31, 35, 40, 44, 49, 53, 57, 61, 65, 68, 72, 75, 79, 82,
-      40, 45, 51, 56, 61, 66, 70, 75, 79, 83, 87, 91, 94, 98, 101, 104,
-      60, 66, 72, 77, 82, 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121,
-      83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,
-      104, 109, 114, 118, 121, 124};
-#define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_igp_2_cable_length_table) / \
-                 sizeof(e1000_igp_2_cable_length_table[0]))
-#endif
-
-/**
- *  e1000e_check_reset_block_generic - Check if PHY reset is blocked
- *  @hw: pointer to the HW structure
- *
- *  Read the PHY management control register and check whether a PHY reset
- *  is blocked.  If a reset is not blocked return E1000_SUCCESS, otherwise
- *  return E1000_BLK_PHY_RESET (12).
- **/
-s32 e1000e_check_reset_block_generic(struct e1000_hw *hw)
-{
-       u32 manc;
-
-       manc = er32(MANC);
-
-       return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ?
-              E1000_BLK_PHY_RESET : E1000_SUCCESS;
-}
-
-/**
- *  e1000e_get_phy_id - Retrieve the PHY ID and revision
- *  @hw: pointer to the HW structure
- *
- *  Reads the PHY registers and stores the PHY ID and possibly the PHY
- *  revision in the hardware structure.
- **/
-s32 e1000e_get_phy_id(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_id;
-       u16 retry_count = 0;
-
-       if (!(phy->ops.read_reg))
-               goto out;
-
-       while (retry_count < 2) {
-               ret_val = e1e_rphy(hw, PHY_ID1, &phy_id);
-               if (ret_val)
-                       goto out;
-
-               phy->id = (u32)(phy_id << 16);
-               udelay(20);
-               ret_val = e1e_rphy(hw, PHY_ID2, &phy_id);
-               if (ret_val)
-                       goto out;
-
-               phy->id |= (u32)(phy_id & PHY_REVISION_MASK);
-               phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
-
-               if (phy->id != 0 && phy->id != PHY_REVISION_MASK)
-                       goto out;
-
-               /*
-                * If the PHY ID is still unknown, we may have an 82577
-                * without link.  We will try again after setting Slow MDIC
-                * mode. No harm in trying again in this case since the PHY
-                * ID is unknown at this point anyway.
-                */
-               ret_val = phy->ops.acquire(hw);
-               if (ret_val)
-                       goto out;
-               ret_val = e1000e_set_mdio_slow_mode_hv(hw, true);
-               if (ret_val)
-                       goto out;
-               phy->ops.release(hw);
-
-               retry_count++;
-       }
-out:
-       /* Revert to MDIO fast mode, if applicable */
-       if (retry_count) {
-               ret_val = phy->ops.acquire(hw);
-               if (ret_val)
-                       return ret_val;
-               ret_val = e1000e_set_mdio_slow_mode_hv(hw, false);
-               phy->ops.release(hw);
-       }
-
-       return ret_val;
-}
-
-/**
- *  e1000e_phy_reset_dsp - Reset PHY DSP
- *  @hw: pointer to the HW structure
- *
- *  Reset the digital signal processor.
- **/
-s32 e1000e_phy_reset_dsp(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (!(hw->phy.ops.write_reg))
-               goto out;
-
-       ret_val = e1e_wphy(hw, M88E1000_PHY_GEN_CONTROL, 0xC1);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1e_wphy(hw, M88E1000_PHY_GEN_CONTROL, 0);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_phy_reg_mdic - Read MDI control register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Reads the MDI control register in the PHY at offset and stores the
- *  information read to data.
- **/
-s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 i, mdic = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       /*
-        * Set up Op-code, Phy Address, and register offset in the MDI
-        * Control register.  The MAC will take care of interfacing with the
-        * PHY to retrieve the desired data.
-        */
-       mdic = ((offset << E1000_MDIC_REG_SHIFT) |
-               (phy->addr << E1000_MDIC_PHY_SHIFT) |
-               (E1000_MDIC_OP_READ));
-
-       ew32(MDIC, mdic);
-
-       /*
-        * Poll the ready bit to see if the MDI read completed
-        * Increasing the time out as testing showed failures with
-        * the lower time out
-        */
-       for (i = 0; i < (E1000_GEN_POLL_TIMEOUT * 3); i++) {
-               udelay(50);
-               mdic = er32(MDIC);
-               if (mdic & E1000_MDIC_READY)
-                       break;
-       }
-       if (!(mdic & E1000_MDIC_READY)) {
-               e_dbg("MDI Read did not complete\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-       if (mdic & E1000_MDIC_ERROR) {
-               e_dbg("MDI Error\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-       *data = (u16) mdic;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_write_phy_reg_mdic - Write MDI control register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write to register at offset
- *
- *  Writes data to MDI control register in the PHY at offset.
- **/
-s32 e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 i, mdic = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       /*
-        * Set up Op-code, Phy Address, and register offset in the MDI
-        * Control register.  The MAC will take care of interfacing with the
-        * PHY to retrieve the desired data.
-        */
-       mdic = (((u32)data) |
-               (offset << E1000_MDIC_REG_SHIFT) |
-               (phy->addr << E1000_MDIC_PHY_SHIFT) |
-               (E1000_MDIC_OP_WRITE));
-
-       ew32(MDIC, mdic);
-
-       /*
-        * Poll the ready bit to see if the MDI read completed
-        * Increasing the time out as testing showed failures with
-        * the lower time out
-        */
-       for (i = 0; i < (E1000_GEN_POLL_TIMEOUT * 3); i++) {
-               udelay(50);
-               mdic = er32(MDIC);
-               if (mdic & E1000_MDIC_READY)
-                       break;
-       }
-       if (!(mdic & E1000_MDIC_READY)) {
-               e_dbg("MDI Write did not complete\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-       if (mdic & E1000_MDIC_ERROR) {
-               e_dbg("MDI Error\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_phy_reg_m88 - Read m88 PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore, if necessary, then reads the PHY register at offset
- *  and storing the retrieved information in data.  Release any acquired
- *  semaphores before exiting.
- **/
-s32 e1000e_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (!(hw->phy.ops.acquire))
-               goto out;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                         data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_write_phy_reg_m88 - Write m88 PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore, if necessary, then writes the data to PHY register
- *  at the offset.  Release any acquired semaphores before exiting.
- **/
-s32 e1000e_write_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (!(hw->phy.ops.acquire))
-               goto out;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  __e1000e_read_phy_reg_igp - Read igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *  @locked: semaphore has already been acquired or not
- *
- *  Acquires semaphore, if necessary, then reads the PHY register at offset
- *  and stores the retrieved information in data.  Release any acquired
- *  semaphores before exiting.
- **/
-static s32 __e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data,
-                                    bool locked)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
-
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-               ret_val = e1000e_write_phy_reg_mdic(hw,
-                                                  IGP01E1000_PHY_PAGE_SELECT,
-                                                  (u16)offset);
-               if (ret_val)
-                       goto release;
-       }
-
-       ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                         data);
-
-release:
-       if (!locked)
-               hw->phy.ops.release(hw);
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_phy_reg_igp - Read igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore then reads the PHY register at offset and stores the
- *  retrieved information in data.
- *  Release the acquired semaphore before exiting.
- **/
-s32 e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __e1000e_read_phy_reg_igp(hw, offset, data, false);
-}
-
-/**
- *  e1000e_read_phy_reg_igp_locked - Read igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Reads the PHY register at offset and stores the retrieved information
- *  in data.  Assumes semaphore already acquired.
- **/
-s32 e1000e_read_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __e1000e_read_phy_reg_igp(hw, offset, data, true);
-}
-
-/**
- *  e1000e_write_phy_reg_igp - Write igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *  @locked: semaphore has already been acquired or not
- *
- *  Acquires semaphore, if necessary, then writes the data to PHY register
- *  at the offset.  Release any acquired semaphores before exiting.
- **/
-static s32 __e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data,
-                                     bool locked)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
-
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-               ret_val = e1000e_write_phy_reg_mdic(hw,
-                                                  IGP01E1000_PHY_PAGE_SELECT,
-                                                  (u16)offset);
-               if (ret_val)
-                       goto release;
-       }
-
-       ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
-
-release:
-       if (!locked)
-               hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_write_phy_reg_igp - Write igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore then writes the data to PHY register
- *  at the offset.  Release any acquired semaphores before exiting.
- **/
-s32 e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __e1000e_write_phy_reg_igp(hw, offset, data, false);
-}
-
-/**
- *  e1000e_write_phy_reg_igp_locked - Write igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Writes the data to PHY register at the offset.
- *  Assumes semaphore already acquired.
- **/
-s32 e1000e_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __e1000e_write_phy_reg_igp(hw, offset, data, true);
-}
-
-/**
- *  __e1000e_read_kmrn_reg - Read kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *  @locked: semaphore has already been acquired or not
- *
- *  Acquires semaphore, if necessary.  Then reads the PHY register at offset
- *  using the kumeran interface.  The information retrieved is stored in data.
- *  Release any acquired semaphores before exiting.
- **/
-static s32 __e1000e_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data,
-                                 bool locked)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = E1000_SUCCESS;
-
-       if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
-
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
-       ew32(KMRNCTRLSTA, kmrnctrlsta);
-
-       udelay(2);
-
-       kmrnctrlsta = er32(KMRNCTRLSTA);
-       *data = (u16)kmrnctrlsta;
-
-       if (!locked)
-               hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_read_kmrn_reg -  Read kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore then reads the PHY register at offset using the
- *  kumeran interface.  The information retrieved is stored in data.
- *  Release the acquired semaphore before exiting.
- **/
-s32 e1000e_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __e1000e_read_kmrn_reg(hw, offset, data, false);
-}
-
-/**
- *  e1000e_read_kmrn_reg_locked -  Read kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Reads the PHY register at offset using the kumeran interface.  The
- *  information retrieved is stored in data.
- *  Assumes semaphore already acquired.
- **/
-s32 e1000e_read_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __e1000e_read_kmrn_reg(hw, offset, data, true);
-}
-
-/**
- *  __e1000e_write_kmrn_reg - Write kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *  @locked: semaphore has already been acquired or not
- *
- *  Acquires semaphore, if necessary.  Then write the data to PHY register
- *  at the offset using the kumeran interface.  Release any acquired semaphores
- *  before exiting.
- **/
-static s32 __e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data,
-                                  bool locked)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = E1000_SUCCESS;
-
-       if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
-
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | data;
-       ew32(KMRNCTRLSTA, kmrnctrlsta);
-
-       udelay(2);
-
-       if (!locked)
-               hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_write_kmrn_reg -  Write kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore then writes the data to the PHY register at the offset
- *  using the kumeran interface.  Release the acquired semaphore before exiting.
- **/
-s32 e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __e1000e_write_kmrn_reg(hw, offset, data, false);
-}
-
-/**
- *  e1000e_write_kmrn_reg_locked -  Write kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Write the data to PHY register at the offset using the kumeran interface.
- *  Assumes semaphore already acquired.
- **/
-s32 e1000e_write_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __e1000e_write_kmrn_reg(hw, offset, data, true);
-}
-
-/**
- *  e1000e_copper_link_setup_82577 - Setup 82577 PHY for copper link
- *  @hw: pointer to the HW structure
- *
- *  Sets up Carrier-sense on Transmit and downshift values.
- **/
-s32 e1000e_copper_link_setup_82577(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-
-       if (phy->reset_disable) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       /* Enable CRS on TX. This must be set for half-duplex operation. */
-       ret_val = e1e_rphy(hw, I82577_CFG_REG, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data |= I82577_CFG_ASSERT_CRS_ON_TX;
-
-       /* Enable downshift */
-       phy_data |= I82577_CFG_ENABLE_DOWNSHIFT;
-
-       ret_val = e1e_wphy(hw, I82577_CFG_REG, phy_data);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_copper_link_setup_m88 - Setup m88 PHY's for copper link
- *  @hw: pointer to the HW structure
- *
- *  Sets up MDI/MDI-X and polarity for m88 PHY's.  If necessary, transmit clock
- *  and downshift values are set also.
- **/
-s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-
-       if (phy->reset_disable) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       /* Enable CRS on TX. This must be set for half-duplex operation. */
-       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       /* For BM PHY this bit is downshift enable */
-       if (phy->type != e1000_phy_bm)
-               phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-
-       /*
-        * Options:
-        *   MDI/MDI-X = 0 (default)
-        *   0 - Auto for all speeds
-        *   1 - MDI mode
-        *   2 - MDI-X mode
-        *   3 - Auto for 1000Base-T only (MDI-X for 10/100Base-T modes)
-        */
-       phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-
-       switch (phy->mdix) {
-       case 1:
-               phy_data |= M88E1000_PSCR_MDI_MANUAL_MODE;
-               break;
-       case 2:
-               phy_data |= M88E1000_PSCR_MDIX_MANUAL_MODE;
-               break;
-       case 3:
-               phy_data |= M88E1000_PSCR_AUTO_X_1000T;
-               break;
-       case 0:
-       default:
-               phy_data |= M88E1000_PSCR_AUTO_X_MODE;
-               break;
-       }
-
-       /*
-        * Options:
-        *   disable_polarity_correction = 0 (default)
-        *       Automatic Correction for Reversed Cable Polarity
-        *   0 - Disabled
-        *   1 - Enabled
-        */
-       phy_data &= ~M88E1000_PSCR_POLARITY_REVERSAL;
-       if (phy->disable_polarity_correction == 1)
-               phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
-
-       /* Enable downshift on BM (disabled by default) */
-       if (phy->type == e1000_phy_bm)
-               phy_data |= BME1000_PSCR_ENABLE_DOWNSHIFT;
-
-       ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       if ((phy->type == e1000_phy_m88) &&
-           (phy->revision < E1000_REVISION_4) &&
-           (phy->id != BME1000_E_PHY_ID_R2)) {
-               /*
-                * Force TX_CLK in the Extended PHY Specific Control Register
-                * to 25MHz clock.
-                */
-               ret_val = e1e_rphy(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                            &phy_data);
-               if (ret_val)
-                       goto out;
-
-               phy_data |= M88E1000_EPSCR_TX_CLK_25;
-
-               if ((phy->revision == E1000_REVISION_2) &&
-                   (phy->id == M88E1111_I_PHY_ID)) {
-                       /* 82573L PHY - set the downshift counter to 5x. */
-                       phy_data &= ~M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK;
-                       phy_data |= M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X;
-               } else {
-                       /* Configure Master and Slave downshift values */
-                       phy_data &= ~(M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK |
-                                    M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK);
-                       phy_data |= (M88E1000_EPSCR_MASTER_DOWNSHIFT_1X |
-                                    M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X);
-               }
-               ret_val = e1e_wphy(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                            phy_data);
-               if (ret_val)
-                       goto out;
-       }
-
-       if ((phy->type == e1000_phy_bm) && (phy->id == BME1000_E_PHY_ID_R2)) {
-               /* Set PHY page 0, register 29 to 0x0003 */
-               ret_val = e1e_wphy(hw, 29, 0x0003);
-               if (ret_val)
-                       goto out;
-
-               /* Set PHY page 0, register 30 to 0x0000 */
-               ret_val = e1e_wphy(hw, 30, 0x0000);
-               if (ret_val)
-                       goto out;
-       }
-
-       /* Commit the changes. */
-       ret_val = e1000e_commit_phy(hw);
-       if (ret_val) {
-               e_dbg("Error committing the PHY changes\n");
-               goto out;
-       }
-
-       if (phy->type == e1000_phy_82578) {
-               ret_val = e1e_rphy(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                           &phy_data);
-               if (ret_val)
-                       goto out;
-
-               /* 82578 PHY - set the downshift count to 1x. */
-               phy_data |= I82578_EPSCR_DOWNSHIFT_ENABLE;
-               phy_data &= ~I82578_EPSCR_DOWNSHIFT_COUNTER_MASK;
-               ret_val = e1e_wphy(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                            phy_data);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_copper_link_setup_igp - Setup igp PHY's for copper link
- *  @hw: pointer to the HW structure
- *
- *  Sets up LPLU, MDI/MDI-X, polarity, Smartspeed and Master/Slave config for
- *  igp PHY's.
- **/
-s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-       if (phy->reset_disable) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       ret_val = e1000e_phy_hw_reset(hw);
-       if (ret_val) {
-               e_dbg("Error resetting the PHY.\n");
-               goto out;
-       }
-
-       /*
-        * Wait 100ms for MAC to configure PHY from NVM settings, to avoid
-        * timeout issues when LFS is enabled.
-        */
-       msleep(100);
-
-       /*
-        * The NVM settings will configure LPLU in D3 for
-        * non-IGP1 PHYs.
-        */
-       if (phy->type == e1000_phy_igp) {
-               /* disable lplu d3 during driver init */
-               ret_val = hw->phy.ops.set_d3_lplu_state(hw, false);
-               if (ret_val) {
-                       e_dbg("Error Disabling LPLU D3\n");
-                       goto out;
-               }
-       }
-
-       /* disable lplu d0 during driver init */
-       if (hw->phy.ops.set_d0_lplu_state) {
-               ret_val = hw->phy.ops.set_d0_lplu_state(hw, false);
-               if (ret_val) {
-                       e_dbg("Error Disabling LPLU D0\n");
-                       goto out;
-               }
-       }
-       /* Configure mdi-mdix settings */
-       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CTRL, &data);
-       if (ret_val)
-               goto out;
-
-       data &= ~IGP01E1000_PSCR_AUTO_MDIX;
-
-       switch (phy->mdix) {
-       case 1:
-               data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
-               break;
-       case 2:
-               data |= IGP01E1000_PSCR_FORCE_MDI_MDIX;
-               break;
-       case 0:
-       default:
-               data |= IGP01E1000_PSCR_AUTO_MDIX;
-               break;
-       }
-       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CTRL, data);
-       if (ret_val)
-               goto out;
-
-       /* set auto-master slave resolution settings */
-       if (hw->mac.autoneg) {
-               /*
-                * when autonegotiation advertisement is only 1000Mbps then we
-                * should disable SmartSpeed and enable Auto MasterSlave
-                * resolution as hardware default.
-                */
-               if (phy->autoneg_advertised == ADVERTISE_1000_FULL) {
-                       /* Disable SmartSpeed */
-                       ret_val = e1e_rphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-
-                       /* Set auto Master/Slave resolution process */
-                       ret_val = e1e_rphy(hw, PHY_1000T_CTRL, &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~CR_1000T_MS_ENABLE;
-                       ret_val = e1e_wphy(hw, PHY_1000T_CTRL, data);
-                       if (ret_val)
-                               goto out;
-               }
-
-               ret_val = e1e_rphy(hw, PHY_1000T_CTRL, &data);
-               if (ret_val)
-                       goto out;
-
-               /* load defaults for future use */
-               phy->original_ms_type = (data & CR_1000T_MS_ENABLE) ?
-                       ((data & CR_1000T_MS_VALUE) ?
-                       e1000_ms_force_master :
-                       e1000_ms_force_slave) :
-                       e1000_ms_auto;
-
-               switch (phy->ms_type) {
-               case e1000_ms_force_master:
-                       data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
-                       break;
-               case e1000_ms_force_slave:
-                       data |= CR_1000T_MS_ENABLE;
-                       data &= ~(CR_1000T_MS_VALUE);
-                       break;
-               case e1000_ms_auto:
-                       data &= ~CR_1000T_MS_ENABLE;
-               default:
-                       break;
-               }
-               ret_val = e1e_wphy(hw, PHY_1000T_CTRL, data);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_copper_link_autoneg - Setup/Enable autoneg for copper link
- *  @hw: pointer to the HW structure
- *
- *  Performs initial bounds checking on autoneg advertisement parameter, then
- *  configure to advertise the full capability.  Setup the PHY to autoneg
- *  and restart the negotiation process between the link partner.  If
- *  autoneg_wait_to_complete, then wait for autoneg to complete before exiting.
- **/
-static s32 e1000e_copper_link_autoneg(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_ctrl;
-
-       /*
-        * Perform some bounds checking on the autoneg advertisement
-        * parameter.
-        */
-       phy->autoneg_advertised &= phy->autoneg_mask;
-
-       /*
-        * If autoneg_advertised is zero, we assume it was not defaulted
-        * by the calling code so we set to advertise full capability.
-        */
-       if (phy->autoneg_advertised == 0)
-               phy->autoneg_advertised = phy->autoneg_mask;
-
-       e_dbg("Reconfiguring auto-neg advertisement params\n");
-       ret_val = e1000e_phy_setup_autoneg(hw);
-       if (ret_val) {
-               e_dbg("Error Setting up Auto-Negotiation\n");
-               goto out;
-       }
-       e_dbg("Restarting Auto-Neg\n");
-
-       /*
-        * Restart auto-negotiation by setting the Auto Neg Enable bit and
-        * the Auto Neg Restart bit in the PHY control register.
-        */
-       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       phy_ctrl |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
-       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Does the user want to wait for Auto-Neg to complete here, or
-        * check at a later time (for example, callback routine).
-        */
-       if (phy->autoneg_wait_to_complete) {
-               ret_val = hw->mac.ops.wait_autoneg(hw);
-               if (ret_val) {
-                       e_dbg("Error while waiting for "
-                                "autoneg to complete\n");
-                       goto out;
-               }
-       }
-
-       hw->mac.get_link_status = true;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_phy_setup_autoneg - Configure PHY for auto-negotiation
- *  @hw: pointer to the HW structure
- *
- *  Reads the MII auto-neg advertisement register and/or the 1000T control
- *  register and if the PHY is already setup for auto-negotiation, then
- *  return successful.  Otherwise, setup advertisement and flow control to
- *  the appropriate values for the wanted auto-negotiation.
- **/
-static s32 e1000e_phy_setup_autoneg(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 mii_autoneg_adv_reg;
-       u16 mii_1000t_ctrl_reg = 0;
-
-       phy->autoneg_advertised &= phy->autoneg_mask;
-
-       /* Read the MII Auto-Neg Advertisement Register (Address 4). */
-       ret_val = e1e_rphy(hw, PHY_AUTONEG_ADV, &mii_autoneg_adv_reg);
-       if (ret_val)
-               goto out;
-
-       if (phy->autoneg_mask & ADVERTISE_1000_FULL) {
-               /* Read the MII 1000Base-T Control Register (Address 9). */
-               ret_val = e1e_rphy(hw, PHY_1000T_CTRL,
-                                           &mii_1000t_ctrl_reg);
-               if (ret_val)
-                       goto out;
-       }
-
-       /*
-        * Need to parse both autoneg_advertised and fc and set up
-        * the appropriate PHY registers.  First we will parse for
-        * autoneg_advertised software override.  Since we can advertise
-        * a plethora of combinations, we need to check each bit
-        * individually.
-        */
-
-       /*
-        * First we clear all the 10/100 mb speed bits in the Auto-Neg
-        * Advertisement Register (Address 4) and the 1000 mb speed bits in
-        * the  1000Base-T Control Register (Address 9).
-        */
-       mii_autoneg_adv_reg &= ~(NWAY_AR_100TX_FD_CAPS |
-                                NWAY_AR_100TX_HD_CAPS |
-                                NWAY_AR_10T_FD_CAPS   |
-                                NWAY_AR_10T_HD_CAPS);
-       mii_1000t_ctrl_reg &= ~(CR_1000T_HD_CAPS | CR_1000T_FD_CAPS);
-
-       e_dbg("autoneg_advertised %x\n", phy->autoneg_advertised);
-
-       /* Do we want to advertise 10 Mb Half Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_10_HALF) {
-               e_dbg("Advertise 10mb Half duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_10T_HD_CAPS;
-       }
-
-       /* Do we want to advertise 10 Mb Full Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_10_FULL) {
-               e_dbg("Advertise 10mb Full duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_10T_FD_CAPS;
-       }
-
-       /* Do we want to advertise 100 Mb Half Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_100_HALF) {
-               e_dbg("Advertise 100mb Half duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_100TX_HD_CAPS;
-       }
-
-       /* Do we want to advertise 100 Mb Full Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_100_FULL) {
-               e_dbg("Advertise 100mb Full duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_100TX_FD_CAPS;
-       }
-
-       /* We do not allow the Phy to advertise 1000 Mb Half Duplex */
-       if (phy->autoneg_advertised & ADVERTISE_1000_HALF)
-               e_dbg("Advertise 1000mb Half duplex request denied!\n");
-
-       /* Do we want to advertise 1000 Mb Full Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_1000_FULL) {
-               e_dbg("Advertise 1000mb Full duplex\n");
-               mii_1000t_ctrl_reg |= CR_1000T_FD_CAPS;
-       }
-
-       /*
-        * Check for a software override of the flow control settings, and
-        * setup the PHY advertisement registers accordingly.  If
-        * auto-negotiation is enabled, then software will have to set the
-        * "PAUSE" bits to the correct value in the Auto-Negotiation
-        * Advertisement Register (PHY_AUTONEG_ADV) and re-start auto-
-        * negotiation.
-        *
-        * The possible values of the "fc" parameter are:
-        *      0:  Flow control is completely disabled
-        *      1:  Rx flow control is enabled (we can receive pause frames
-        *          but not send pause frames).
-        *      2:  Tx flow control is enabled (we can send pause frames
-        *          but we do not support receiving pause frames).
-        *      3:  Both Rx and Tx flow control (symmetric) are enabled.
-        *  other:  No software override.  The flow control configuration
-        *          in the EEPROM is used.
-        */
-       switch (hw->fc.current_mode) {
-       case e1000_fc_none:
-               /*
-                * Flow control (Rx & Tx) is completely disabled by a
-                * software over-ride.
-                */
-               mii_autoneg_adv_reg &= ~(NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-               break;
-       case e1000_fc_rx_pause:
-               /*
-                * Rx Flow control is enabled, and Tx Flow control is
-                * disabled, by a software over-ride.
-                *
-                * Since there really isn't a way to advertise that we are
-                * capable of Rx Pause ONLY, we will advertise that we
-                * support both symmetric and asymmetric Rx PAUSE.  Later
-                * (in e1000e_config_fc_after_link_up) we will disable the
-                * hw's ability to send PAUSE frames.
-                */
-               mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-               break;
-       case e1000_fc_tx_pause:
-               /*
-                * Tx Flow control is enabled, and Rx Flow control is
-                * disabled, by a software over-ride.
-                */
-               mii_autoneg_adv_reg |= NWAY_AR_ASM_DIR;
-               mii_autoneg_adv_reg &= ~NWAY_AR_PAUSE;
-               break;
-       case e1000_fc_full:
-               /*
-                * Flow control (both Rx and Tx) is enabled by a software
-                * over-ride.
-                */
-               mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-               break;
-       default:
-               e_dbg("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ret_val = e1e_wphy(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);
-       if (ret_val)
-               goto out;
-
-       e_dbg("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);
-
-       if (phy->autoneg_mask & ADVERTISE_1000_FULL) {
-               ret_val = e1e_wphy(hw,
-                                             PHY_1000T_CTRL,
-                                             mii_1000t_ctrl_reg);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_setup_copper_link - Configure copper link settings
- *  @hw: pointer to the HW structure
- *
- *  Calls the appropriate function to configure the link for auto-neg or forced
- *  speed and duplex.  Then we check for link, once link is established calls
- *  to configure collision distance and flow control are called.  If link is
- *  not established, we return -E1000_ERR_PHY (-2).
- **/
-s32 e1000e_setup_copper_link(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       bool link;
-
-       if (hw->mac.autoneg) {
-               /*
-                * Setup autoneg and flow control advertisement and perform
-                * autonegotiation.
-                */
-               ret_val = e1000e_copper_link_autoneg(hw);
-               if (ret_val)
-                       goto out;
-       } else {
-#if 0
-               /*
-                * PHY will be set to 10H, 10F, 100H or 100F
-                * depending on user settings.
-                */
-               e_dbg("Forcing Speed and Duplex\n");
-               ret_val = hw->phy.ops.force_speed_duplex(hw);
-               if (ret_val) {
-                       e_dbg("Error Forcing Speed and Duplex\n");
-                       goto out;
-               }
-#endif
-       }
-
-       /*
-        * Check link status. Wait up to 100 microseconds for link to become
-        * valid.
-        */
-       ret_val = e1000e_phy_has_link_generic(hw,
-                                            COPPER_LINK_UP_LIMIT,
-                                            10,
-                                            &link);
-       if (ret_val)
-               goto out;
-
-       if (link) {
-               e_dbg("Valid link established!!!\n");
-               e1000e_config_collision_dist(hw);
-               ret_val = e1000e_config_fc_after_link_up(hw);
-       } else {
-               e_dbg("Unable to establish link!!!\n");
-       }
-
-out:
-       return ret_val;
-}
-
-#if 0
-/**
- *  e1000e_phy_force_speed_duplex_igp - Force speed/duplex for igp PHY
- *  @hw: pointer to the HW structure
- *
- *  Calls the PHY setup function to force speed and duplex.  Clears the
- *  auto-crossover to force MDI manually.  Waits for link and returns
- *  successful if link up is successful, else -E1000_ERR_PHY (-2).
- **/
-s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-       bool link;
-
-       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       e1000e_phy_force_speed_duplex_setup(hw, &phy_data);
-
-       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Clear Auto-Crossover to force MDI manually.  IGP requires MDI
-        * forced whenever speed and duplex are forced.
-        */
-       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
-       phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
-
-       ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       e_dbg("IGP PSCR: %X\n", phy_data);
-
-       udelay(1);
-
-       if (phy->autoneg_wait_to_complete) {
-               e_dbg("Waiting for forced speed/duplex link on IGP phy.\n");
-
-               ret_val = e1000e_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link)
-                       e_dbg("Link taking longer than expected.\n");
-
-               /* Try once more */
-               ret_val = e1000e_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-#endif
-
-#if 0
-/**
- *  e1000e_phy_force_speed_duplex_m88 - Force speed/duplex for m88 PHY
- *  @hw: pointer to the HW structure
- *
- *  Calls the PHY setup function to force speed and duplex.  Clears the
- *  auto-crossover to force MDI manually.  Resets the PHY to commit the
- *  changes.  If time expires while waiting for link up, we reset the DSP.
- *  After reset, TX_CLK and CRS on Tx must be set.  Return successful upon
- *  successful completion, else return corresponding error code.
- **/
-s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-       bool link;
-
-       /*
-        * Clear Auto-Crossover to force MDI manually.  M88E1000 requires MDI
-        * forced whenever speed and duplex are forced.
-        */
-       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-       ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       e_dbg("M88E1000 PSCR: %X\n", phy_data);
-
-       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       e1000e_phy_force_speed_duplex_setup(hw, &phy_data);
-
-       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /* Reset the phy to commit changes. */
-       ret_val = e1000e_commit_phy(hw);
-       if (ret_val)
-               goto out;
-
-       if (phy->autoneg_wait_to_complete) {
-               e_dbg("Waiting for forced speed/duplex link on M88 phy.\n");
-
-               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link) {
-                       /*
-                        * We didn't get link.
-                        * Reset the DSP and cross our fingers.
-                        */
-                       ret_val = e1e_wphy(hw,
-                                                     M88E1000_PHY_PAGE_SELECT,
-                                                     0x001d);
-                       if (ret_val)
-                               goto out;
-                       ret_val = e1000e_phy_reset_dsp(hw);
-                       if (ret_val)
-                               goto out;
-               }
-
-               /* Try once more */
-               ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1e_rphy(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Resetting the phy means we need to re-force TX_CLK in the
-        * Extended PHY Specific Control Register to 25MHz clock from
-        * the reset value of 2.5MHz.
-        */
-       phy_data |= M88E1000_EPSCR_TX_CLK_25;
-       ret_val = e1e_wphy(hw, M88E1000_EXT_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * In addition, we must re-enable CRS on Tx for both half and full
-        * duplex.
-        */
-       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-       ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-
-out:
-       return ret_val;
-}
-#endif
-
-#if 0
-/**
- *  e1000e_phy_force_speed_duplex_ife - Force PHY speed & duplex
- *  @hw: pointer to the HW structure
- *
- *  Forces the speed and duplex settings of the PHY.
- *  This is a function pointer entry point only called by
- *  PHY setup routines.
- **/
-s32 e1000e_phy_force_speed_duplex_ife(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-       bool link;
-
-       if (phy->type != e1000_phy_ife) {
-               ret_val = e1000e_phy_force_speed_duplex_igp(hw);
-               goto out;
-       }
-
-       ret_val = e1e_rphy(hw, PHY_CONTROL, &data);
-       if (ret_val)
-               goto out;
-
-       e1000e_phy_force_speed_duplex_setup(hw, &data);
-
-       ret_val = e1e_wphy(hw, PHY_CONTROL, data);
-       if (ret_val)
-               goto out;
-
-       /* Disable MDI-X support for 10/100 */
-       ret_val = e1e_rphy(hw, IFE_PHY_MDIX_CONTROL, &data);
-       if (ret_val)
-               goto out;
-
-       data &= ~IFE_PMC_AUTO_MDIX;
-       data &= ~IFE_PMC_FORCE_MDIX;
-
-       ret_val = e1e_wphy(hw, IFE_PHY_MDIX_CONTROL, data);
-       if (ret_val)
-               goto out;
-
-       e_dbg("IFE PMC: %X\n", data);
-
-       udelay(1);
-
-       if (phy->autoneg_wait_to_complete) {
-               e_dbg("Waiting for forced speed/duplex link on IFE phy.\n");
-
-               ret_val = e1000e_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link)
-                       e_dbg("Link taking longer than expected.\n");
-
-               /* Try once more */
-               ret_val = e1000e_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-#endif
-
-#if 0
-/**
- *  e1000e_phy_force_speed_duplex_setup - Configure forced PHY speed/duplex
- *  @hw: pointer to the HW structure
- *  @phy_ctrl: pointer to current value of PHY_CONTROL
- *
- *  Forces speed and duplex on the PHY by doing the following: disable flow
- *  control, force speed/duplex on the MAC, disable auto speed detection,
- *  disable auto-negotiation, configure duplex, configure speed, configure
- *  the collision distance, write configuration to CTRL register.  The
- *  caller must write to the PHY_CONTROL register for these settings to
- *  take affect.
- **/
-void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 ctrl;
-
-       /* Turn off flow control when forcing speed/duplex */
-       hw->fc.current_mode = e1000_fc_none;
-
-       /* Force speed/duplex on the mac */
-       ctrl = er32(CTRL);
-       ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       ctrl &= ~E1000_CTRL_SPD_SEL;
-
-       /* Disable Auto Speed Detection */
-       ctrl &= ~E1000_CTRL_ASDE;
-
-       /* Disable autoneg on the phy */
-       *phy_ctrl &= ~MII_CR_AUTO_NEG_EN;
-
-       /* Forcing Full or Half Duplex? */
-       if (mac->forced_speed_duplex & E1000_ALL_HALF_DUPLEX) {
-               ctrl &= ~E1000_CTRL_FD;
-               *phy_ctrl &= ~MII_CR_FULL_DUPLEX;
-               e_dbg("Half Duplex\n");
-       } else {
-               ctrl |= E1000_CTRL_FD;
-               *phy_ctrl |= MII_CR_FULL_DUPLEX;
-               e_dbg("Full Duplex\n");
-       }
-
-       /* Forcing 10mb or 100mb? */
-       if (mac->forced_speed_duplex & E1000_ALL_100_SPEED) {
-               ctrl |= E1000_CTRL_SPD_100;
-               *phy_ctrl |= MII_CR_SPEED_100;
-               *phy_ctrl &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_10);
-               e_dbg("Forcing 100mb\n");
-       } else {
-               ctrl &= ~(E1000_CTRL_SPD_1000 | E1000_CTRL_SPD_100);
-               *phy_ctrl |= MII_CR_SPEED_10;
-               *phy_ctrl &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_100);
-               e_dbg("Forcing 10mb\n");
-       }
-
-       e1000e_config_collision_dist(hw);
-
-       ew32(CTRL, ctrl);
-}
-#endif
-
-/**
- *  e1000e_set_d3_lplu_state - Sets low power link up state for D3
- *  @hw: pointer to the HW structure
- *  @active: boolean used to enable/disable lplu
- *
- *  Success returns 0, Failure returns 1
- *
- *  The low power link up (lplu) state is set to the power management level D3
- *  and SmartSpeed is disabled when active is true, else clear lplu for D3
- *  and enable Smartspeed.  LPLU and Smartspeed are mutually exclusive.  LPLU
- *  is used during Dx states where the power conservation is most important.
- *  During driver activity, SmartSpeed should be enabled so performance is
- *  maintained.
- **/
-s32 e1000e_set_d3_lplu_state(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       if (!(hw->phy.ops.read_reg))
-               goto out;
-
-       ret_val = e1e_rphy(hw, IGP02E1000_PHY_POWER_MGMT, &data);
-       if (ret_val)
-               goto out;
-
-       if (!active) {
-               data &= ~IGP02E1000_PM_D3_LPLU;
-               ret_val = e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT,
-                                            data);
-               if (ret_val)
-                       goto out;
-               /*
-                * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
-                * during Dx states where the power conservation is most
-                * important.  During driver activity we should enable
-                * SmartSpeed, so performance is maintained.
-                */
-               if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = e1e_rphy(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = e1e_rphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = e1e_wphy(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               }
-       } else if ((phy->autoneg_advertised == E1000_ALL_SPEED_DUPLEX) ||
-                  (phy->autoneg_advertised == E1000_ALL_NOT_GIG) ||
-                  (phy->autoneg_advertised == E1000_ALL_10_SPEED)) {
-               data |= IGP02E1000_PM_D3_LPLU;
-               ret_val = e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT,
-                                             data);
-               if (ret_val)
-                       goto out;
-
-               /* When LPLU is enabled, we should disable SmartSpeed */
-               ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                            &data);
-               if (ret_val)
-                       goto out;
-
-               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-               ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                             data);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_check_downshift - Checks whether a downshift in speed occurred
- *  @hw: pointer to the HW structure
- *
- *  Success returns 0, Failure returns 1
- *
- *  A downshift is detected by querying the PHY link health.
- **/
-s32 e1000e_check_downshift(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, offset, mask;
-
-       switch (phy->type) {
-       case e1000_phy_m88:
-       case e1000_phy_gg82563:
-       case e1000_phy_bm:
-       case e1000_phy_82578:
-               offset  = M88E1000_PHY_SPEC_STATUS;
-               mask    = M88E1000_PSSR_DOWNSHIFT;
-               break;
-       case e1000_phy_igp_2:
-       case e1000_phy_igp:
-       case e1000_phy_igp_3:
-               offset  = IGP01E1000_PHY_LINK_HEALTH;
-               mask    = IGP01E1000_PLHR_SS_DOWNGRADE;
-               break;
-       default:
-               /* speed downshift not supported */
-               phy->speed_downgraded = false;
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       ret_val = e1e_rphy(hw, offset, &phy_data);
-
-       if (!ret_val)
-               phy->speed_downgraded = (phy_data & mask) ? true : false;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_check_polarity_m88 - Checks the polarity.
- *  @hw: pointer to the HW structure
- *
- *  Success returns 0, Failure returns -E1000_ERR_PHY (-2)
- *
- *  Polarity is determined based on the PHY specific status register.
- **/
-s32 e1000e_check_polarity_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_STATUS, &data);
-
-       if (!ret_val)
-               phy->cable_polarity = (data & M88E1000_PSSR_REV_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
-
-       return ret_val;
-}
-
-/**
- *  e1000e_check_polarity_igp - Checks the polarity.
- *  @hw: pointer to the HW structure
- *
- *  Success returns 0, Failure returns -E1000_ERR_PHY (-2)
- *
- *  Polarity is determined based on the PHY port status register, and the
- *  current speed (since there is no polarity at 100Mbps).
- **/
-s32 e1000e_check_polarity_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data, offset, mask;
-
-       /*
-        * Polarity is determined based on the speed of
-        * our connection.
-        */
-       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_STATUS, &data);
-       if (ret_val)
-               goto out;
-
-       if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
-           IGP01E1000_PSSR_SPEED_1000MBPS) {
-               offset  = IGP01E1000_PHY_PCS_INIT_REG;
-               mask    = IGP01E1000_PHY_POLARITY_MASK;
-       } else {
-               /*
-                * This really only applies to 10Mbps since
-                * there is no polarity for 100Mbps (always 0).
-                */
-               offset  = IGP01E1000_PHY_PORT_STATUS;
-               mask    = IGP01E1000_PSSR_POLARITY_REVERSED;
-       }
-
-       ret_val = e1e_rphy(hw, offset, &data);
-
-       if (!ret_val)
-               phy->cable_polarity = (data & mask)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_check_polarity_ife - Check cable polarity for IFE PHY
- *  @hw: pointer to the HW structure
- *
- *  Polarity is determined on the polarity reversal feature being enabled.
- **/
-s32 e1000e_check_polarity_ife(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, offset, mask;
-
-       /*
-        * Polarity is determined based on the reversal feature being enabled.
-        */
-       if (phy->polarity_correction) {
-               offset = IFE_PHY_EXTENDED_STATUS_CONTROL;
-               mask = IFE_PESC_POLARITY_REVERSED;
-       } else {
-               offset = IFE_PHY_SPECIAL_CONTROL;
-               mask = IFE_PSC_FORCE_POLARITY;
-       }
-
-       ret_val = e1e_rphy(hw, offset, &phy_data);
-
-       if (!ret_val)
-               phy->cable_polarity = (phy_data & mask)
-                                      ? e1000_rev_polarity_reversed
-                                      : e1000_rev_polarity_normal;
-
-       return ret_val;
-}
-
-/**
- *  e1000e_wait_autoneg - Wait for auto-neg completion
- *  @hw: pointer to the HW structure
- *
- *  Waits for auto-negotiation to complete or for the auto-negotiation time
- *  limit to expire, which ever happens first.
- **/
-s32 e1000e_wait_autoneg(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 i, phy_status;
-
-       if (!(hw->phy.ops.read_reg))
-               return E1000_SUCCESS;
-
-       /* Break after autoneg completes or PHY_AUTO_NEG_LIMIT expires. */
-       for (i = PHY_AUTO_NEG_LIMIT; i > 0; i--) {
-               ret_val = e1e_rphy(hw, PHY_STATUS, &phy_status);
-               if (ret_val)
-                       break;
-               ret_val = e1e_rphy(hw, PHY_STATUS, &phy_status);
-               if (ret_val)
-                       break;
-               if (phy_status & MII_SR_AUTONEG_COMPLETE)
-                       break;
-               msleep(100);
-       }
-
-       /*
-        * PHY_AUTO_NEG_TIME expiration doesn't guarantee auto-negotiation
-        * has completed.
-        */
-       return ret_val;
-}
-
-/**
- *  e1000e_phy_has_link_generic - Polls PHY for link
- *  @hw: pointer to the HW structure
- *  @iterations: number of times to poll for link
- *  @usec_interval: delay between polling attempts
- *  @success: pointer to whether polling was successful or not
- *
- *  Polls the PHY status register for link, 'iterations' number of times.
- **/
-s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
-                               u32 usec_interval, bool *success)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 i, phy_status;
-
-       if (!(hw->phy.ops.read_reg))
-               return E1000_SUCCESS;
-
-       for (i = 0; i < iterations; i++) {
-               /*
-                * Some PHYs require the PHY_STATUS register to be read
-                * twice due to the link bit being sticky.  No harm doing
-                * it across the board.
-                */
-               ret_val = e1e_rphy(hw, PHY_STATUS, &phy_status);
-               if (ret_val) {
-                       /*
-                        * If the first read fails, another entity may have
-                        * ownership of the resources, wait and try again to
-                        * see if they have relinquished the resources yet.
-                        */
-                       udelay(usec_interval);
-               }
-               ret_val = e1e_rphy(hw, PHY_STATUS, &phy_status);
-               if (ret_val)
-                       break;
-               if (phy_status & MII_SR_LINK_STATUS)
-                       break;
-               if (usec_interval >= 1000)
-                       mdelay(usec_interval/1000);
-               else
-                       udelay(usec_interval);
-       }
-
-       *success = (i < iterations) ? true : false;
-
-       return ret_val;
-}
-
-#if 0
-/**
- *  e1000e_get_cable_length_m88 - Determine cable length for m88 PHY
- *  @hw: pointer to the HW structure
- *
- *  Reads the PHY specific status register to retrieve the cable length
- *  information.  The cable length is determined by averaging the minimum and
- *  maximum values to get the "average" cable length.  The m88 PHY has four
- *  possible cable length values, which are:
- *     Register Value          Cable Length
- *     0                       < 50 meters
- *     1                       50 - 80 meters
- *     2                       80 - 110 meters
- *     3                       110 - 140 meters
- *     4                       > 140 meters
- **/
-s32 e1000e_get_cable_length_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, index;
-
-       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-       if (ret_val)
-               goto out;
-
-       index = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
-               M88E1000_PSSR_CABLE_LENGTH_SHIFT;
-       if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE - 1) {
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-       phy->min_cable_length = e1000_m88_cable_length_table[index];
-       phy->max_cable_length = e1000_m88_cable_length_table[index + 1];
-
-       phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_get_cable_length_igp_2 - Determine cable length for igp2 PHY
- *  @hw: pointer to the HW structure
- *
- *  The automatic gain control (agc) normalizes the amplitude of the
- *  received signal, adjusting for the attenuation produced by the
- *  cable.  By reading the AGC registers, which represent the
- *  combination of coarse and fine gain value, the value can be put
- *  into a lookup table to obtain the approximate cable length
- *  for each channel.
- **/
-s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_data, i, agc_value = 0;
-       u16 cur_agc_index, max_agc_index = 0;
-       u16 min_agc_index = IGP02E1000_CABLE_LENGTH_TABLE_SIZE - 1;
-       u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] =
-                                                        {IGP02E1000_PHY_AGC_A,
-                                                         IGP02E1000_PHY_AGC_B,
-                                                         IGP02E1000_PHY_AGC_C,
-                                                         IGP02E1000_PHY_AGC_D};
-
-       /* Read the AGC registers for all channels */
-       for (i = 0; i < IGP02E1000_PHY_CHANNEL_NUM; i++) {
-               ret_val = e1e_rphy(hw, agc_reg_array[i], &phy_data);
-               if (ret_val)
-                       goto out;
-
-               /*
-                * Getting bits 15:9, which represent the combination of
-                * coarse and fine gain values.  The result is a number
-                * that can be put into the lookup table to obtain the
-                * approximate cable length.
-                */
-               cur_agc_index = (phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
-                               IGP02E1000_AGC_LENGTH_MASK;
-
-               /* Array index bound check. */
-               if ((cur_agc_index >= IGP02E1000_CABLE_LENGTH_TABLE_SIZE) ||
-                   (cur_agc_index == 0)) {
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-               }
-
-               /* Remove min & max AGC values from calculation. */
-               if (e1000_igp_2_cable_length_table[min_agc_index] >
-                   e1000_igp_2_cable_length_table[cur_agc_index])
-                       min_agc_index = cur_agc_index;
-               if (e1000_igp_2_cable_length_table[max_agc_index] <
-                   e1000_igp_2_cable_length_table[cur_agc_index])
-                       max_agc_index = cur_agc_index;
-
-               agc_value += e1000_igp_2_cable_length_table[cur_agc_index];
-       }
-
-       agc_value -= (e1000_igp_2_cable_length_table[min_agc_index] +
-                     e1000_igp_2_cable_length_table[max_agc_index]);
-       agc_value /= (IGP02E1000_PHY_CHANNEL_NUM - 2);
-
-       /* Calculate cable length with the error range of +/- 10 meters. */
-       phy->min_cable_length = ((agc_value - IGP02E1000_AGC_RANGE) > 0) ?
-                                (agc_value - IGP02E1000_AGC_RANGE) : 0;
-       phy->max_cable_length = agc_value + IGP02E1000_AGC_RANGE;
-
-       phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
-
-out:
-       return ret_val;
-}
-#endif
-
-/**
- *  e1000e_get_phy_info_m88 - Retrieve PHY information
- *  @hw: pointer to the HW structure
- *
- *  Valid for only copper links.  Read the PHY status register (sticky read)
- *  to verify that link is up.  Read the PHY special control register to
- *  determine the polarity and 10base-T extended distance.  Read the PHY
- *  special status register to determine MDI/MDIx and current speed.  If
- *  speed is 1000, then determine cable length, local and remote receiver.
- **/
-s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32  ret_val;
-       u16 phy_data;
-       bool link;
-
-       if (phy->media_type != e1000_media_type_copper) {
-               e_dbg("Phy info is only valid for copper media\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ret_val = e1000e_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               e_dbg("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy->polarity_correction = (phy_data & M88E1000_PSCR_POLARITY_REVERSAL)
-                                  ? true : false;
-
-       ret_val = e1000e_check_polarity_m88(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1e_rphy(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy->is_mdix = (phy_data & M88E1000_PSSR_MDIX) ? true : false;
-
-       if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
-#if 0
-               ret_val = e1000e_get_cable_length(hw);
-#endif
-               ret_val = -E1000_ERR_CONFIG;
-               if (ret_val)
-                       goto out;
-#if 0
-               ret_val = e1e_rphy(hw, PHY_1000T_STATUS, &phy_data);
-               if (ret_val)
-                       goto out;
-
-               phy->local_rx = (phy_data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
-
-               phy->remote_rx = (phy_data & SR_1000T_REMOTE_RX_STATUS)
-                                ? e1000_1000t_rx_status_ok
-                                : e1000_1000t_rx_status_not_ok;
-#endif
-       } else {
-               /* Set values to "undefined" */
-               phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
-               phy->local_rx = e1000_1000t_rx_status_undefined;
-               phy->remote_rx = e1000_1000t_rx_status_undefined;
-       }
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_get_phy_info_igp - Retrieve igp PHY information
- *  @hw: pointer to the HW structure
- *
- *  Read PHY status to determine if link is up.  If link is up, then
- *  set/determine 10base-T extended distance and polarity correction.  Read
- *  PHY port status to determine MDI/MDIx and speed.  Based on the speed,
- *  determine on the cable length, local and remote receiver.
- **/
-s32 e1000e_get_phy_info_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-       bool link;
-
-       ret_val = e1000e_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               e_dbg("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       phy->polarity_correction = true;
-
-       ret_val = e1000e_check_polarity_igp(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1e_rphy(hw, IGP01E1000_PHY_PORT_STATUS, &data);
-       if (ret_val)
-               goto out;
-
-       phy->is_mdix = (data & IGP01E1000_PSSR_MDIX) ? true : false;
-
-       if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
-           IGP01E1000_PSSR_SPEED_1000MBPS) {
-#if 0
-               ret_val = phy->ops.get_cable_length(hw);
-#endif
-               ret_val = -E1000_ERR_CONFIG;
-               if (ret_val)
-                       goto out;
-#if 0
-               ret_val = e1e_rphy(hw, PHY_1000T_STATUS, &data);
-               if (ret_val)
-                       goto out;
-
-               phy->local_rx = (data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
-
-               phy->remote_rx = (data & SR_1000T_REMOTE_RX_STATUS)
-                                ? e1000_1000t_rx_status_ok
-                                : e1000_1000t_rx_status_not_ok;
-#endif
-       } else {
-               phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
-               phy->local_rx = e1000_1000t_rx_status_undefined;
-               phy->remote_rx = e1000_1000t_rx_status_undefined;
-       }
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_phy_sw_reset - PHY software reset
- *  @hw: pointer to the HW structure
- *
- *  Does a software reset of the PHY by reading the PHY control register and
- *  setting/write the control register reset bit to the PHY.
- **/
-s32 e1000e_phy_sw_reset(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_ctrl;
-
-       if (!(hw->phy.ops.read_reg))
-               goto out;
-
-       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       phy_ctrl |= MII_CR_RESET;
-       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       udelay(1);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_phy_hw_reset_generic - PHY hardware reset
- *  @hw: pointer to the HW structure
- *
- *  Verify the reset block is not blocking us from resetting.  Acquire
- *  semaphore (if necessary) and read/set/write the device control reset
- *  bit in the PHY.  Wait the appropriate delay time for the device to
- *  reset and release the semaphore (if necessary).
- **/
-s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u32 ctrl;
-
-       ret_val = e1000e_check_reset_block(hw);
-       if (ret_val) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       ret_val = phy->ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ctrl = er32(CTRL);
-       ew32(CTRL, ctrl | E1000_CTRL_PHY_RST);
-       e1e_flush();
-
-       udelay(phy->reset_delay_us);
-
-       ew32(CTRL, ctrl);
-       e1e_flush();
-
-       udelay(150);
-
-       phy->ops.release(hw);
-
-       ret_val = phy->ops.get_cfg_done(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_get_cfg_done - Generic configuration done
- *  @hw: pointer to the HW structure
- *
- *  Generic function to wait 10 milli-seconds for configuration to complete
- *  and return success.
- **/
-s32 e1000e_get_cfg_done(struct e1000_hw *hw __unused)
-{
-       mdelay(10);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_phy_init_script_igp3 - Inits the IGP3 PHY
- *  @hw: pointer to the HW structure
- *
- *  Initializes a Intel Gigabit PHY3 when an EEPROM is not present.
- **/
-s32 e1000e_phy_init_script_igp3(struct e1000_hw *hw)
-{
-       e_dbg("Running IGP 3 PHY init script\n");
-
-       /* PHY init IGP 3 */
-       /* Enable rise/fall, 10-mode work in class-A */
-       e1e_wphy(hw, 0x2F5B, 0x9018);
-       /* Remove all caps from Replica path filter */
-       e1e_wphy(hw, 0x2F52, 0x0000);
-       /* Bias trimming for ADC, AFE and Driver (Default) */
-       e1e_wphy(hw, 0x2FB1, 0x8B24);
-       /* Increase Hybrid poly bias */
-       e1e_wphy(hw, 0x2FB2, 0xF8F0);
-       /* Add 4% to Tx amplitude in Gig mode */
-       e1e_wphy(hw, 0x2010, 0x10B0);
-       /* Disable trimming (TTT) */
-       e1e_wphy(hw, 0x2011, 0x0000);
-       /* Poly DC correction to 94.6% + 2% for all channels */
-       e1e_wphy(hw, 0x20DD, 0x249A);
-       /* ABS DC correction to 95.9% */
-       e1e_wphy(hw, 0x20DE, 0x00D3);
-       /* BG temp curve trim */
-       e1e_wphy(hw, 0x28B4, 0x04CE);
-       /* Increasing ADC OPAMP stage 1 currents to max */
-       e1e_wphy(hw, 0x2F70, 0x29E4);
-       /* Force 1000 ( required for enabling PHY regs configuration) */
-       e1e_wphy(hw, 0x0000, 0x0140);
-       /* Set upd_freq to 6 */
-       e1e_wphy(hw, 0x1F30, 0x1606);
-       /* Disable NPDFE */
-       e1e_wphy(hw, 0x1F31, 0xB814);
-       /* Disable adaptive fixed FFE (Default) */
-       e1e_wphy(hw, 0x1F35, 0x002A);
-       /* Enable FFE hysteresis */
-       e1e_wphy(hw, 0x1F3E, 0x0067);
-       /* Fixed FFE for short cable lengths */
-       e1e_wphy(hw, 0x1F54, 0x0065);
-       /* Fixed FFE for medium cable lengths */
-       e1e_wphy(hw, 0x1F55, 0x002A);
-       /* Fixed FFE for long cable lengths */
-       e1e_wphy(hw, 0x1F56, 0x002A);
-       /* Enable Adaptive Clip Threshold */
-       e1e_wphy(hw, 0x1F72, 0x3FB0);
-       /* AHT reset limit to 1 */
-       e1e_wphy(hw, 0x1F76, 0xC0FF);
-       /* Set AHT master delay to 127 msec */
-       e1e_wphy(hw, 0x1F77, 0x1DEC);
-       /* Set scan bits for AHT */
-       e1e_wphy(hw, 0x1F78, 0xF9EF);
-       /* Set AHT Preset bits */
-       e1e_wphy(hw, 0x1F79, 0x0210);
-       /* Change integ_factor of channel A to 3 */
-       e1e_wphy(hw, 0x1895, 0x0003);
-       /* Change prop_factor of channels BCD to 8 */
-       e1e_wphy(hw, 0x1796, 0x0008);
-       /* Change cg_icount + enable integbp for channels BCD */
-       e1e_wphy(hw, 0x1798, 0xD008);
-       /*
-        * Change cg_icount + enable integbp + change prop_factor_master
-        * to 8 for channel A
-        */
-       e1e_wphy(hw, 0x1898, 0xD918);
-       /* Disable AHT in Slave mode on channel A */
-       e1e_wphy(hw, 0x187A, 0x0800);
-       /*
-        * Enable LPLU and disable AN to 1000 in non-D0a states,
-        * Enable SPD+B2B
-        */
-       e1e_wphy(hw, 0x0019, 0x008D);
-       /* Enable restart AN on an1000_dis change */
-       e1e_wphy(hw, 0x001B, 0x2080);
-       /* Enable wh_fifo read clock in 10/100 modes */
-       e1e_wphy(hw, 0x0014, 0x0045);
-       /* Restart AN, Speed selection is 1000 */
-       e1e_wphy(hw, 0x0000, 0x1340);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000e_get_phy_type_from_id - Get PHY type from id
- *  @phy_id: phy_id read from the phy
- *
- *  Returns the phy type from the id.
- **/
-enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id)
-{
-       enum e1000_phy_type phy_type = e1000_phy_unknown;
-
-       switch (phy_id) {
-       case M88E1000_I_PHY_ID:
-       case M88E1000_E_PHY_ID:
-       case M88E1111_I_PHY_ID:
-       case M88E1011_I_PHY_ID:
-               phy_type = e1000_phy_m88;
-               break;
-       case IGP01E1000_I_PHY_ID: /* IGP 1 & 2 share this */
-               phy_type = e1000_phy_igp_2;
-               break;
-       case GG82563_E_PHY_ID:
-               phy_type = e1000_phy_gg82563;
-               break;
-       case IGP03E1000_E_PHY_ID:
-               phy_type = e1000_phy_igp_3;
-               break;
-       case IFE_E_PHY_ID:
-       case IFE_PLUS_E_PHY_ID:
-       case IFE_C_E_PHY_ID:
-               phy_type = e1000_phy_ife;
-               break;
-       case BME1000_E_PHY_ID:
-       case BME1000_E_PHY_ID_R2:
-               phy_type = e1000_phy_bm;
-               break;
-       case I82578_E_PHY_ID:
-               phy_type = e1000_phy_82578;
-               break;
-       case I82577_E_PHY_ID:
-               phy_type = e1000_phy_82577;
-               break;
-       case I82579_E_PHY_ID:
-               phy_type = e1000_phy_82579;
-               break;
-       default:
-               phy_type = e1000_phy_unknown;
-               break;
-       }
-       return phy_type;
-}
-
-/**
- *  e1000e_determine_phy_address - Determines PHY address.
- *  @hw: pointer to the HW structure
- *
- *  This uses a trial and error method to loop through possible PHY
- *  addresses. It tests each by reading the PHY ID registers and
- *  checking for a match.
- **/
-s32 e1000e_determine_phy_address(struct e1000_hw *hw)
-{
-       s32 ret_val = -E1000_ERR_PHY_TYPE;
-       u32 phy_addr = 0;
-       u32 i;
-       enum e1000_phy_type phy_type = e1000_phy_unknown;
-
-       hw->phy.id = phy_type;
-
-       for (phy_addr = 0; phy_addr < E1000_MAX_PHY_ADDR; phy_addr++) {
-               hw->phy.addr = phy_addr;
-               i = 0;
-
-               do {
-                       e1000e_get_phy_id(hw);
-                       phy_type = e1000e_get_phy_type_from_id(hw->phy.id);
-
-                       /*
-                        * If phy_type is valid, break - we found our
-                        * PHY address
-                        */
-                       if (phy_type  != e1000_phy_unknown) {
-                               ret_val = E1000_SUCCESS;
-                               goto out;
-                       }
-                       msleep(1);
-                       i++;
-               } while (i < 10);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_get_phy_addr_for_bm_page - Retrieve PHY page address
- *  @page: page to access
- *
- *  Returns the phy address for the page requested.
- **/
-static u32 e1000e_get_phy_addr_for_bm_page(u32 page, u32 reg)
-{
-       u32 phy_addr = 2;
-
-       if ((page >= 768) || (page == 0 && reg == 25) || (reg == 31))
-               phy_addr = 1;
-
-       return phy_addr;
-}
-
-/**
- *  e1000e_write_phy_reg_bm - Write BM PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore, if necessary, then writes the data to PHY register
- *  at the offset.  Release any acquired semaphores before exiting.
- **/
-s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       s32 ret_val;
-       u32 page_select = 0;
-       u32 page = offset >> IGP_PAGE_SHIFT;
-       u32 page_shift = 0;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               return ret_val;
-
-       /* Page 800 works differently than the rest so it has its own func */
-       if (page == BM_WUC_PAGE) {
-               ret_val = e1000e_access_phy_wakeup_reg_bm(hw, offset, &data,
-                                                        false);
-               goto out;
-       }
-
-       hw->phy.addr = e1000e_get_phy_addr_for_bm_page(page, offset);
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-               /*
-                * Page select is register 31 for phy address 1 and 22 for
-                * phy address 2 and 3. Page select is shifted only for
-                * phy address 1.
-                */
-               if (hw->phy.addr == 1) {
-                       page_shift = IGP_PAGE_SHIFT;
-                       page_select = IGP01E1000_PHY_PAGE_SELECT;
-               } else {
-                       page_shift = 0;
-                       page_select = BM_PHY_PAGE_SELECT;
-               }
-
-               /* Page is shifted left, PHY expects (page x 32) */
-               ret_val = e1000e_write_phy_reg_mdic(hw, page_select,
-                                                  (page << page_shift));
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
-
-out:
-       hw->phy.ops.release(hw);
-       return ret_val;
-}
-
-/**
- *  e1000e_read_phy_reg_bm - Read BM PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore, if necessary, then reads the PHY register at offset
- *  and storing the retrieved information in data.  Release any acquired
- *  semaphores before exiting.
- **/
-s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       s32 ret_val;
-       u32 page_select = 0;
-       u32 page = offset >> IGP_PAGE_SHIFT;
-       u32 page_shift = 0;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               return ret_val;
-
-       /* Page 800 works differently than the rest so it has its own func */
-       if (page == BM_WUC_PAGE) {
-               ret_val = e1000e_access_phy_wakeup_reg_bm(hw, offset, data,
-                                                        true);
-               goto out;
-       }
-
-       hw->phy.addr = e1000e_get_phy_addr_for_bm_page(page, offset);
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-               /*
-                * Page select is register 31 for phy address 1 and 22 for
-                * phy address 2 and 3. Page select is shifted only for
-                * phy address 1.
-                */
-               if (hw->phy.addr == 1) {
-                       page_shift = IGP_PAGE_SHIFT;
-                       page_select = IGP01E1000_PHY_PAGE_SELECT;
-               } else {
-                       page_shift = 0;
-                       page_select = BM_PHY_PAGE_SELECT;
-               }
-
-               /* Page is shifted left, PHY expects (page x 32) */
-               ret_val = e1000e_write_phy_reg_mdic(hw, page_select,
-                                                  (page << page_shift));
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                         data);
-out:
-       hw->phy.ops.release(hw);
-       return ret_val;
-}
-
-/**
- *  e1000e_read_phy_reg_bm2 - Read BM PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore, if necessary, then reads the PHY register at offset
- *  and storing the retrieved information in data.  Release any acquired
- *  semaphores before exiting.
- **/
-s32 e1000e_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       s32 ret_val;
-       u16 page = (u16)(offset >> IGP_PAGE_SHIFT);
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               return ret_val;
-
-       /* Page 800 works differently than the rest so it has its own func */
-       if (page == BM_WUC_PAGE) {
-               ret_val = e1000e_access_phy_wakeup_reg_bm(hw, offset, data,
-                                                        true);
-               goto out;
-       }
-
-       hw->phy.addr = 1;
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-
-               /* Page is shifted left, PHY expects (page x 32) */
-               ret_val = e1000e_write_phy_reg_mdic(hw, BM_PHY_PAGE_SELECT,
-                                                  page);
-
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                         data);
-out:
-       hw->phy.ops.release(hw);
-       return ret_val;
-}
-
-/**
- *  e1000e_write_phy_reg_bm2 - Write BM PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore, if necessary, then writes the data to PHY register
- *  at the offset.  Release any acquired semaphores before exiting.
- **/
-s32 e1000e_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       s32 ret_val;
-       u16 page = (u16)(offset >> IGP_PAGE_SHIFT);
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               return ret_val;
-
-       /* Page 800 works differently than the rest so it has its own func */
-       if (page == BM_WUC_PAGE) {
-               ret_val = e1000e_access_phy_wakeup_reg_bm(hw, offset, &data,
-                                                        false);
-               goto out;
-       }
-
-       hw->phy.addr = 1;
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-               /* Page is shifted left, PHY expects (page x 32) */
-               ret_val = e1000e_write_phy_reg_mdic(hw, BM_PHY_PAGE_SELECT,
-                                                  page);
-
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
-
-out:
-       hw->phy.ops.release(hw);
-       return ret_val;
-}
-
-/**
- *  e1000e_access_phy_wakeup_reg_bm - Read BM PHY wakeup register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read or written
- *  @data: pointer to the data to read or write
- *  @read: determines if operation is read or write
- *
- *  Acquires semaphore, if necessary, then reads the PHY register at offset
- *  and storing the retrieved information in data.  Release any acquired
- *  semaphores before exiting. Note that procedure to read the wakeup
- *  registers are different. It works as such:
- *  1) Set page 769, register 17, bit 2 = 1
- *  2) Set page to 800 for host (801 if we were manageability)
- *  3) Write the address using the address opcode (0x11)
- *  4) Read or write the data using the data opcode (0x12)
- *  5) Restore 769_17.2 to its original value
- *
- *  Assumes semaphore already acquired.
- **/
-static s32 e1000e_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
-                                          u16 *data, bool read)
-{
-       s32 ret_val;
-       u16 reg = BM_PHY_REG_NUM(offset);
-       u16 phy_reg = 0;
-
-       /* Gig must be disabled for MDIO accesses to page 800 */
-       if ((hw->mac.type == e1000_pchlan) &&
-          (!(er32(PHY_CTRL) & E1000_PHY_CTRL_GBE_DISABLE)))
-               e_dbg("Attempting to access page 800 while gig enabled.\n");
-
-       /* All operations in this function are phy address 1 */
-       hw->phy.addr = 1;
-
-       /* Set page 769 */
-       e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                (BM_WUC_ENABLE_PAGE << IGP_PAGE_SHIFT));
-
-       ret_val = e1000e_read_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, &phy_reg);
-       if (ret_val) {
-               e_dbg("Could not read PHY page 769\n");
-               goto out;
-       }
-
-       /* First clear bit 4 to avoid a power state change */
-       phy_reg &= ~(BM_WUC_HOST_WU_BIT);
-       ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, phy_reg);
-       if (ret_val) {
-               e_dbg("Could not clear PHY page 769 bit 4\n");
-               goto out;
-       }
-
-       /* Write bit 2 = 1, and clear bit 4 to 769_17 */
-       ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_ENABLE_REG,
-                                          phy_reg | BM_WUC_ENABLE_BIT);
-       if (ret_val) {
-               e_dbg("Could not write PHY page 769 bit 2\n");
-               goto out;
-       }
-
-       /* Select page 800 */
-       ret_val = e1000e_write_phy_reg_mdic(hw,
-                                          IGP01E1000_PHY_PAGE_SELECT,
-                                          (BM_WUC_PAGE << IGP_PAGE_SHIFT));
-
-       /* Write the page 800 offset value using opcode 0x11 */
-       ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_ADDRESS_OPCODE, reg);
-       if (ret_val) {
-               e_dbg("Could not write address opcode to page 800\n");
-               goto out;
-       }
-
-       if (read) {
-               /* Read the page 800 value using opcode 0x12 */
-               ret_val = e1000e_read_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
-                                                 data);
-       } else {
-               /* Write the page 800 value using opcode 0x12 */
-               ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_DATA_OPCODE,
-                                                  *data);
-       }
-
-       if (ret_val) {
-               e_dbg("Could not access data value from page 800\n");
-               goto out;
-       }
-
-       /*
-        * Restore 769_17.2 to its original value
-        * Set page 769
-        */
-       e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                (BM_WUC_ENABLE_PAGE << IGP_PAGE_SHIFT));
-
-       /* Clear 769_17.2 */
-       ret_val = e1000e_write_phy_reg_mdic(hw, BM_WUC_ENABLE_REG, phy_reg);
-       if (ret_val) {
-               e_dbg("Could not clear PHY page 769 bit 2\n");
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- * e1000e_power_up_phy_copper - Restore copper link in case of PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, restore the link to previous
- * settings.
- **/
-void e1000e_power_up_phy_copper(struct e1000_hw *hw)
-{
-       u16 mii_reg = 0;
-
-       /* The PHY will retain its settings across a power down/up cycle */
-       e1e_rphy(hw, PHY_CONTROL, &mii_reg);
-       mii_reg &= ~MII_CR_POWER_DOWN;
-       e1e_wphy(hw, PHY_CONTROL, mii_reg);
-}
-
-/**
- * e1000e_power_down_phy_copper - Restore copper link in case of PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, restore the link to previous
- * settings.
- **/
-void e1000e_power_down_phy_copper(struct e1000_hw *hw)
-{
-       u16 mii_reg = 0;
-
-       /* The PHY will retain its settings across a power down/up cycle */
-       e1e_rphy(hw, PHY_CONTROL, &mii_reg);
-       mii_reg |= MII_CR_POWER_DOWN;
-       e1e_wphy(hw, PHY_CONTROL, mii_reg);
-       msleep(1);
-}
-
-/**
- *  e1000e_set_mdio_slow_mode_hv - Set slow MDIO access mode
- *  @hw:   pointer to the HW structure
- *  @slow: true for slow mode, false for normal mode
- *
- *  Assumes semaphore already acquired.
- **/
-s32 e1000e_set_mdio_slow_mode_hv(struct e1000_hw *hw, bool slow)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 data = 0;
-
-       /* Set MDIO mode - page 769, register 16: 0x2580==slow, 0x2180==fast */
-       hw->phy.addr = 1;
-       ret_val = e1000e_write_phy_reg_mdic(hw, IGP01E1000_PHY_PAGE_SELECT,
-                                        (BM_PORT_CTRL_PAGE << IGP_PAGE_SHIFT));
-       if (ret_val)
-               goto out;
-
-       ret_val = e1000e_write_phy_reg_mdic(hw, BM_CS_CTRL1,
-                                          (0x2180 | (slow << 10)));
-       if (ret_val)
-               goto out;
-
-       /* dummy read when reverting to fast mode - throw away result */
-       if (!slow)
-               ret_val = e1000e_read_phy_reg_mdic(hw, BM_CS_CTRL1, &data);
-
-out:
-       return ret_val;
-}
-
-/**
- *  __e1000e_read_phy_reg_hv -  Read HV PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *  @locked: semaphore has already been acquired or not
- *
- *  Acquires semaphore, if necessary, then reads the PHY register at offset
- *  and stores the retrieved information in data.  Release any acquired
- *  semaphore before exiting.
- **/
-static s32 __e1000e_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data,
-                                   bool locked)
-{
-       s32 ret_val;
-       u16 page = BM_PHY_REG_PAGE(offset);
-       u16 reg = BM_PHY_REG_NUM(offset);
-       bool in_slow_mode = false;
-
-       if (!locked) {
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       /* Workaround failure in MDIO access while cable is disconnected */
-       if ((hw->phy.type == e1000_phy_82577) &&
-           !(er32(STATUS) & E1000_STATUS_LU)) {
-               ret_val = e1000e_set_mdio_slow_mode_hv(hw, true);
-               if (ret_val)
-                       goto out;
-
-               in_slow_mode = true;
-       }
-
-       /* Page 800 works differently than the rest so it has its own func */
-       if (page == BM_WUC_PAGE) {
-               ret_val = e1000e_access_phy_wakeup_reg_bm(hw, offset,
-                                                        data, true);
-               goto out;
-       }
-
-       if (page > 0 && page < HV_INTC_FC_PAGE_START) {
-               ret_val = e1000e_access_phy_debug_regs_hv(hw, offset,
-                                                        data, true);
-               goto out;
-       }
-
-       hw->phy.addr = e1000e_get_phy_addr_for_hv_page(page);
-
-       if (page == HV_INTC_FC_PAGE_START)
-               page = 0;
-
-       if (reg > MAX_PHY_MULTI_PAGE_REG) {
-               u32 phy_addr = hw->phy.addr;
-
-               hw->phy.addr = 1;
-
-               /* Page is shifted left, PHY expects (page x 32) */
-               ret_val = e1000e_write_phy_reg_mdic(hw,
-                                            IGP01E1000_PHY_PAGE_SELECT,
-                                            (page << IGP_PAGE_SHIFT));
-               hw->phy.addr = phy_addr;
-
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1000e_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
-                                         data);
-out:
-       /* Revert to MDIO fast mode, if applicable */
-       if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
-               ret_val |= e1000e_set_mdio_slow_mode_hv(hw, false);
-
-       if (!locked)
-               hw->phy.ops.release(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000e_read_phy_reg_hv -  Read HV PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore then reads the PHY register at offset and stores
- *  the retrieved information in data.  Release the acquired semaphore
- *  before exiting.
- **/
-s32 e1000e_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __e1000e_read_phy_reg_hv(hw, offset, data, false);
-}
-
-/**
- *  e1000e_read_phy_reg_hv_locked -  Read HV PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Reads the PHY register at offset and stores the retrieved information
- *  in data.  Assumes semaphore already acquired.
- **/
-s32 e1000e_read_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __e1000e_read_phy_reg_hv(hw, offset, data, true);
-}
-
-/**
- *  __e1000e_write_phy_reg_hv - Write HV PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *  @locked: semaphore has already been acquired or not
- *
- *  Acquires semaphore, if necessary, then writes the data to PHY register
- *  at the offset.  Release any acquired semaphores before exiting.
- **/
-static s32 __e1000e_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
-                                    bool locked)
-{
-       s32 ret_val;
-       u16 page = BM_PHY_REG_PAGE(offset);
-       u16 reg = BM_PHY_REG_NUM(offset);
-       bool in_slow_mode = false;
-
-       if (!locked) {
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       return ret_val;
-       }
-
-       /* Workaround failure in MDIO access while cable is disconnected */
-       if ((hw->phy.type == e1000_phy_82577) &&
-           !(er32(STATUS) & E1000_STATUS_LU)) {
-               ret_val = e1000e_set_mdio_slow_mode_hv(hw, true);
-               if (ret_val)
-                       goto out;
-
-               in_slow_mode = true;
-       }
-
-       /* Page 800 works differently than the rest so it has its own func */
-       if (page == BM_WUC_PAGE) {
-               ret_val = e1000e_access_phy_wakeup_reg_bm(hw, offset,
-                                                        &data, false);
-               goto out;
-       }
-
-       if (page > 0 && page < HV_INTC_FC_PAGE_START) {
-               ret_val = e1000e_access_phy_debug_regs_hv(hw, offset,
-                                                        &data, false);
-               goto out;
-       }
-
-       hw->phy.addr = e1000e_get_phy_addr_for_hv_page(page);
-
-       if (page == HV_INTC_FC_PAGE_START)
-               page = 0;
-
-       /*
-        * Workaround MDIO accesses being disabled after entering IEEE Power
-        * Down (whenever bit 11 of the PHY Control register is set)
-        */
-       if ((hw->phy.type == e1000_phy_82578) &&
-           (hw->phy.revision >= 1) &&
-           (hw->phy.addr == 2) &&
-           ((MAX_PHY_REG_ADDRESS & reg) == 0) &&
-           (data & (1 << 11))) {
-               u16 data2 = 0x7EFF;
-               ret_val = e1000e_access_phy_debug_regs_hv(hw, (1 << 6) | 0x3,
-                                                        &data2, false);
-               if (ret_val)
-                       goto out;
-       }
-
-       if (reg > MAX_PHY_MULTI_PAGE_REG) {
-               u32 phy_addr = hw->phy.addr;
-
-               hw->phy.addr = 1;
-
-               /* Page is shifted left, PHY expects (page x 32) */
-               ret_val = e1000e_write_phy_reg_mdic(hw,
-                                            IGP01E1000_PHY_PAGE_SELECT,
-                                            (page << IGP_PAGE_SHIFT));
-               hw->phy.addr = phy_addr;
-
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = e1000e_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & reg,
-                                         data);
-
-out:
-       /* Revert to MDIO fast mode, if applicable */
-       if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
-               ret_val |= e1000e_set_mdio_slow_mode_hv(hw, false);
-
-       if (!locked)
-               hw->phy.ops.release(hw);
-
-       return ret_val;
-}
-
-/**
- *  e1000e_write_phy_reg_hv - Write HV PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore then writes the data to PHY register at the offset.
- *  Release the acquired semaphores before exiting.
- **/
-s32 e1000e_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __e1000e_write_phy_reg_hv(hw, offset, data, false);
-}
-
-/**
- *  e1000e_write_phy_reg_hv_locked - Write HV PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Writes the data to PHY register at the offset.  Assumes semaphore
- *  already acquired.
- **/
-s32 e1000e_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __e1000e_write_phy_reg_hv(hw, offset, data, true);
-}
-
-/**
- *  e1000e_get_phy_addr_for_hv_page - Get PHY adrress based on page
- *  @page: page to be accessed
- **/
-static u32 e1000e_get_phy_addr_for_hv_page(u32 page)
-{
-       u32 phy_addr = 2;
-
-       if (page >= HV_INTC_FC_PAGE_START)
-               phy_addr = 1;
-
-       return phy_addr;
-}
-
-/**
- *  e1000e_access_phy_debug_regs_hv - Read HV PHY vendor specific high registers
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read or written
- *  @data: pointer to the data to be read or written
- *  @read: determines if operation is read or written
- *
- *  Reads the PHY register at offset and stores the retreived information
- *  in data.  Assumes semaphore already acquired.  Note that the procedure
- *  to read these regs uses the address port and data port to read/write.
- **/
-static s32 e1000e_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
-                                          u16 *data, bool read)
-{
-       s32 ret_val;
-       u32 addr_reg = 0;
-       u32 data_reg = 0;
-
-       /* This takes care of the difference with desktop vs mobile phy */
-       addr_reg = (hw->phy.type == e1000_phy_82578) ?
-                  I82578_ADDR_REG : I82577_ADDR_REG;
-       data_reg = addr_reg + 1;
-
-       /* All operations in this function are phy address 2 */
-       hw->phy.addr = 2;
-
-       /* masking with 0x3F to remove the page from offset */
-       ret_val = e1000e_write_phy_reg_mdic(hw, addr_reg, (u16)offset & 0x3F);
-       if (ret_val) {
-               e_dbg("Could not write PHY the HV address register\n");
-               goto out;
-       }
-
-       /* Read or write the data value next */
-       if (read)
-               ret_val = e1000e_read_phy_reg_mdic(hw, data_reg, data);
-       else
-               ret_val = e1000e_write_phy_reg_mdic(hw, data_reg, *data);
-
-       if (ret_val) {
-               e_dbg("Could not read data value from HV data register\n");
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_link_stall_workaround_hv - Si workaround
- *  @hw: pointer to the HW structure
- *
- *  This function works around a Si bug where the link partner can get
- *  a link up indication before the PHY does.  If small packets are sent
- *  by the link partner they can be placed in the packet buffer without
- *  being properly accounted for by the PHY and will stall preventing
- *  further packets from being received.  The workaround is to clear the
- *  packet buffer after the PHY detects link up.
- **/
-s32 e1000e_link_stall_workaround_hv(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       if (hw->phy.type != e1000_phy_82578)
-               goto out;
-
-       /* Do not apply workaround if in PHY loopback bit 14 set */
-       e1e_rphy(hw, PHY_CONTROL, &data);
-       if (data & PHY_CONTROL_LB)
-               goto out;
-
-       /* check if link is up and at 1Gbps */
-       ret_val = e1e_rphy(hw, BM_CS_STATUS, &data);
-       if (ret_val)
-               goto out;
-
-       data &= BM_CS_STATUS_LINK_UP |
-               BM_CS_STATUS_RESOLVED |
-               BM_CS_STATUS_SPEED_MASK;
-
-       if (data != (BM_CS_STATUS_LINK_UP |
-                    BM_CS_STATUS_RESOLVED |
-                    BM_CS_STATUS_SPEED_1000))
-               goto out;
-
-       msleep(200);
-
-       /* flush the packets in the fifo buffer */
-       ret_val = e1e_wphy(hw, HV_MUX_DATA_CTRL,
-                                       HV_MUX_DATA_CTRL_GEN_TO_MAC |
-                                       HV_MUX_DATA_CTRL_FORCE_SPEED);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1e_wphy(hw, HV_MUX_DATA_CTRL,
-                                       HV_MUX_DATA_CTRL_GEN_TO_MAC);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000e_check_polarity_82577 - Checks the polarity.
- *  @hw: pointer to the HW structure
- *
- *  Success returns 0, Failure returns -E1000_ERR_PHY (-2)
- *
- *  Polarity is determined based on the PHY specific status register.
- **/
-s32 e1000e_check_polarity_82577(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-       ret_val = e1e_rphy(hw, I82577_PHY_STATUS_2, &data);
-
-       if (!ret_val)
-               phy->cable_polarity = (data & I82577_PHY_STATUS2_REV_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
-
-       return ret_val;
-}
-
-#if 0
-/**
- *  e1000e_phy_force_speed_duplex_82577 - Force speed/duplex for I82577 PHY
- *  @hw: pointer to the HW structure
- *
- *  Calls the PHY setup function to force speed and duplex.  Clears the
- *  auto-crossover to force MDI manually.  Waits for link and returns
- *  successful if link up is successful, else -E1000_ERR_PHY (-2).
- **/
-s32 e1000e_phy_force_speed_duplex_82577(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-       bool link;
-
-       ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       e1000e_phy_force_speed_duplex_setup(hw, &phy_data);
-
-       ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Clear Auto-Crossover to force MDI manually.  82577 requires MDI
-        * forced whenever speed and duplex are forced.
-        */
-       ret_val = e1e_rphy(hw, I82577_PHY_CTRL_2, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data &= ~I82577_PHY_CTRL2_AUTO_MDIX;
-       phy_data &= ~I82577_PHY_CTRL2_FORCE_MDI_MDIX;
-
-       ret_val = e1e_wphy(hw, I82577_PHY_CTRL_2, phy_data);
-       if (ret_val)
-               goto out;
-
-       e_dbg("I82577_PHY_CTRL_2: %X\n", phy_data);
-
-       udelay(1);
-
-       if (phy->autoneg_wait_to_complete) {
-               e_dbg("Waiting for forced speed/duplex link on 82577 phy\n");
-
-               ret_val = e1000e_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link)
-                       e_dbg("Link taking longer than expected.\n");
-
-               /* Try once more */
-               ret_val = e1000e_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-#endif
-
-/**
- *  e1000e_get_phy_info_82577 - Retrieve I82577 PHY information
- *  @hw: pointer to the HW structure
- *
- *  Read PHY status to determine if link is up.  If link is up, then
- *  set/determine 10base-T extended distance and polarity correction.  Read
- *  PHY port status to determine MDI/MDIx and speed.  Based on the speed,
- *  determine on the cable length, local and remote receiver.
- **/
-s32 e1000e_get_phy_info_82577(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-       bool link;
-
-       ret_val = e1000e_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               e_dbg("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       phy->polarity_correction = true;
-
-       ret_val = e1000e_check_polarity_82577(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = e1e_rphy(hw, I82577_PHY_STATUS_2, &data);
-       if (ret_val)
-               goto out;
-
-       phy->is_mdix = (data & I82577_PHY_STATUS2_MDIX) ? true : false;
-
-       if ((data & I82577_PHY_STATUS2_SPEED_MASK) ==
-           I82577_PHY_STATUS2_SPEED_1000MBPS) {
-#if 0
-               ret_val = e1000e_get_cable_length(hw);
-#endif
-               ret_val = -E1000_ERR_CONFIG;
-               if (ret_val)
-                       goto out;
-#if 0
-               ret_val = e1e_rphy(hw, PHY_1000T_STATUS, &data);
-               if (ret_val)
-                       goto out;
-
-               phy->local_rx = (data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
-
-               phy->remote_rx = (data & SR_1000T_REMOTE_RX_STATUS)
-                                ? e1000_1000t_rx_status_ok
-                                : e1000_1000t_rx_status_not_ok;
-#endif
-       } else {
-               phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
-               phy->local_rx = e1000_1000t_rx_status_undefined;
-               phy->remote_rx = e1000_1000t_rx_status_undefined;
-       }
-out:
-       return ret_val;
-}
-
-#if 0
-/**
- *  e1000e_get_cable_length_82577 - Determine cable length for 82577 PHY
- *  @hw: pointer to the HW structure
- *
- * Reads the diagnostic status register and verifies result is valid before
- * placing it in the phy_cable_length field.
- **/
-s32 e1000e_get_cable_length_82577(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, length;
-
-       ret_val = e1e_rphy(hw, I82577_PHY_DIAG_STATUS, &phy_data);
-       if (ret_val)
-               goto out;
-
-       length = (phy_data & I82577_DSTATUS_CABLE_LENGTH) >>
-                I82577_DSTATUS_CABLE_LENGTH_SHIFT;
-
-       if (length == E1000_CABLE_LENGTH_UNDEFINED)
-               ret_val = -E1000_ERR_PHY;
-
-       phy->cable_length = length;
-
-out:
-       return ret_val;
-}
-#endif
diff --git a/src/drivers/net/e1000e/e1000e_phy.h b/src/drivers/net/e1000e/e1000e_phy.h
deleted file mode 100644 (file)
index 9081050..0000000
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000E_PHY_H_
-#define _E1000E_PHY_H_
-
-void e1000e_init_phy_ops_generic(struct e1000_hw *hw);
-s32  e1000e_check_downshift(struct e1000_hw *hw);
-s32  e1000e_check_polarity_m88(struct e1000_hw *hw);
-s32  e1000e_check_polarity_igp(struct e1000_hw *hw);
-s32  e1000e_check_polarity_ife(struct e1000_hw *hw);
-s32  e1000e_check_reset_block_generic(struct e1000_hw *hw);
-s32  e1000e_copper_link_setup_igp(struct e1000_hw *hw);
-s32  e1000e_copper_link_setup_m88(struct e1000_hw *hw);
-#if 0
-s32  e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw);
-s32  e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw);
-s32  e1000e_phy_force_speed_duplex_ife(struct e1000_hw *hw);
-#endif
-#if 0
-s32  e1000e_get_cable_length_m88(struct e1000_hw *hw);
-s32  e1000e_get_cable_length_igp_2(struct e1000_hw *hw);
-#endif
-s32  e1000e_get_cfg_done(struct e1000_hw *hw);
-s32  e1000e_get_phy_id(struct e1000_hw *hw);
-s32  e1000e_get_phy_info_igp(struct e1000_hw *hw);
-s32  e1000e_get_phy_info_m88(struct e1000_hw *hw);
-s32  e1000e_phy_sw_reset(struct e1000_hw *hw);
-#if 0
-void e1000e_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);
-#endif
-s32  e1000e_phy_hw_reset_generic(struct e1000_hw *hw);
-s32  e1000e_phy_reset_dsp(struct e1000_hw *hw);
-s32  e1000e_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000e_read_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000e_read_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000e_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000e_set_d3_lplu_state(struct e1000_hw *hw, bool active);
-s32  e1000e_setup_copper_link(struct e1000_hw *hw);
-s32  e1000e_wait_autoneg(struct e1000_hw *hw);
-s32  e1000e_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000e_write_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000e_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000e_write_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000e_phy_reset_dsp(struct e1000_hw *hw);
-s32  e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
-                                u32 usec_interval, bool *success);
-s32  e1000e_phy_init_script_igp3(struct e1000_hw *hw);
-enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id);
-s32  e1000e_determine_phy_address(struct e1000_hw *hw);
-s32  e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000e_read_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000e_write_phy_reg_bm2(struct e1000_hw *hw, u32 offset, u16 data);
-void e1000e_power_up_phy_copper(struct e1000_hw *hw);
-void e1000e_power_down_phy_copper(struct e1000_hw *hw);
-s32  e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000e_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000e_read_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000e_read_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  e1000e_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000e_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 data);
-s32  e1000e_set_mdio_slow_mode_hv(struct e1000_hw *hw, bool slow);
-s32  e1000e_link_stall_workaround_hv(struct e1000_hw *hw);
-s32  e1000e_copper_link_setup_82577(struct e1000_hw *hw);
-s32  e1000e_check_polarity_82577(struct e1000_hw *hw);
-s32  e1000e_get_phy_info_82577(struct e1000_hw *hw);
-#if 0
-s32  e1000e_phy_force_speed_duplex_82577(struct e1000_hw *hw);
-#endif
-#if 0
-s32  e1000e_get_cable_length_82577(struct e1000_hw *hw);
-#endif
-
-#define E1000_MAX_PHY_ADDR                4
-
-/* IGP01E1000 Specific Registers */
-#define IGP01E1000_PHY_PORT_CONFIG        0x10 /* Port Config */
-#define IGP01E1000_PHY_PORT_STATUS        0x11 /* Status */
-#define IGP01E1000_PHY_PORT_CTRL          0x12 /* Control */
-#define IGP01E1000_PHY_LINK_HEALTH        0x13 /* PHY Link Health */
-#define IGP01E1000_GMII_FIFO              0x14 /* GMII FIFO */
-#define IGP01E1000_PHY_CHANNEL_QUALITY    0x15 /* PHY Channel Quality */
-#define IGP02E1000_PHY_POWER_MGMT         0x19 /* Power Management */
-#define IGP01E1000_PHY_PAGE_SELECT        0x1F /* Page Select */
-#define BM_PHY_PAGE_SELECT                22   /* Page Select for BM */
-#define IGP_PAGE_SHIFT                    5
-#define PHY_REG_MASK                      0x1F
-
-/* BM/HV Specific Registers */
-#define BM_PORT_CTRL_PAGE                 769
-#define BM_PCIE_PAGE                      770
-#define BM_WUC_PAGE                       800
-#define BM_WUC_ADDRESS_OPCODE             0x11
-#define BM_WUC_DATA_OPCODE                0x12
-#define BM_WUC_ENABLE_PAGE                BM_PORT_CTRL_PAGE
-#define BM_WUC_ENABLE_REG                 17
-#define BM_WUC_ENABLE_BIT                 (1 << 2)
-#define BM_WUC_HOST_WU_BIT                (1 << 4)
-
-#define PHY_UPPER_SHIFT                   21
-#define BM_PHY_REG(page, reg) \
-       (((reg) & MAX_PHY_REG_ADDRESS) |\
-        (((page) & 0xFFFF) << PHY_PAGE_SHIFT) |\
-        (((reg) & ~MAX_PHY_REG_ADDRESS) << (PHY_UPPER_SHIFT - PHY_PAGE_SHIFT)))
-#define BM_PHY_REG_PAGE(offset) \
-       ((u16)(((offset) >> PHY_PAGE_SHIFT) & 0xFFFF))
-#define BM_PHY_REG_NUM(offset) \
-       ((u16)(((offset) & MAX_PHY_REG_ADDRESS) |\
-        (((offset) >> (PHY_UPPER_SHIFT - PHY_PAGE_SHIFT)) &\
-               ~MAX_PHY_REG_ADDRESS)))
-
-#define HV_INTC_FC_PAGE_START             768
-#define I82578_ADDR_REG                   29
-#define I82577_ADDR_REG                   16
-#define I82577_CFG_REG                    22
-#define I82577_CFG_ASSERT_CRS_ON_TX       (1 << 15)
-#define I82577_CFG_ENABLE_DOWNSHIFT       (3 << 10) /* auto downshift 100/10 */
-#define I82577_CTRL_REG                   23
-
-/* 82577 specific PHY registers */
-#define I82577_PHY_CTRL_2            18
-#define I82577_PHY_LBK_CTRL          19
-#define I82577_PHY_STATUS_2          26
-#define I82577_PHY_DIAG_STATUS       31
-
-/* I82577 PHY Status 2 */
-#define I82577_PHY_STATUS2_REV_POLARITY   0x0400
-#define I82577_PHY_STATUS2_MDIX           0x0800
-#define I82577_PHY_STATUS2_SPEED_MASK     0x0300
-#define I82577_PHY_STATUS2_SPEED_1000MBPS 0x0200
-#define I82577_PHY_STATUS2_SPEED_100MBPS  0x0100
-
-/* I82577 PHY Control 2 */
-#define I82577_PHY_CTRL2_AUTO_MDIX        0x0400
-#define I82577_PHY_CTRL2_FORCE_MDI_MDIX   0x0200
-
-/* I82577 PHY Diagnostics Status */
-#define I82577_DSTATUS_CABLE_LENGTH       0x03FC
-#define I82577_DSTATUS_CABLE_LENGTH_SHIFT 2
-
-/* BM PHY Copper Specific Control 1 */
-#define BM_CS_CTRL1                       16
-#define BM_CS_CTRL1_ENERGY_DETECT         0x0300 /* Enable Energy Detect */
-
-/* BM PHY Copper Specific Status */
-#define BM_CS_STATUS                      17
-#define BM_CS_STATUS_ENERGY_DETECT        0x0010 /* Energy Detect Status */
-#define BM_CS_STATUS_LINK_UP              0x0400
-#define BM_CS_STATUS_RESOLVED             0x0800
-#define BM_CS_STATUS_SPEED_MASK           0xC000
-#define BM_CS_STATUS_SPEED_1000           0x8000
-
-/* 82577 Mobile Phy Status Register */
-#define HV_M_STATUS                       26
-#define HV_M_STATUS_AUTONEG_COMPLETE      0x1000
-#define HV_M_STATUS_SPEED_MASK            0x0300
-#define HV_M_STATUS_SPEED_1000            0x0200
-#define HV_M_STATUS_LINK_UP               0x0040
-
-#define IGP01E1000_PHY_PCS_INIT_REG       0x00B4
-#define IGP01E1000_PHY_POLARITY_MASK      0x0078
-
-#define IGP01E1000_PSCR_AUTO_MDIX         0x1000
-#define IGP01E1000_PSCR_FORCE_MDI_MDIX    0x2000 /* 0=MDI, 1=MDIX */
-
-#define IGP01E1000_PSCFR_SMART_SPEED      0x0080
-
-/* Enable flexible speed on link-up */
-#define IGP01E1000_GMII_FLEX_SPD          0x0010
-#define IGP01E1000_GMII_SPD               0x0020 /* Enable SPD */
-
-#define IGP02E1000_PM_SPD                 0x0001 /* Smart Power Down */
-#define IGP02E1000_PM_D0_LPLU             0x0002 /* For D0a states */
-#define IGP02E1000_PM_D3_LPLU             0x0004 /* For all other states */
-
-#define IGP01E1000_PLHR_SS_DOWNGRADE      0x8000
-
-#define IGP01E1000_PSSR_POLARITY_REVERSED 0x0002
-#define IGP01E1000_PSSR_MDIX              0x0800
-#define IGP01E1000_PSSR_SPEED_MASK        0xC000
-#define IGP01E1000_PSSR_SPEED_1000MBPS    0xC000
-
-#define IGP02E1000_PHY_CHANNEL_NUM        4
-#define IGP02E1000_PHY_AGC_A              0x11B1
-#define IGP02E1000_PHY_AGC_B              0x12B1
-#define IGP02E1000_PHY_AGC_C              0x14B1
-#define IGP02E1000_PHY_AGC_D              0x18B1
-
-#define IGP02E1000_AGC_LENGTH_SHIFT       9   /* Course - 15:13, Fine - 12:9 */
-#define IGP02E1000_AGC_LENGTH_MASK        0x7F
-#define IGP02E1000_AGC_RANGE              15
-
-#define IGP03E1000_PHY_MISC_CTRL          0x1B
-#define IGP03E1000_PHY_MISC_DUPLEX_MANUAL_SET  0x1000 /* Manually Set Duplex */
-
-#define E1000_CABLE_LENGTH_UNDEFINED      0xFF
-
-#define E1000_KMRNCTRLSTA_OFFSET          0x001F0000
-#define E1000_KMRNCTRLSTA_OFFSET_SHIFT    16
-#define E1000_KMRNCTRLSTA_REN             0x00200000
-#define E1000_KMRNCTRLSTA_DIAG_OFFSET     0x3    /* Kumeran Diagnostic */
-#define E1000_KMRNCTRLSTA_TIMEOUTS        0x4    /* Kumeran Timeouts */
-#define E1000_KMRNCTRLSTA_INBAND_PARAM    0x9    /* Kumeran InBand Parameters */
-#define E1000_KMRNCTRLSTA_DIAG_NELPBK     0x1000 /* Nearend Loopback mode */
-#define E1000_KMRNCTRLSTA_K1_CONFIG        0x7
-#define E1000_KMRNCTRLSTA_K1_ENABLE        0x0002
-
-#define IFE_PHY_EXTENDED_STATUS_CONTROL 0x10
-#define IFE_PHY_SPECIAL_CONTROL     0x11 /* 100BaseTx PHY Special Control */
-#define IFE_PHY_SPECIAL_CONTROL_LED 0x1B /* PHY Special and LED Control */
-#define IFE_PHY_MDIX_CONTROL        0x1C /* MDI/MDI-X Control */
-
-/* IFE PHY Extended Status Control */
-#define IFE_PESC_POLARITY_REVERSED    0x0100
-
-/* IFE PHY Special Control */
-#define IFE_PSC_AUTO_POLARITY_DISABLE      0x0010
-#define IFE_PSC_FORCE_POLARITY             0x0020
-#define IFE_PSC_DISABLE_DYNAMIC_POWER_DOWN 0x0100
-
-/* IFE PHY Special Control and LED Control */
-#define IFE_PSCL_PROBE_MODE            0x0020
-#define IFE_PSCL_PROBE_LEDS_OFF        0x0006 /* Force LEDs 0 and 2 off */
-#define IFE_PSCL_PROBE_LEDS_ON         0x0007 /* Force LEDs 0 and 2 on */
-
-/* IFE PHY MDIX Control */
-#define IFE_PMC_MDIX_STATUS      0x0020 /* 1=MDI-X, 0=MDI */
-#define IFE_PMC_FORCE_MDIX       0x0040 /* 1=force MDI-X, 0=force MDI */
-#define IFE_PMC_AUTO_MDIX        0x0080 /* 1=enable auto MDI/MDI-X, 0=disable */
-
-#endif
diff --git a/src/drivers/net/e1000e/e1000e_regs.h b/src/drivers/net/e1000e/e1000e_regs.h
deleted file mode 100644 (file)
index 064d92c..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_OR_LATER );
-
-#ifndef _E1000E_REGS_H_
-#define _E1000E_REGS_H_
-
-#define E1000_CTRL     0x00000  /* Device Control - RW */
-#define E1000_CTRL_DUP 0x00004  /* Device Control Duplicate (Shadow) - RW */
-#define E1000_STATUS   0x00008  /* Device Status - RO */
-#define E1000_EECD     0x00010  /* EEPROM/Flash Control - RW */
-#define E1000_EERD     0x00014  /* EEPROM Read - RW */
-#define E1000_CTRL_EXT 0x00018  /* Extended Device Control - RW */
-#define E1000_FLA      0x0001C  /* Flash Access - RW */
-#define E1000_MDIC     0x00020  /* MDI Control - RW */
-#define E1000_SCTL     0x00024  /* SerDes Control - RW */
-#define E1000_FCAL     0x00028  /* Flow Control Address Low - RW */
-#define E1000_FCAH     0x0002C  /* Flow Control Address High -RW */
-#define E1000_FEXT     0x0002C  /* Future Extended - RW */
-#define E1000_FEXTNVM  0x00028  /* Future Extended NVM - RW */
-#define E1000_FCT      0x00030  /* Flow Control Type - RW */
-#define E1000_CONNSW   0x00034  /* Copper/Fiber switch control - RW */
-#define E1000_VET      0x00038  /* VLAN Ether Type - RW */
-#define E1000_ICR      0x000C0  /* Interrupt Cause Read - R/clr */
-#define E1000_ITR      0x000C4  /* Interrupt Throttling Rate - RW */
-#define E1000_ICS      0x000C8  /* Interrupt Cause Set - WO */
-#define E1000_IMS      0x000D0  /* Interrupt Mask Set - RW */
-#define E1000_IMC      0x000D8  /* Interrupt Mask Clear - WO */
-#define E1000_IAM      0x000E0  /* Interrupt Acknowledge Auto Mask */
-#define E1000_IVAR     0x000E4  /* Interrupt Vector Allocation Register - RW */
-#define E1000_SVCR     0x000F0
-#define E1000_SVT       0x000F4
-#define E1000_RCTL     0x00100  /* Rx Control - RW */
-#define E1000_FCTTV    0x00170  /* Flow Control Transmit Timer Value - RW */
-#define E1000_TXCW     0x00178  /* Tx Configuration Word - RW */
-#define E1000_RXCW     0x00180  /* Rx Configuration Word - RO */
-#define E1000_PBA_ECC  0x01100  /* PBA ECC Register */
-#define E1000_TCTL     0x00400  /* Tx Control - RW */
-#define E1000_TCTL_EXT 0x00404  /* Extended Tx Control - RW */
-#define E1000_TIPG     0x00410  /* Tx Inter-packet gap -RW */
-#define E1000_TBT      0x00448  /* Tx Burst Timer - RW */
-#define E1000_AIT      0x00458  /* Adaptive Interframe Spacing Throttle - RW */
-#define E1000_LEDCTL   0x00E00  /* LED Control - RW */
-#define E1000_EXTCNF_CTRL  0x00F00  /* Extended Configuration Control */
-#define E1000_EXTCNF_SIZE  0x00F08  /* Extended Configuration Size */
-#define E1000_PHY_CTRL     0x00F10  /* PHY Control Register in CSR */
-#define E1000_PBA      0x01000  /* Packet Buffer Allocation - RW */
-#define E1000_PBS      0x01008  /* Packet Buffer Size */
-#define E1000_EEMNGCTL 0x01010  /* MNG EEprom Control */
-#define E1000_EEARBC   0x01024  /* EEPROM Auto Read Bus Control */
-#define E1000_FLASHT   0x01028  /* FLASH Timer Register */
-#define E1000_EEWR     0x0102C  /* EEPROM Write Register - RW */
-#define E1000_FLSWCTL  0x01030  /* FLASH control register */
-#define E1000_FLSWDATA 0x01034  /* FLASH data register */
-#define E1000_FLSWCNT  0x01038  /* FLASH Access Counter */
-#define E1000_FLOP     0x0103C  /* FLASH Opcode Register */
-#define E1000_I2CCMD   0x01028  /* SFPI2C Command Register - RW */
-#define E1000_I2CPARAMS 0x0102C /* SFPI2C Parameters Register - RW */
-#define E1000_WDSTP    0x01040  /* Watchdog Setup - RW */
-#define E1000_SWDSTS   0x01044  /* SW Device Status - RW */
-#define E1000_FRTIMER  0x01048  /* Free Running Timer - RW */
-#define E1000_ERT      0x02008  /* Early Rx Threshold - RW */
-#define E1000_FCRTL    0x02160  /* Flow Control Receive Threshold Low - RW */
-#define E1000_FCRTH    0x02168  /* Flow Control Receive Threshold High - RW */
-#define E1000_PSRCTL   0x02170  /* Packet Split Receive Control - RW */
-#define E1000_RDFPCQ(_n)  (0x02430 + (0x4 * (_n)))
-#define E1000_PBRTH    0x02458  /* PB Rx Arbitration Threshold - RW */
-#define E1000_FCRTV    0x02460  /* Flow Control Refresh Timer Value - RW */
-/* Split and Replication Rx Control - RW */
-#define E1000_RDPUMB   0x025CC  /* DMA Rx Descriptor uC Mailbox - RW */
-#define E1000_RDPUAD   0x025D0  /* DMA Rx Descriptor uC Addr Command - RW */
-#define E1000_RDPUWD   0x025D4  /* DMA Rx Descriptor uC Data Write - RW */
-#define E1000_RDPURD   0x025D8  /* DMA Rx Descriptor uC Data Read - RW */
-#define E1000_RDPUCTL  0x025DC  /* DMA Rx Descriptor uC Control - RW */
-#define E1000_RDTR     0x02820  /* Rx Delay Timer - RW */
-#define E1000_RADV     0x0282C  /* Rx Interrupt Absolute Delay Timer - RW */
-/*
- * Convenience macros
- *
- * Note: "_n" is the queue number of the register to be written to.
- *
- * Example usage:
- * E1000_RDBAL_REG(current_rx_queue)
- */
-#define E1000_RDBAL(_n)      ((_n) < 4 ? (0x02800 + ((_n) * 0x100)) : \
-                                         (0x0C000 + ((_n) * 0x40)))
-#define E1000_RDBAH(_n)      ((_n) < 4 ? (0x02804 + ((_n) * 0x100)) : \
-                                         (0x0C004 + ((_n) * 0x40)))
-#define E1000_RDLEN(_n)      ((_n) < 4 ? (0x02808 + ((_n) * 0x100)) : \
-                                         (0x0C008 + ((_n) * 0x40)))
-#define E1000_SRRCTL(_n)     ((_n) < 4 ? (0x0280C + ((_n) * 0x100)) : \
-                                         (0x0C00C + ((_n) * 0x40)))
-#define E1000_RDH(_n)        ((_n) < 4 ? (0x02810 + ((_n) * 0x100)) : \
-                                         (0x0C010 + ((_n) * 0x40)))
-#define E1000_RXCTL(_n)      ((_n) < 4 ? (0x02814 + ((_n) * 0x100)) : \
-                                         (0x0C014 + ((_n) * 0x40)))
-#define E1000_DCA_RXCTRL(_n) E1000_RXCTL(_n)
-#define E1000_RDT(_n)        ((_n) < 4 ? (0x02818 + ((_n) * 0x100)) : \
-                                         (0x0C018 + ((_n) * 0x40)))
-#define E1000_RXDCTL(_n)     ((_n) < 4 ? (0x02828 + ((_n) * 0x100)) : \
-                                         (0x0C028 + ((_n) * 0x40)))
-#define E1000_RQDPC(_n)      ((_n) < 4 ? (0x02830 + ((_n) * 0x100)) : \
-                                         (0x0C030 + ((_n) * 0x40)))
-#define E1000_TDBAL(_n)      ((_n) < 4 ? (0x03800 + ((_n) * 0x100)) : \
-                                         (0x0E000 + ((_n) * 0x40)))
-#define E1000_TDBAH(_n)      ((_n) < 4 ? (0x03804 + ((_n) * 0x100)) : \
-                                         (0x0E004 + ((_n) * 0x40)))
-#define E1000_TDLEN(_n)      ((_n) < 4 ? (0x03808 + ((_n) * 0x100)) : \
-                                         (0x0E008 + ((_n) * 0x40)))
-#define E1000_TDH(_n)        ((_n) < 4 ? (0x03810 + ((_n) * 0x100)) : \
-                                         (0x0E010 + ((_n) * 0x40)))
-#define E1000_TXCTL(_n)      ((_n) < 4 ? (0x03814 + ((_n) * 0x100)) : \
-                                         (0x0E014 + ((_n) * 0x40)))
-#define E1000_DCA_TXCTRL(_n) E1000_TXCTL(_n)
-#define E1000_TDT(_n)        ((_n) < 4 ? (0x03818 + ((_n) * 0x100)) : \
-                                         (0x0E018 + ((_n) * 0x40)))
-#define E1000_TXDCTL(_n)     ((_n) < 4 ? (0x03828 + ((_n) * 0x100)) : \
-                                         (0x0E028 + ((_n) * 0x40)))
-#define E1000_TDWBAL(_n)     ((_n) < 4 ? (0x03838 + ((_n) * 0x100)) : \
-                                         (0x0E038 + ((_n) * 0x40)))
-#define E1000_TDWBAH(_n)     ((_n) < 4 ? (0x0383C + ((_n) * 0x100)) : \
-                                         (0x0E03C + ((_n) * 0x40)))
-#define E1000_TARC(_n)                   (0x03840 + ((_n) * 0x100))
-#define E1000_RSRPD    0x02C00  /* Rx Small Packet Detect - RW */
-#define E1000_RAID     0x02C08  /* Receive Ack Interrupt Delay - RW */
-#define E1000_TXDMAC   0x03000  /* Tx DMA Control - RW */
-#define E1000_KABGTXD  0x03004  /* AFE Band Gap Transmit Ref Data */
-#define E1000_PSRTYPE(_i)       (0x05480 + ((_i) * 4))
-#define E1000_RAL(_i)  (((_i) <= 15) ? (0x05400 + ((_i) * 8)) : \
-                                       (0x054E0 + ((_i - 16) * 8)))
-#define E1000_RAH(_i)  (((_i) <= 15) ? (0x05404 + ((_i) * 8)) : \
-                                       (0x054E4 + ((_i - 16) * 8)))
-#define E1000_IP4AT_REG(_i)     (0x05840 + ((_i) * 8))
-#define E1000_IP6AT_REG(_i)     (0x05880 + ((_i) * 4))
-#define E1000_WUPM_REG(_i)      (0x05A00 + ((_i) * 4))
-#define E1000_FFMT_REG(_i)      (0x09000 + ((_i) * 8))
-#define E1000_FFVT_REG(_i)      (0x09800 + ((_i) * 8))
-#define E1000_FFLT_REG(_i)      (0x05F00 + ((_i) * 8))
-#define E1000_TDFH     0x03410  /* Tx Data FIFO Head - RW */
-#define E1000_TDFT     0x03418  /* Tx Data FIFO Tail - RW */
-#define E1000_TDFHS    0x03420  /* Tx Data FIFO Head Saved - RW */
-#define E1000_TDFTS    0x03428  /* Tx Data FIFO Tail Saved - RW */
-#define E1000_TDFPC    0x03430  /* Tx Data FIFO Packet Count - RW */
-#define E1000_TDPUMB   0x0357C  /* DMA Tx Descriptor uC Mail Box - RW */
-#define E1000_TDPUAD   0x03580  /* DMA Tx Descriptor uC Addr Command - RW */
-#define E1000_TDPUWD   0x03584  /* DMA Tx Descriptor uC Data Write - RW */
-#define E1000_TDPURD   0x03588  /* DMA Tx Descriptor uC Data  Read  - RW */
-#define E1000_TDPUCTL  0x0358C  /* DMA Tx Descriptor uC Control - RW */
-#define E1000_DTXCTL   0x03590  /* DMA Tx Control - RW */
-#define E1000_TIDV     0x03820  /* Tx Interrupt Delay Value - RW */
-#define E1000_TADV     0x0382C  /* Tx Interrupt Absolute Delay Val - RW */
-#define E1000_TSPMT    0x03830  /* TCP Segmentation PAD & Min Threshold - RW */
-#define E1000_CRCERRS  0x04000  /* CRC Error Count - R/clr */
-#define E1000_ALGNERRC 0x04004  /* Alignment Error Count - R/clr */
-#define E1000_SYMERRS  0x04008  /* Symbol Error Count - R/clr */
-#define E1000_RXERRC   0x0400C  /* Receive Error Count - R/clr */
-#define E1000_MPC      0x04010  /* Missed Packet Count - R/clr */
-#define E1000_SCC      0x04014  /* Single Collision Count - R/clr */
-#define E1000_ECOL     0x04018  /* Excessive Collision Count - R/clr */
-#define E1000_MCC      0x0401C  /* Multiple Collision Count - R/clr */
-#define E1000_LATECOL  0x04020  /* Late Collision Count - R/clr */
-#define E1000_COLC     0x04028  /* Collision Count - R/clr */
-#define E1000_DC       0x04030  /* Defer Count - R/clr */
-#define E1000_TNCRS    0x04034  /* Tx-No CRS - R/clr */
-#define E1000_SEC      0x04038  /* Sequence Error Count - R/clr */
-#define E1000_CEXTERR  0x0403C  /* Carrier Extension Error Count - R/clr */
-#define E1000_RLEC     0x04040  /* Receive Length Error Count - R/clr */
-#define E1000_XONRXC   0x04048  /* XON Rx Count - R/clr */
-#define E1000_XONTXC   0x0404C  /* XON Tx Count - R/clr */
-#define E1000_XOFFRXC  0x04050  /* XOFF Rx Count - R/clr */
-#define E1000_XOFFTXC  0x04054  /* XOFF Tx Count - R/clr */
-#define E1000_FCRUC    0x04058  /* Flow Control Rx Unsupported Count- R/clr */
-#define E1000_PRC64    0x0405C  /* Packets Rx (64 bytes) - R/clr */
-#define E1000_PRC127   0x04060  /* Packets Rx (65-127 bytes) - R/clr */
-#define E1000_PRC255   0x04064  /* Packets Rx (128-255 bytes) - R/clr */
-#define E1000_PRC511   0x04068  /* Packets Rx (255-511 bytes) - R/clr */
-#define E1000_PRC1023  0x0406C  /* Packets Rx (512-1023 bytes) - R/clr */
-#define E1000_PRC1522  0x04070  /* Packets Rx (1024-1522 bytes) - R/clr */
-#define E1000_GPRC     0x04074  /* Good Packets Rx Count - R/clr */
-#define E1000_BPRC     0x04078  /* Broadcast Packets Rx Count - R/clr */
-#define E1000_MPRC     0x0407C  /* Multicast Packets Rx Count - R/clr */
-#define E1000_GPTC     0x04080  /* Good Packets Tx Count - R/clr */
-#define E1000_GORCL    0x04088  /* Good Octets Rx Count Low - R/clr */
-#define E1000_GORCH    0x0408C  /* Good Octets Rx Count High - R/clr */
-#define E1000_GOTCL    0x04090  /* Good Octets Tx Count Low - R/clr */
-#define E1000_GOTCH    0x04094  /* Good Octets Tx Count High - R/clr */
-#define E1000_RNBC     0x040A0  /* Rx No Buffers Count - R/clr */
-#define E1000_RUC      0x040A4  /* Rx Undersize Count - R/clr */
-#define E1000_RFC      0x040A8  /* Rx Fragment Count - R/clr */
-#define E1000_ROC      0x040AC  /* Rx Oversize Count - R/clr */
-#define E1000_RJC      0x040B0  /* Rx Jabber Count - R/clr */
-#define E1000_MGTPRC   0x040B4  /* Management Packets Rx Count - R/clr */
-#define E1000_MGTPDC   0x040B8  /* Management Packets Dropped Count - R/clr */
-#define E1000_MGTPTC   0x040BC  /* Management Packets Tx Count - R/clr */
-#define E1000_TORL     0x040C0  /* Total Octets Rx Low - R/clr */
-#define E1000_TORH     0x040C4  /* Total Octets Rx High - R/clr */
-#define E1000_TOTL     0x040C8  /* Total Octets Tx Low - R/clr */
-#define E1000_TOTH     0x040CC  /* Total Octets Tx High - R/clr */
-#define E1000_TPR      0x040D0  /* Total Packets Rx - R/clr */
-#define E1000_TPT      0x040D4  /* Total Packets Tx - R/clr */
-#define E1000_PTC64    0x040D8  /* Packets Tx (64 bytes) - R/clr */
-#define E1000_PTC127   0x040DC  /* Packets Tx (65-127 bytes) - R/clr */
-#define E1000_PTC255   0x040E0  /* Packets Tx (128-255 bytes) - R/clr */
-#define E1000_PTC511   0x040E4  /* Packets Tx (256-511 bytes) - R/clr */
-#define E1000_PTC1023  0x040E8  /* Packets Tx (512-1023 bytes) - R/clr */
-#define E1000_PTC1522  0x040EC  /* Packets Tx (1024-1522 Bytes) - R/clr */
-#define E1000_MPTC     0x040F0  /* Multicast Packets Tx Count - R/clr */
-#define E1000_BPTC     0x040F4  /* Broadcast Packets Tx Count - R/clr */
-#define E1000_TSCTC    0x040F8  /* TCP Segmentation Context Tx - R/clr */
-#define E1000_TSCTFC   0x040FC  /* TCP Segmentation Context Tx Fail - R/clr */
-#define E1000_IAC      0x04100  /* Interrupt Assertion Count */
-#define E1000_ICRXPTC  0x04104  /* Interrupt Cause Rx Pkt Timer Expire Count */
-#define E1000_ICRXATC  0x04108  /* Interrupt Cause Rx Abs Timer Expire Count */
-#define E1000_ICTXPTC  0x0410C  /* Interrupt Cause Tx Pkt Timer Expire Count */
-#define E1000_ICTXATC  0x04110  /* Interrupt Cause Tx Abs Timer Expire Count */
-#define E1000_ICTXQEC  0x04118  /* Interrupt Cause Tx Queue Empty Count */
-#define E1000_ICTXQMTC 0x0411C  /* Interrupt Cause Tx Queue Min Thresh Count */
-#define E1000_ICRXDMTC 0x04120  /* Interrupt Cause Rx Desc Min Thresh Count */
-#define E1000_ICRXOC   0x04124  /* Interrupt Cause Receiver Overrun Count */
-#define E1000_CRC_OFFSET 0x05F50  /* CRC Offset register */
-
-#define E1000_PCS_CFG0    0x04200  /* PCS Configuration 0 - RW */
-#define E1000_PCS_LCTL    0x04208  /* PCS Link Control - RW */
-#define E1000_PCS_LSTAT   0x0420C  /* PCS Link Status - RO */
-#define E1000_CBTMPC      0x0402C  /* Circuit Breaker Tx Packet Count */
-#define E1000_HTDPMC      0x0403C  /* Host Transmit Discarded Packets */
-#define E1000_CBRDPC      0x04044  /* Circuit Breaker Rx Dropped Count */
-#define E1000_CBRMPC      0x040FC  /* Circuit Breaker Rx Packet Count */
-#define E1000_RPTHC       0x04104  /* Rx Packets To Host */
-#define E1000_HGPTC       0x04118  /* Host Good Packets Tx Count */
-#define E1000_HTCBDPC     0x04124  /* Host Tx Circuit Breaker Dropped Count */
-#define E1000_HGORCL      0x04128  /* Host Good Octets Received Count Low */
-#define E1000_HGORCH      0x0412C  /* Host Good Octets Received Count High */
-#define E1000_HGOTCL      0x04130  /* Host Good Octets Transmit Count Low */
-#define E1000_HGOTCH      0x04134  /* Host Good Octets Transmit Count High */
-#define E1000_LENERRS     0x04138  /* Length Errors Count */
-#define E1000_SCVPC       0x04228  /* SerDes/SGMII Code Violation Pkt Count */
-#define E1000_HRMPC       0x0A018  /* Header Redirection Missed Packet Count */
-#define E1000_PCS_ANADV   0x04218  /* AN advertisement - RW */
-#define E1000_PCS_LPAB    0x0421C  /* Link Partner Ability - RW */
-#define E1000_PCS_NPTX    0x04220  /* AN Next Page Transmit - RW */
-#define E1000_PCS_LPABNP  0x04224  /* Link Partner Ability Next Page - RW */
-#define E1000_1GSTAT_RCV  0x04228  /* 1GSTAT Code Violation Packet Count - RW */
-#define E1000_RXCSUM   0x05000  /* Rx Checksum Control - RW */
-#define E1000_RLPML    0x05004  /* Rx Long Packet Max Length */
-#define E1000_RFCTL    0x05008  /* Receive Filter Control*/
-#define E1000_MTA      0x05200  /* Multicast Table Array - RW Array */
-#define E1000_RA       0x05400  /* Receive Address - RW Array */
-#define E1000_VFTA     0x05600  /* VLAN Filter Table Array - RW Array */
-#define E1000_VT_CTL   0x0581C  /* VMDq Control - RW */
-#define E1000_VFQA0    0x0B000  /* VLAN Filter Queue Array 0 - RW Array */
-#define E1000_VFQA1    0x0B200  /* VLAN Filter Queue Array 1 - RW Array */
-#define E1000_WUC      0x05800  /* Wakeup Control - RW */
-#define E1000_WUFC     0x05808  /* Wakeup Filter Control - RW */
-#define E1000_WUS      0x05810  /* Wakeup Status - RO */
-#define E1000_MANC     0x05820  /* Management Control - RW */
-#define E1000_IPAV     0x05838  /* IP Address Valid - RW */
-#define E1000_IP4AT    0x05840  /* IPv4 Address Table - RW Array */
-#define E1000_IP6AT    0x05880  /* IPv6 Address Table - RW Array */
-#define E1000_WUPL     0x05900  /* Wakeup Packet Length - RW */
-#define E1000_WUPM     0x05A00  /* Wakeup Packet Memory - RO A */
-#define E1000_PBACL    0x05B68  /* MSIx PBA Clear - Read/Write 1's to clear */
-#define E1000_FFLT     0x05F00  /* Flexible Filter Length Table - RW Array */
-#define E1000_HOST_IF  0x08800  /* Host Interface */
-#define E1000_FFMT     0x09000  /* Flexible Filter Mask Table - RW Array */
-#define E1000_FFVT     0x09800  /* Flexible Filter Value Table - RW Array */
-
-#define E1000_KMRNCTRLSTA 0x00034 /* MAC-PHY interface - RW */
-#define E1000_MDPHYA      0x0003C /* PHY address - RW */
-#define E1000_MANC2H      0x05860 /* Management Control To Host - RW */
-#define E1000_SW_FW_SYNC  0x05B5C /* Software-Firmware Synchronization - RW */
-#define E1000_CCMCTL      0x05B48 /* CCM Control Register */
-#define E1000_GIOCTL      0x05B44 /* GIO Analog Control Register */
-#define E1000_SCCTL       0x05B4C /* PCIc PLL Configuration Register */
-#define E1000_GCR         0x05B00 /* PCI-Ex Control */
-#define E1000_GCR2        0x05B64 /* PCI-Ex Control #2 */
-#define E1000_GSCL_1    0x05B10 /* PCI-Ex Statistic Control #1 */
-#define E1000_GSCL_2    0x05B14 /* PCI-Ex Statistic Control #2 */
-#define E1000_GSCL_3    0x05B18 /* PCI-Ex Statistic Control #3 */
-#define E1000_GSCL_4    0x05B1C /* PCI-Ex Statistic Control #4 */
-#define E1000_FACTPS    0x05B30 /* Function Active and Power State to MNG */
-#define E1000_SWSM      0x05B50 /* SW Semaphore */
-#define E1000_FWSM      0x05B54 /* FW Semaphore */
-#define E1000_SWSM2     0x05B58 /* Driver-only SW semaphore (not used by BOOT agents) */
-#define E1000_DCA_ID    0x05B70 /* DCA Requester ID Information - RO */
-#define E1000_DCA_CTRL  0x05B74 /* DCA Control - RW */
-#define E1000_FFLT_DBG  0x05F04 /* Debug Register */
-#define E1000_HICR      0x08F00 /* Host Interface Control */
-
-/* RSS registers */
-#define E1000_CPUVEC    0x02C10 /* CPU Vector Register - RW */
-#define E1000_MRQC      0x05818 /* Multiple Receive Control - RW */
-#define E1000_IMIR(_i)      (0x05A80 + ((_i) * 4))  /* Immediate Interrupt */
-#define E1000_IMIREXT(_i)   (0x05AA0 + ((_i) * 4))  /* Immediate Interrupt Ext*/
-#define E1000_IMIRVP    0x05AC0 /* Immediate Interrupt Rx VLAN Priority - RW */
-#define E1000_MSIXBM(_i)    (0x01600 + ((_i) * 4)) /* MSI-X Allocation Register
-                                                    * (_i) - RW */
-#define E1000_MSIXTADD(_i)  (0x0C000 + ((_i) * 0x10)) /* MSI-X Table entry addr
-                                                       * low reg - RW */
-#define E1000_MSIXTUADD(_i) (0x0C004 + ((_i) * 0x10)) /* MSI-X Table entry addr
-                                                       * upper reg - RW */
-#define E1000_MSIXTMSG(_i)  (0x0C008 + ((_i) * 0x10)) /* MSI-X Table entry
-                                                       * message reg - RW */
-#define E1000_MSIXVCTRL(_i) (0x0C00C + ((_i) * 0x10)) /* MSI-X Table entry
-                                                       * vector ctrl reg - RW */
-#define E1000_MSIXPBA    0x0E000 /* MSI-X Pending bit array */
-#define E1000_RETA(_i)  (0x05C00 + ((_i) * 4)) /* Redirection Table - RW */
-#define E1000_RSSRK(_i) (0x05C80 + ((_i) * 4)) /* RSS Random Key - RW */
-#define E1000_RSSIM     0x05864 /* RSS Interrupt Mask */
-#define E1000_RSSIR     0x05868 /* RSS Interrupt Request */
-#define E1000_RXMTRL     0x0B634 /* Time sync Rx EtherType and Msg Type - RW */
-#define E1000_RXUDP      0x0B638 /* Time Sync Rx UDP Port - RW */
-
-#endif
diff --git a/src/drivers/net/igb/igb.c b/src/drivers/net/igb/igb.c
deleted file mode 100644 (file)
index cd5db1f..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
-
-  Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  Linux NICS <linux.nics@intel.com>
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-REQUIRE_OBJECT(igb_main);
-REQUIRE_OBJECT(igb_82575);
diff --git a/src/drivers/net/igb/igb.h b/src/drivers/net/igb/igb.h
deleted file mode 100644 (file)
index c8e8205..0000000
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-/* Linux PRO/1000 Ethernet Driver main header file */
-
-#ifndef _IGB_H_
-#define _IGB_H_
-
-#include "igb_api.h"
-
-extern int igb_probe ( struct pci_device *pdev );
-extern void igb_remove ( struct pci_device *pdev );
-
-struct igb_adapter;
-
-/* Interrupt defines */
-#define IGB_START_ITR                    648 /* ~6000 ints/sec */
-
-/* Interrupt modes, as used by the IntMode paramter */
-#define IGB_INT_MODE_LEGACY                0
-#define IGB_INT_MODE_MSI                   1
-#define IGB_INT_MODE_MSIX                  2
-
-#define HW_PERF
-/* TX/RX descriptor defines */
-#define IGB_DEFAULT_TXD                  256
-#define IGB_MIN_TXD                       80
-#define IGB_MAX_TXD                     4096
-
-#define IGB_DEFAULT_RXD                  256
-#define IGB_MIN_RXD                       80
-#define IGB_MAX_RXD                     4096
-
-#define IGB_MIN_ITR_USECS                 10 /* 100k irq/sec */
-#define IGB_MAX_ITR_USECS               8191 /* 120  irq/sec */
-
-#define NON_Q_VECTORS                      1
-#define MAX_Q_VECTORS                      8
-
-/* Transmit and receive queues */
-#define IGB_MAX_RX_QUEUES                  (adapter->vfs_allocated_count ? 2 : \
-                                           (hw->mac.type > e1000_82575 ? 8 : 4))
-#define IGB_ABS_MAX_TX_QUEUES              8
-#define IGB_MAX_TX_QUEUES                  IGB_MAX_RX_QUEUES
-
-#define IGB_MAX_VF_MC_ENTRIES              30
-#define IGB_MAX_VF_FUNCTIONS               8
-#define IGB_MAX_VFTA_ENTRIES               128
-#define IGB_MAX_UTA_ENTRIES                128
-#define MAX_EMULATION_MAC_ADDRS            16
-#define OUI_LEN                            3
-
-struct vf_data_storage {
-       unsigned char vf_mac_addresses[ETH_ALEN];
-       u16 vf_mc_hashes[IGB_MAX_VF_MC_ENTRIES];
-       u16 num_vf_mc_hashes;
-       u16 default_vf_vlan_id;
-       u16 vlans_enabled;
-       unsigned char em_mac_addresses[MAX_EMULATION_MAC_ADDRS * ETH_ALEN];
-       u32 uta_table_copy[IGB_MAX_UTA_ENTRIES];
-       u32 flags;
-       unsigned long last_nack;
-};
-
-#define IGB_VF_FLAG_CTS            0x00000001 /* VF is clear to send data */
-#define IGB_VF_FLAG_UNI_PROMISC    0x00000002 /* VF has unicast promisc */
-#define IGB_VF_FLAG_MULTI_PROMISC  0x00000004 /* VF has multicast promisc */
-
-/* RX descriptor control thresholds.
- * PTHRESH - MAC will consider prefetch if it has fewer than this number of
- *           descriptors available in its onboard memory.
- *           Setting this to 0 disables RX descriptor prefetch.
- * HTHRESH - MAC will only prefetch if there are at least this many descriptors
- *           available in host memory.
- *           If PTHRESH is 0, this should also be 0.
- * WTHRESH - RX descriptor writeback threshold - MAC will delay writing back
- *           descriptors until either it has this many to write back, or the
- *           ITR timer expires.
- */
-#define IGB_RX_PTHRESH                    (hw->mac.type <= e1000_82576 ? 16 : 8)
-#define IGB_RX_HTHRESH                     8
-#define IGB_RX_WTHRESH                     1
-#define IGB_TX_PTHRESH                     8
-#define IGB_TX_HTHRESH                     1
-#define IGB_TX_WTHRESH                     ((hw->mac.type == e1000_82576 && \
-                                             adapter->msix_entries) ? 0 : 16)
-
-/* this is the size past which hardware will drop packets when setting LPE=0 */
-#define MAXIMUM_ETHERNET_VLAN_SIZE 1522
-
-/* Supported Rx Buffer Sizes */
-#define IGB_RXBUFFER_128   128    /* Used for packet split */
-#define IGB_RXBUFFER_256   256    /* Used for packet split */
-#define IGB_RXBUFFER_512   512
-#define IGB_RXBUFFER_1024  1024
-#define IGB_RXBUFFER_2048  2048
-#define IGB_RXBUFFER_4096  4096
-#define IGB_RXBUFFER_8192  8192
-#define IGB_RXBUFFER_16384 16384
-
-/* Packet Buffer allocations */
-#define IGB_PBA_BYTES_SHIFT 0xA
-#define IGB_TX_HEAD_ADDR_SHIFT 7
-#define IGB_PBA_TX_MASK 0xFFFF0000
-
-#define IGB_FC_PAUSE_TIME 0x0680 /* 858 usec */
-
-/* How many Tx Descriptors do we need to call netif_wake_queue ? */
-#define IGB_TX_QUEUE_WAKE      32
-/* How many Rx Buffers do we bundle into one write to the hardware ? */
-#define IGB_RX_BUFFER_WRITE    16      /* Must be power of 2 */
-
-#define AUTO_ALL_MODES            0
-#define IGB_EEPROM_APME         0x0400
-
-#ifndef IGB_MASTER_SLAVE
-/* Switch to override PHY master/slave setting */
-#define IGB_MASTER_SLAVE       e1000_ms_hw_default
-#endif
-
-#define IGB_MNG_VLAN_NONE -1
-
-/* wrapper around a pointer to a socket buffer,
- * so a DMA handle can be stored along with the buffer */
-struct igb_buffer {
-       struct sk_buff *skb;
-       dma_addr_t dma;
-       dma_addr_t page_dma;
-       union {
-               /* TX */
-               struct {
-                       unsigned long time_stamp;
-                       u16 length;
-                       u16 next_to_watch;
-               };
-
-#ifndef CONFIG_IGB_DISABLE_PACKET_SPLIT
-               /* RX */
-               struct {
-                       unsigned long page_offset;
-                       struct page *page;
-               };
-#endif
-       };
-};
-
-struct igb_queue_stats {
-       u64 packets;
-       u64 bytes;
-};
-
-struct igb_q_vector {
-       struct igb_adapter *adapter; /* backlink */
-       struct igb_ring *rx_ring;
-       struct igb_ring *tx_ring;
-#if 0
-       struct napi_struct napi;
-#endif
-       u32 eims_value;
-       u16 cpu;
-
-       u16 itr_val;
-       u8 set_itr;
-       u8 itr_shift;
-       void __iomem *itr_register;
-
-#if 0
-       char name[IFNAMSIZ + 9];
-#endif
-#ifndef HAVE_NETDEV_NAPI_LIST
-       struct net_device poll_dev;
-#endif
-};
-
-struct igb_ring {
-       struct igb_q_vector *q_vector; /* backlink to q_vector */
-       struct pci_dev *pdev;          /* pci device for dma mapping */
-       dma_addr_t dma;                /* phys address of the ring */
-       void *desc;                    /* descriptor ring memory */
-       unsigned int size;             /* length of desc. ring in bytes */
-       u16 count;                     /* number of desc. in the ring */
-       u16 next_to_use;
-       u16 next_to_clean;
-       u8 queue_index;
-       u8 reg_idx;
-       void __iomem *head;
-       void __iomem *tail;
-       struct igb_buffer *buffer_info; /* array of buffer info structs */
-
-       unsigned int total_bytes;
-       unsigned int total_packets;
-
-       struct igb_queue_stats stats;
-
-       union {
-               /* TX */
-               struct {
-                       unsigned int restart_queue;
-                       u32 ctx_idx;
-                       bool detect_tx_hung;
-               };
-               /* RX */
-               struct {
-                       u64 hw_csum_err;
-                       u64 hw_csum_good;
-                       u32 rx_buffer_len;
-                       u16 rx_ps_hdr_size;
-                       bool rx_csum;
-#ifdef IGB_LRO
-                       struct net_lro_mgr lro_mgr;
-                       bool lro_used;
-#endif
-               };
-       };
-};
-
-
-#define IGB_ADVTXD_DCMD (E1000_ADVTXD_DCMD_EOP | E1000_ADVTXD_DCMD_RS)
-
-#define IGB_DESC_UNUSED(R) \
-       ((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \
-       (R)->next_to_clean - (R)->next_to_use - 1)
-
-#define E1000_RX_DESC_ADV(R, i)            \
-       (&(((union e1000_adv_rx_desc *)((R).desc))[i]))
-#define E1000_TX_DESC_ADV(R, i)            \
-       (&(((union e1000_adv_tx_desc *)((R).desc))[i]))
-#define E1000_TX_CTXTDESC_ADV(R, i)        \
-       (&(((struct e1000_adv_tx_context_desc *)((R).desc))[i]))
-#define E1000_GET_DESC(R, i, type)     (&(((struct type *)((R).desc))[i]))
-#define E1000_TX_DESC(R, i)            E1000_GET_DESC(R, i, e1000_tx_desc)
-#define E1000_RX_DESC(R, i)            E1000_GET_DESC(R, i, e1000_rx_desc)
-
-#define MAX_MSIX_COUNT 10
-/* board specific private data structure */
-
-/* board specific private data structure */
-struct igb_adapter {
-
-       /* OS defined structs */
-       struct net_device *netdev;
-       struct pci_device *pdev;
-       struct net_device_stats net_stats;
-
-       /* structs defined in e1000_hw.h */
-       struct e1000_hw hw;
-
-       struct e1000_phy_info phy_info;
-
-        u32 min_frame_size;
-        u32 max_frame_size;
-
-       u32 wol;
-       u32 pba;
-       u32 max_hw_frame_size;
-
-       bool fc_autoneg;
-
-       unsigned int flags;
-       unsigned int flags2;
-
-#define NUM_TX_DESC    8
-#define NUM_RX_DESC    8
-
-       struct io_buffer *tx_iobuf[NUM_TX_DESC];
-       struct io_buffer *rx_iobuf[NUM_RX_DESC];
-
-       struct e1000_tx_desc *tx_base;
-       struct e1000_rx_desc *rx_base;
-
-       uint32_t tx_ring_size;
-       uint32_t rx_ring_size;
-
-       uint32_t tx_head;
-       uint32_t tx_tail;
-       uint32_t tx_fill_ctr;
-
-       uint32_t rx_curr;
-
-       uint32_t ioaddr;
-       uint32_t irqno;
-
-        uint32_t tx_int_delay;
-        uint32_t tx_abs_int_delay;
-        uint32_t txd_cmd;
-};
-
-#define IGB_FLAG_HAS_MSI           (1 << 0)
-#define IGB_FLAG_MSI_ENABLE        (1 << 1)
-#define IGB_FLAG_DCA_ENABLED       (1 << 3)
-#define IGB_FLAG_LLI_PUSH          (1 << 4)
-#define IGB_FLAG_IN_NETPOLL        (1 << 5)
-#define IGB_FLAG_QUAD_PORT_A       (1 << 6)
-#define IGB_FLAG_QUEUE_PAIRS       (1 << 7)
-
-#define IGB_82576_TSYNC_SHIFT 19
-
-#endif /* _IGB_H_ */
diff --git a/src/drivers/net/igb/igb_82575.c b/src/drivers/net/igb/igb_82575.c
deleted file mode 100644 (file)
index b5b615a..0000000
+++ /dev/null
@@ -1,1617 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-/*
- * 82575EB Gigabit Network Connection
- * 82575EB Gigabit Backplane Connection
- * 82575GB Gigabit Network Connection
- * 82576 Gigabit Network Connection
- * 82576 Quad Port Gigabit Mezzanine Adapter
- */
-
-#include "igb.h"
-
-static s32  igb_init_phy_params_82575(struct e1000_hw *hw);
-static s32  igb_init_nvm_params_82575(struct e1000_hw *hw);
-static s32  igb_init_mac_params_82575(struct e1000_hw *hw);
-static s32  igb_acquire_phy_82575(struct e1000_hw *hw);
-static void igb_release_phy_82575(struct e1000_hw *hw);
-static s32  igb_acquire_nvm_82575(struct e1000_hw *hw);
-static void igb_release_nvm_82575(struct e1000_hw *hw);
-static s32  igb_check_for_link_82575(struct e1000_hw *hw);
-static s32  igb_get_cfg_done_82575(struct e1000_hw *hw);
-static s32  igb_get_link_up_info_82575(struct e1000_hw *hw, u16 *speed,
-                                         u16 *duplex);
-static s32  igb_init_hw_82575(struct e1000_hw *hw);
-static s32  igb_phy_hw_reset_sgmii_82575(struct e1000_hw *hw);
-static s32  igb_read_phy_reg_sgmii_82575(struct e1000_hw *hw, u32 offset,
-                                           u16 *data);
-static s32  igb_reset_hw_82575(struct e1000_hw *hw);
-static s32  igb_set_d0_lplu_state_82575(struct e1000_hw *hw,
-                                          bool active);
-static s32  igb_setup_copper_link_82575(struct e1000_hw *hw);
-static s32  igb_setup_serdes_link_82575(struct e1000_hw *hw);
-static s32  igb_valid_led_default_82575(struct e1000_hw *hw, u16 *data);
-static s32  igb_write_phy_reg_sgmii_82575(struct e1000_hw *hw,
-                                            u32 offset, u16 data);
-static void igb_clear_hw_cntrs_82575(struct e1000_hw *hw);
-static s32  igb_acquire_swfw_sync_82575(struct e1000_hw *hw, u16 mask);
-static s32  igb_get_pcs_speed_and_duplex_82575(struct e1000_hw *hw,
-                                                 u16 *speed, u16 *duplex);
-static s32  igb_get_phy_id_82575(struct e1000_hw *hw);
-static void igb_release_swfw_sync_82575(struct e1000_hw *hw, u16 mask);
-static bool igb_sgmii_active_82575(struct e1000_hw *hw);
-static s32  igb_reset_init_script_82575(struct e1000_hw *hw);
-static s32  igb_read_mac_addr_82575(struct e1000_hw *hw);
-static void igb_power_down_phy_copper_82575(struct e1000_hw *hw);
-static void igb_shutdown_serdes_link_82575(struct e1000_hw *hw);
-static s32 igb_set_pcie_completion_timeout(struct e1000_hw *hw);
-
-/**
- *  igb_init_phy_params_82575 - Init PHY func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 igb_init_phy_params_82575(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_init_phy_params_82575");
-
-       if (hw->phy.media_type != e1000_media_type_copper) {
-               phy->type = e1000_phy_none;
-               goto out;
-       }
-
-       phy->ops.power_up   = igb_power_up_phy_copper;
-       phy->ops.power_down = igb_power_down_phy_copper_82575;
-
-       phy->autoneg_mask           = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-       phy->reset_delay_us         = 100;
-
-       phy->ops.acquire            = igb_acquire_phy_82575;
-       phy->ops.check_reset_block  = igb_check_reset_block_generic;
-       phy->ops.commit             = igb_phy_sw_reset_generic;
-       phy->ops.get_cfg_done       = igb_get_cfg_done_82575;
-       phy->ops.release            = igb_release_phy_82575;
-
-       if (igb_sgmii_active_82575(hw)) {
-               phy->ops.reset      = igb_phy_hw_reset_sgmii_82575;
-               phy->ops.read_reg   = igb_read_phy_reg_sgmii_82575;
-               phy->ops.write_reg  = igb_write_phy_reg_sgmii_82575;
-       } else {
-               phy->ops.reset      = igb_phy_hw_reset_generic;
-               phy->ops.read_reg   = igb_read_phy_reg_igp;
-               phy->ops.write_reg  = igb_write_phy_reg_igp;
-       }
-
-       /* Set phy->phy_addr and phy->id. */
-       ret_val = igb_get_phy_id_82575(hw);
-
-       /* Verify phy id and set remaining function pointers */
-       switch (phy->id) {
-       case M88E1111_I_PHY_ID:
-               phy->type                   = e1000_phy_m88;
-               phy->ops.check_polarity     = igb_check_polarity_m88;
-               phy->ops.get_info           = igb_get_phy_info_m88;
-#if 0
-               phy->ops.get_cable_length   = igb_get_cable_length_m88;
-#endif
-#if 0
-               phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88;
-#endif
-               break;
-       case IGP03E1000_E_PHY_ID:
-       case IGP04E1000_E_PHY_ID:
-               phy->type                   = e1000_phy_igp_3;
-               phy->ops.check_polarity     = igb_check_polarity_igp;
-               phy->ops.get_info           = igb_get_phy_info_igp;
-#if 0
-               phy->ops.get_cable_length   = igb_get_cable_length_igp_2;
-#endif
-#if 0
-               phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_igp;
-#endif
-               phy->ops.set_d0_lplu_state  = igb_set_d0_lplu_state_82575;
-               phy->ops.set_d3_lplu_state  = igb_set_d3_lplu_state_generic;
-               break;
-       default:
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_init_nvm_params_82575 - Init NVM func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 igb_init_nvm_params_82575(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = E1000_READ_REG(hw, E1000_EECD);
-       u16 size;
-
-       DEBUGFUNC("igb_init_nvm_params_82575");
-
-       nvm->opcode_bits        = 8;
-       nvm->delay_usec         = 1;
-       switch (nvm->override) {
-       case e1000_nvm_override_spi_large:
-               nvm->page_size    = 32;
-               nvm->address_bits = 16;
-               break;
-       case e1000_nvm_override_spi_small:
-               nvm->page_size    = 8;
-               nvm->address_bits = 8;
-               break;
-       default:
-               nvm->page_size    = eecd & E1000_EECD_ADDR_BITS ? 32 : 8;
-               nvm->address_bits = eecd & E1000_EECD_ADDR_BITS ? 16 : 8;
-               break;
-       }
-
-       nvm->type              = e1000_nvm_eeprom_spi;
-
-       size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
-                         E1000_EECD_SIZE_EX_SHIFT);
-
-       /*
-        * Added to a constant, "size" becomes the left-shift value
-        * for setting word_size.
-        */
-       size += NVM_WORD_SIZE_BASE_SHIFT;
-
-       /* EEPROM access above 16k is unsupported */
-       if (size > 14)
-               size = 14;
-       nvm->word_size = 1 << size;
-
-       /* Function Pointers */
-       nvm->ops.acquire       = igb_acquire_nvm_82575;
-       nvm->ops.read          = igb_read_nvm_eerd;
-       nvm->ops.release       = igb_release_nvm_82575;
-       nvm->ops.update        = igb_update_nvm_checksum_generic;
-       nvm->ops.valid_led_default = igb_valid_led_default_82575;
-       nvm->ops.validate      = igb_validate_nvm_checksum_generic;
-       nvm->ops.write         = igb_write_nvm_spi;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_init_mac_params_82575 - Init MAC func ptrs.
- *  @hw: pointer to the HW structure
- **/
-static s32 igb_init_mac_params_82575(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_dev_spec_82575 *dev_spec = &hw->dev_spec._82575;
-       u32 ctrl_ext = 0;
-
-       DEBUGFUNC("igb_init_mac_params_82575");
-
-       /* Set media type */
-        /*
-        * The 82575 uses bits 22:23 for link mode. The mode can be changed
-         * based on the EEPROM. We cannot rely upon device ID. There
-         * is no distinguishable difference between fiber and internal
-         * SerDes mode on the 82575. There can be an external PHY attached
-         * on the SGMII interface. For this, we'll set sgmii_active to true.
-         */
-       hw->phy.media_type = e1000_media_type_copper;
-       dev_spec->sgmii_active = false;
-
-       ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
-       switch (ctrl_ext & E1000_CTRL_EXT_LINK_MODE_MASK) {
-       case E1000_CTRL_EXT_LINK_MODE_SGMII:
-               dev_spec->sgmii_active = true;
-               ctrl_ext |= E1000_CTRL_I2C_ENA;
-               break;
-       case E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES:
-               hw->phy.media_type = e1000_media_type_internal_serdes;
-               ctrl_ext |= E1000_CTRL_I2C_ENA;
-               break;
-       default:
-               ctrl_ext &= ~E1000_CTRL_I2C_ENA;
-               break;
-       }
-
-       E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
-
-       /* Set mta register count */
-       mac->mta_reg_count = 128;
-       /* Set uta register count */
-       mac->uta_reg_count = (hw->mac.type == e1000_82575) ? 0 : 128;
-       /* Set rar entry count */
-       mac->rar_entry_count = E1000_RAR_ENTRIES_82575;
-       if (mac->type == e1000_82576)
-               mac->rar_entry_count = E1000_RAR_ENTRIES_82576;
-       /* Set if part includes ASF firmware */
-       mac->asf_firmware_present = true;
-       /* Set if manageability features are enabled. */
-       mac->arc_subsystem_valid =
-               (E1000_READ_REG(hw, E1000_FWSM) & E1000_FWSM_MODE_MASK)
-                       ? true : false;
-
-       /* Function pointers */
-
-       /* bus type/speed/width */
-       mac->ops.get_bus_info = igb_get_bus_info_pcie_generic;
-       /* reset */
-       mac->ops.reset_hw = igb_reset_hw_82575;
-       /* hw initialization */
-       mac->ops.init_hw = igb_init_hw_82575;
-       /* link setup */
-       mac->ops.setup_link = igb_setup_link_generic;
-       /* physical interface link setup */
-       mac->ops.setup_physical_interface =
-               (hw->phy.media_type == e1000_media_type_copper)
-                       ? igb_setup_copper_link_82575
-                       : igb_setup_serdes_link_82575;
-       /* physical interface shutdown */
-       mac->ops.shutdown_serdes = igb_shutdown_serdes_link_82575;
-       /* check for link */
-       mac->ops.check_for_link = igb_check_for_link_82575;
-       /* receive address register setting */
-       mac->ops.rar_set = igb_rar_set_generic;
-       /* read mac address */
-       mac->ops.read_mac_addr = igb_read_mac_addr_82575;
-       /* multicast address update */
-       mac->ops.update_mc_addr_list = igb_update_mc_addr_list_generic;
-       /* writing VFTA */
-       mac->ops.write_vfta = igb_write_vfta_generic;
-       /* clearing VFTA */
-       mac->ops.clear_vfta = igb_clear_vfta_generic;
-       /* setting MTA */
-#if 0
-       mac->ops.mta_set = igb_mta_set_generic;
-       /* ID LED init */
-       mac->ops.id_led_init = igb_id_led_init_generic;
-       /* blink LED */
-       mac->ops.blink_led = igb_blink_led_generic;
-       /* setup LED */
-       mac->ops.setup_led = igb_setup_led_generic;
-       /* cleanup LED */
-       mac->ops.cleanup_led = igb_cleanup_led_generic;
-       /* turn on/off LED */
-       mac->ops.led_on = igb_led_on_generic;
-       mac->ops.led_off = igb_led_off_generic;
-#endif
-       /* clear hardware counters */
-       mac->ops.clear_hw_cntrs = igb_clear_hw_cntrs_82575;
-       /* link info */
-       mac->ops.get_link_up_info = igb_get_link_up_info_82575;
-
-       /* set lan id for port to determine which phy lock to use */
-       hw->mac.ops.set_lan_id(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_init_function_pointers_82575 - Init func ptrs.
- *  @hw: pointer to the HW structure
- *
- *  Called to initialize all function pointers and parameters.
- **/
-void igb_init_function_pointers_82575(struct e1000_hw *hw)
-{
-       DEBUGFUNC("igb_init_function_pointers_82575");
-
-       hw->mac.ops.init_params = igb_init_mac_params_82575;
-       hw->nvm.ops.init_params = igb_init_nvm_params_82575;
-       hw->phy.ops.init_params = igb_init_phy_params_82575;
-#if 0
-       hw->mbx.ops.init_params = igb_init_mbx_params_pf;
-#endif
-}
-
-/**
- *  igb_acquire_phy_82575 - Acquire rights to access PHY
- *  @hw: pointer to the HW structure
- *
- *  Acquire access rights to the correct PHY.
- **/
-static s32 igb_acquire_phy_82575(struct e1000_hw *hw)
-{
-       u16 mask = E1000_SWFW_PHY0_SM;
-
-       DEBUGFUNC("igb_acquire_phy_82575");
-
-       if (hw->bus.func == E1000_FUNC_1)
-               mask = E1000_SWFW_PHY1_SM;
-
-       return igb_acquire_swfw_sync_82575(hw, mask);
-}
-
-/**
- *  igb_release_phy_82575 - Release rights to access PHY
- *  @hw: pointer to the HW structure
- *
- *  A wrapper to release access rights to the correct PHY.
- **/
-static void igb_release_phy_82575(struct e1000_hw *hw)
-{
-       u16 mask = E1000_SWFW_PHY0_SM;
-
-       DEBUGFUNC("igb_release_phy_82575");
-
-       if (hw->bus.func == E1000_FUNC_1)
-               mask = E1000_SWFW_PHY1_SM;
-
-       igb_release_swfw_sync_82575(hw, mask);
-}
-
-/**
- *  igb_read_phy_reg_sgmii_82575 - Read PHY register using sgmii
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Reads the PHY register at offset using the serial gigabit media independent
- *  interface and stores the retrieved information in data.
- **/
-static s32 igb_read_phy_reg_sgmii_82575(struct e1000_hw *hw, u32 offset,
-                                          u16 *data)
-{
-       s32 ret_val = -E1000_ERR_PARAM;
-
-       DEBUGFUNC("igb_read_phy_reg_sgmii_82575");
-
-       if (offset > E1000_MAX_SGMII_PHY_REG_ADDR) {
-               DEBUGOUT1("PHY Address %u is out of range\n", offset);
-               goto out;
-       }
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_read_phy_reg_i2c(hw, offset, data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_write_phy_reg_sgmii_82575 - Write PHY register using sgmii
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Writes the data to PHY register at the offset using the serial gigabit
- *  media independent interface.
- **/
-static s32 igb_write_phy_reg_sgmii_82575(struct e1000_hw *hw, u32 offset,
-                                           u16 data)
-{
-       s32 ret_val = -E1000_ERR_PARAM;
-
-       DEBUGFUNC("igb_write_phy_reg_sgmii_82575");
-
-       if (offset > E1000_MAX_SGMII_PHY_REG_ADDR) {
-               DEBUGOUT1("PHY Address %d is out of range\n", offset);
-               goto out;
-       }
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_write_phy_reg_i2c(hw, offset, data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_get_phy_id_82575 - Retrieve PHY addr and id
- *  @hw: pointer to the HW structure
- *
- *  Retrieves the PHY address and ID for both PHY's which do and do not use
- *  sgmi interface.
- **/
-static s32 igb_get_phy_id_82575(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32  ret_val = E1000_SUCCESS;
-       u16 phy_id;
-       u32 ctrl_ext;
-
-       DEBUGFUNC("igb_get_phy_id_82575");
-
-       /*
-        * For SGMII PHYs, we try the list of possible addresses until
-        * we find one that works.  For non-SGMII PHYs
-        * (e.g. integrated copper PHYs), an address of 1 should
-        * work.  The result of this function should mean phy->phy_addr
-        * and phy->id are set correctly.
-        */
-       if (!igb_sgmii_active_82575(hw)) {
-               phy->addr = 1;
-               ret_val = igb_get_phy_id(hw);
-               goto out;
-       }
-
-       /* Power on sgmii phy if it is disabled */
-       ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
-       E1000_WRITE_REG(hw, E1000_CTRL_EXT,
-                       ctrl_ext & ~E1000_CTRL_EXT_SDP3_DATA);
-       E1000_WRITE_FLUSH(hw);
-       msec_delay(300);
-
-       /*
-        * The address field in the I2CCMD register is 3 bits and 0 is invalid.
-        * Therefore, we need to test 1-7
-        */
-       for (phy->addr = 1; phy->addr < 8; phy->addr++) {
-               ret_val = igb_read_phy_reg_sgmii_82575(hw, PHY_ID1, &phy_id);
-               if (ret_val == E1000_SUCCESS) {
-                       DEBUGOUT2("Vendor ID 0x%08X read at address %u\n",
-                                 phy_id,
-                                 phy->addr);
-                       /*
-                        * At the time of this writing, The M88 part is
-                        * the only supported SGMII PHY product.
-                        */
-                       if (phy_id == M88_VENDOR)
-                               break;
-               } else {
-                       DEBUGOUT1("PHY address %u was unreadable\n",
-                                 phy->addr);
-               }
-       }
-
-       /* A valid PHY type couldn't be found. */
-       if (phy->addr == 8) {
-               phy->addr = 0;
-               ret_val = -E1000_ERR_PHY;
-       } else {
-               ret_val = igb_get_phy_id(hw);
-       }
-
-       /* restore previous sfp cage power state */
-       E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_phy_hw_reset_sgmii_82575 - Performs a PHY reset
- *  @hw: pointer to the HW structure
- *
- *  Resets the PHY using the serial gigabit media independent interface.
- **/
-static s32 igb_phy_hw_reset_sgmii_82575(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_phy_hw_reset_sgmii_82575");
-
-       /*
-        * This isn't a true "hard" reset, but is the only reset
-        * available to us at this time.
-        */
-
-       DEBUGOUT("Soft resetting SGMII attached PHY...\n");
-
-       if (!(hw->phy.ops.write_reg))
-               goto out;
-
-       /*
-        * SFP documentation requires the following to configure the SPF module
-        * to work on SGMII.  No further documentation is given.
-        */
-       ret_val = hw->phy.ops.write_reg(hw, 0x1B, 0x8084);
-       if (ret_val)
-               goto out;
-
-       ret_val = hw->phy.ops.commit(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_set_d0_lplu_state_82575 - Set Low Power Linkup D0 state
- *  @hw: pointer to the HW structure
- *  @active: true to enable LPLU, false to disable
- *
- *  Sets the LPLU D0 state according to the active flag.  When
- *  activating LPLU this function also disables smart speed
- *  and vice versa.  LPLU will not be activated unless the
- *  device autonegotiation advertisement meets standards of
- *  either 10 or 10/100 or 10/100/1000 at all duplexes.
- *  This is a function pointer entry point only called by
- *  PHY setup routines.
- **/
-static s32 igb_set_d0_lplu_state_82575(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       DEBUGFUNC("igb_set_d0_lplu_state_82575");
-
-       if (!(hw->phy.ops.read_reg))
-               goto out;
-
-       ret_val = phy->ops.read_reg(hw, IGP02E1000_PHY_POWER_MGMT, &data);
-       if (ret_val)
-               goto out;
-
-       if (active) {
-               data |= IGP02E1000_PM_D0_LPLU;
-               ret_val = phy->ops.write_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                            data);
-               if (ret_val)
-                       goto out;
-
-               /* When LPLU is enabled, we should disable SmartSpeed */
-               ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                           &data);
-               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-               ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                            data);
-               if (ret_val)
-                       goto out;
-       } else {
-               data &= ~IGP02E1000_PM_D0_LPLU;
-               ret_val = phy->ops.write_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                            data);
-               /*
-                * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
-                * during Dx states where the power conservation is most
-                * important.  During driver activity we should enable
-                * SmartSpeed, so performance is maintained.
-                */
-               if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = phy->ops.read_reg(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = phy->ops.read_reg(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_acquire_nvm_82575 - Request for access to EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Acquire the necessary semaphores for exclusive access to the EEPROM.
- *  Set the EEPROM access request bit and wait for EEPROM access grant bit.
- *  Return successful if access grant bit set, else clear the request for
- *  EEPROM access and return -E1000_ERR_NVM (-1).
- **/
-static s32 igb_acquire_nvm_82575(struct e1000_hw *hw)
-{
-       s32 ret_val;
-
-       DEBUGFUNC("igb_acquire_nvm_82575");
-
-       ret_val = igb_acquire_swfw_sync_82575(hw, E1000_SWFW_EEP_SM);
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_acquire_nvm_generic(hw);
-
-       if (ret_val)
-               igb_release_swfw_sync_82575(hw, E1000_SWFW_EEP_SM);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_release_nvm_82575 - Release exclusive access to EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Stop any current commands to the EEPROM and clear the EEPROM request bit,
- *  then release the semaphores acquired.
- **/
-static void igb_release_nvm_82575(struct e1000_hw *hw)
-{
-       DEBUGFUNC("igb_release_nvm_82575");
-
-       igb_release_nvm_generic(hw);
-       igb_release_swfw_sync_82575(hw, E1000_SWFW_EEP_SM);
-}
-
-/**
- *  igb_acquire_swfw_sync_82575 - Acquire SW/FW semaphore
- *  @hw: pointer to the HW structure
- *  @mask: specifies which semaphore to acquire
- *
- *  Acquire the SW/FW semaphore to access the PHY or NVM.  The mask
- *  will also specify which port we're acquiring the lock for.
- **/
-static s32 igb_acquire_swfw_sync_82575(struct e1000_hw *hw, u16 mask)
-{
-       u32 swfw_sync;
-       u32 swmask = mask;
-       u32 fwmask = mask << 16;
-       s32 ret_val = E1000_SUCCESS;
-       s32 i = 0, timeout = 200; /* FIXME: find real value to use here */
-
-       DEBUGFUNC("igb_acquire_swfw_sync_82575");
-
-       while (i < timeout) {
-               if (igb_get_hw_semaphore_generic(hw)) {
-                       ret_val = -E1000_ERR_SWFW_SYNC;
-                       goto out;
-               }
-
-               swfw_sync = E1000_READ_REG(hw, E1000_SW_FW_SYNC);
-               if (!(swfw_sync & (fwmask | swmask)))
-                       break;
-
-               /*
-                * Firmware currently using resource (fwmask)
-                * or other software thread using resource (swmask)
-                */
-               igb_put_hw_semaphore_generic(hw);
-               msec_delay_irq(5);
-               i++;
-       }
-
-       if (i == timeout) {
-               DEBUGOUT("Driver can't access resource, SW_FW_SYNC timeout.\n");
-               ret_val = -E1000_ERR_SWFW_SYNC;
-               goto out;
-       }
-
-       swfw_sync |= swmask;
-       E1000_WRITE_REG(hw, E1000_SW_FW_SYNC, swfw_sync);
-
-       igb_put_hw_semaphore_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_release_swfw_sync_82575 - Release SW/FW semaphore
- *  @hw: pointer to the HW structure
- *  @mask: specifies which semaphore to acquire
- *
- *  Release the SW/FW semaphore used to access the PHY or NVM.  The mask
- *  will also specify which port we're releasing the lock for.
- **/
-static void igb_release_swfw_sync_82575(struct e1000_hw *hw, u16 mask)
-{
-       u32 swfw_sync;
-
-       DEBUGFUNC("igb_release_swfw_sync_82575");
-
-       while (igb_get_hw_semaphore_generic(hw) != E1000_SUCCESS);
-       /* Empty */
-
-       swfw_sync = E1000_READ_REG(hw, E1000_SW_FW_SYNC);
-       swfw_sync &= ~mask;
-       E1000_WRITE_REG(hw, E1000_SW_FW_SYNC, swfw_sync);
-
-       igb_put_hw_semaphore_generic(hw);
-}
-
-/**
- *  igb_get_cfg_done_82575 - Read config done bit
- *  @hw: pointer to the HW structure
- *
- *  Read the management control register for the config done bit for
- *  completion status.  NOTE: silicon which is EEPROM-less will fail trying
- *  to read the config done bit, so an error is *ONLY* logged and returns
- *  E1000_SUCCESS.  If we were to return with error, EEPROM-less silicon
- *  would not be able to be reset or change link.
- **/
-static s32 igb_get_cfg_done_82575(struct e1000_hw *hw)
-{
-       s32 timeout = PHY_CFG_TIMEOUT;
-       s32 ret_val = E1000_SUCCESS;
-       u32 mask = E1000_NVM_CFG_DONE_PORT_0;
-
-       DEBUGFUNC("igb_get_cfg_done_82575");
-
-       if (hw->bus.func == E1000_FUNC_1)
-               mask = E1000_NVM_CFG_DONE_PORT_1;
-       while (timeout) {
-               if (E1000_READ_REG(hw, E1000_EEMNGCTL) & mask)
-                       break;
-               msec_delay(1);
-               timeout--;
-       }
-       if (!timeout) {
-               DEBUGOUT("MNG configuration cycle has not completed.\n");
-        }
-
-       /* If EEPROM is not marked present, init the PHY manually */
-       if (((E1000_READ_REG(hw, E1000_EECD) & E1000_EECD_PRES) == 0) &&
-           (hw->phy.type == e1000_phy_igp_3))
-               igb_phy_init_script_igp3(hw);
-
-       return ret_val;
-}
-
-/**
- *  igb_get_link_up_info_82575 - Get link speed/duplex info
- *  @hw: pointer to the HW structure
- *  @speed: stores the current speed
- *  @duplex: stores the current duplex
- *
- *  This is a wrapper function, if using the serial gigabit media independent
- *  interface, use PCS to retrieve the link speed and duplex information.
- *  Otherwise, use the generic function to get the link speed and duplex info.
- **/
-static s32 igb_get_link_up_info_82575(struct e1000_hw *hw, u16 *speed,
-                                        u16 *duplex)
-{
-       s32 ret_val;
-
-       DEBUGFUNC("igb_get_link_up_info_82575");
-
-       if (hw->phy.media_type != e1000_media_type_copper)
-               ret_val = igb_get_pcs_speed_and_duplex_82575(hw, speed,
-                                                              duplex);
-       else
-               ret_val = igb_get_speed_and_duplex_copper_generic(hw, speed,
-                                                                   duplex);
-
-       return ret_val;
-}
-
-/**
- *  igb_check_for_link_82575 - Check for link
- *  @hw: pointer to the HW structure
- *
- *  If sgmii is enabled, then use the pcs register to determine link, otherwise
- *  use the generic interface for determining link.
- **/
-static s32 igb_check_for_link_82575(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       u16 speed, duplex;
-
-       DEBUGFUNC("igb_check_for_link_82575");
-
-       if (hw->phy.media_type != e1000_media_type_copper) {
-               ret_val = igb_get_pcs_speed_and_duplex_82575(hw, &speed,
-                                                              &duplex);
-               /*
-                * Use this flag to determine if link needs to be checked or
-                * not.  If we have link clear the flag so that we do not
-                * continue to check for link.
-                */
-               hw->mac.get_link_status = !hw->mac.serdes_has_link;
-       } else {
-               ret_val = igb_check_for_copper_link_generic(hw);
-       }
-
-       return ret_val;
-}
-
-/**
- *  igb_get_pcs_speed_and_duplex_82575 - Retrieve current speed/duplex
- *  @hw: pointer to the HW structure
- *  @speed: stores the current speed
- *  @duplex: stores the current duplex
- *
- *  Using the physical coding sub-layer (PCS), retrieve the current speed and
- *  duplex, then store the values in the pointers provided.
- **/
-static s32 igb_get_pcs_speed_and_duplex_82575(struct e1000_hw *hw,
-                                                u16 *speed, u16 *duplex)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 pcs;
-
-       DEBUGFUNC("igb_get_pcs_speed_and_duplex_82575");
-
-       /* Set up defaults for the return values of this function */
-       mac->serdes_has_link = false;
-       *speed = 0;
-       *duplex = 0;
-
-       /*
-        * Read the PCS Status register for link state. For non-copper mode,
-        * the status register is not accurate. The PCS status register is
-        * used instead.
-        */
-       pcs = E1000_READ_REG(hw, E1000_PCS_LSTAT);
-
-       /*
-        * The link up bit determines when link is up on autoneg. The sync ok
-        * gets set once both sides sync up and agree upon link. Stable link
-        * can be determined by checking for both link up and link sync ok
-        */
-       if ((pcs & E1000_PCS_LSTS_LINK_OK) && (pcs & E1000_PCS_LSTS_SYNK_OK)) {
-               mac->serdes_has_link = true;
-
-               /* Detect and store PCS speed */
-               if (pcs & E1000_PCS_LSTS_SPEED_1000) {
-                       *speed = SPEED_1000;
-               } else if (pcs & E1000_PCS_LSTS_SPEED_100) {
-                       *speed = SPEED_100;
-               } else {
-                       *speed = SPEED_10;
-               }
-
-               /* Detect and store PCS duplex */
-               if (pcs & E1000_PCS_LSTS_DUPLEX_FULL) {
-                       *duplex = FULL_DUPLEX;
-               } else {
-                       *duplex = HALF_DUPLEX;
-               }
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_shutdown_serdes_link_82575 - Remove link during power down
- *  @hw: pointer to the HW structure
- *
- *  In the case of serdes shut down sfp and PCS on driver unload
- *  when management pass thru is not enabled.
- **/
-void igb_shutdown_serdes_link_82575(struct e1000_hw *hw)
-{
-#if 0
-       u32 reg;
-#endif
-       u16 eeprom_data = 0;
-
-       if ((hw->phy.media_type != e1000_media_type_internal_serdes) &&
-           !igb_sgmii_active_82575(hw))
-               return;
-
-       if (hw->bus.func == E1000_FUNC_0)
-               hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
-       else if (hw->bus.func == E1000_FUNC_1)
-               hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
-
-       /*
-        * If APM is not enabled in the EEPROM and management interface is
-        * not enabled, then power down.
-        */
-#if 0
-       if (!(eeprom_data & E1000_NVM_APME_82575) &&
-           !igb_enable_mng_pass_thru(hw)) {
-               /* Disable PCS to turn off link */
-               reg = E1000_READ_REG(hw, E1000_PCS_CFG0);
-               reg &= ~E1000_PCS_CFG_PCS_EN;
-               E1000_WRITE_REG(hw, E1000_PCS_CFG0, reg);
-
-               /* shutdown the laser */
-               reg = E1000_READ_REG(hw, E1000_CTRL_EXT);
-               reg |= E1000_CTRL_EXT_SDP3_DATA;
-               E1000_WRITE_REG(hw, E1000_CTRL_EXT, reg);
-
-               /* flush the write to verify completion */
-               E1000_WRITE_FLUSH(hw);
-               msec_delay(1);
-       }
-#endif
-       return;
-}
-
-/**
- *  igb_reset_hw_82575 - Reset hardware
- *  @hw: pointer to the HW structure
- *
- *  This resets the hardware into a known state.
- **/
-static s32 igb_reset_hw_82575(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val;
-
-       DEBUGFUNC("igb_reset_hw_82575");
-
-       /*
-        * Prevent the PCI-E bus from sticking if there is no TLP connection
-        * on the last TLP read/write transaction when MAC is reset.
-        */
-       ret_val = igb_disable_pcie_master_generic(hw);
-       if (ret_val) {
-               DEBUGOUT("PCI-E Master disable polling has failed.\n");
-       }
-
-       /* set the completion timeout for interface */
-       ret_val = igb_set_pcie_completion_timeout(hw);
-       if (ret_val) {
-               DEBUGOUT("PCI-E Set completion timeout has failed.\n");
-       }
-
-       DEBUGOUT("Masking off all interrupts\n");
-       E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff);
-
-       E1000_WRITE_REG(hw, E1000_RCTL, 0);
-       E1000_WRITE_REG(hw, E1000_TCTL, E1000_TCTL_PSP);
-       E1000_WRITE_FLUSH(hw);
-
-       msec_delay(10);
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       DEBUGOUT("Issuing a global reset to MAC\n");
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_RST);
-
-       ret_val = igb_get_auto_rd_done_generic(hw);
-       if (ret_val) {
-               /*
-                * When auto config read does not complete, do not
-                * return with an error. This can happen in situations
-                * where there is no eeprom and prevents getting link.
-                */
-               DEBUGOUT("Auto Read Done did not complete\n");
-       }
-
-       /* If EEPROM is not present, run manual init scripts */
-       if ((E1000_READ_REG(hw, E1000_EECD) & E1000_EECD_PRES) == 0)
-               igb_reset_init_script_82575(hw);
-
-       /* Clear any pending interrupt events. */
-       E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff);
-       E1000_READ_REG(hw, E1000_ICR);
-
-       /* Install any alternate MAC address into RAR0 */
-       ret_val = igb_check_alt_mac_addr_generic(hw);
-
-       return ret_val;
-}
-
-/**
- *  igb_init_hw_82575 - Initialize hardware
- *  @hw: pointer to the HW structure
- *
- *  This inits the hardware readying it for operation.
- **/
-static s32 igb_init_hw_82575(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val;
-       u16 i, rar_count = mac->rar_entry_count;
-
-       DEBUGFUNC("igb_init_hw_82575");
-
-       /* Initialize identification LED */
-       ret_val = mac->ops.id_led_init(hw);
-       if (ret_val) {
-               DEBUGOUT("Error initializing identification LED\n");
-               /* This is not fatal and we should not stop init due to this */
-       }
-
-       /* Disabling VLAN filtering */
-       DEBUGOUT("Initializing the IEEE VLAN\n");
-       mac->ops.clear_vfta(hw);
-
-       /* Setup the receive address */
-       igb_init_rx_addrs_generic(hw, rar_count);
-
-       /* Zero out the Multicast HASH table */
-       DEBUGOUT("Zeroing the MTA\n");
-       for (i = 0; i < mac->mta_reg_count; i++)
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
-
-       /* Zero out the Unicast HASH table */
-       DEBUGOUT("Zeroing the UTA\n");
-       for (i = 0; i < mac->uta_reg_count; i++)
-               E1000_WRITE_REG_ARRAY(hw, E1000_UTA, i, 0);
-
-       /* Setup link and flow control */
-       ret_val = mac->ops.setup_link(hw);
-
-       /*
-        * Clear all of the statistics registers (clear on read).  It is
-        * important that we do this after we have tried to establish link
-        * because the symbol error count will increment wildly if there
-        * is no link.
-        */
-       igb_clear_hw_cntrs_82575(hw);
-
-       return ret_val;
-}
-
-/**
- *  igb_setup_copper_link_82575 - Configure copper link settings
- *  @hw: pointer to the HW structure
- *
- *  Configures the link for auto-neg or forced speed and duplex.  Then we check
- *  for link, once link is established calls to configure collision distance
- *  and flow control are called.
- **/
-static s32 igb_setup_copper_link_82575(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32  ret_val;
-
-       DEBUGFUNC("igb_setup_copper_link_82575");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       ctrl |= E1000_CTRL_SLU;
-       ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-       ret_val = igb_setup_serdes_link_82575(hw);
-       if (ret_val)
-               goto out;
-
-       if (igb_sgmii_active_82575(hw) && !hw->phy.reset_disable) {
-               ret_val = hw->phy.ops.reset(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error resetting the PHY.\n");
-                       goto out;
-               }
-       }
-       switch (hw->phy.type) {
-       case e1000_phy_m88:
-               ret_val = igb_copper_link_setup_m88(hw);
-               break;
-       case e1000_phy_igp_3:
-               ret_val = igb_copper_link_setup_igp(hw);
-               break;
-       default:
-               ret_val = -E1000_ERR_PHY;
-               break;
-       }
-
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_setup_copper_link_generic(hw);
-out:
-       return ret_val;
-}
-
-/**
- *  igb_setup_serdes_link_82575 - Setup link for serdes
- *  @hw: pointer to the HW structure
- *
- *  Configure the physical coding sub-layer (PCS) link.  The PCS link is
- *  used on copper connections where the serialized gigabit media independent
- *  interface (sgmii), or serdes fiber is being used.  Configures the link
- *  for auto-negotiation or forces speed/duplex.
- **/
-static s32 igb_setup_serdes_link_82575(struct e1000_hw *hw)
-{
-       u32 ctrl_reg, reg;
-
-       DEBUGFUNC("igb_setup_serdes_link_82575");
-
-       if ((hw->phy.media_type != e1000_media_type_internal_serdes) &&
-           !igb_sgmii_active_82575(hw))
-               return E1000_SUCCESS;
-
-       /*
-        * On the 82575, SerDes loopback mode persists until it is
-        * explicitly turned off or a power cycle is performed.  A read to
-        * the register does not indicate its status.  Therefore, we ensure
-        * loopback mode is disabled during initialization.
-        */
-       E1000_WRITE_REG(hw, E1000_SCTL, E1000_SCTL_DISABLE_SERDES_LOOPBACK);
-
-       /* power on the sfp cage if present */
-       reg = E1000_READ_REG(hw, E1000_CTRL_EXT);
-       reg &= ~E1000_CTRL_EXT_SDP3_DATA;
-       E1000_WRITE_REG(hw, E1000_CTRL_EXT, reg);
-
-       ctrl_reg = E1000_READ_REG(hw, E1000_CTRL);
-       ctrl_reg |= E1000_CTRL_SLU;
-
-       if (hw->mac.type == e1000_82575 || hw->mac.type == e1000_82576) {
-               /* set both sw defined pins */
-               ctrl_reg |= E1000_CTRL_SWDPIN0 | E1000_CTRL_SWDPIN1;
-
-               /* Set switch control to serdes energy detect */
-               reg = E1000_READ_REG(hw, E1000_CONNSW);
-               reg |= E1000_CONNSW_ENRGSRC;
-               E1000_WRITE_REG(hw, E1000_CONNSW, reg);
-       }
-
-       reg = E1000_READ_REG(hw, E1000_PCS_LCTL);
-
-       if (igb_sgmii_active_82575(hw)) {
-               /* allow time for SFP cage to power up phy */
-               msec_delay(300);
-
-               /* AN time out should be disabled for SGMII mode */
-               reg &= ~(E1000_PCS_LCTL_AN_TIMEOUT);
-       } else {
-               ctrl_reg |= E1000_CTRL_SPD_1000 | E1000_CTRL_FRCSPD |
-                           E1000_CTRL_FD | E1000_CTRL_FRCDPX;
-       }
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl_reg);
-
-       /*
-        * New SerDes mode allows for forcing speed or autonegotiating speed
-        * at 1gb. Autoneg should be default set by most drivers. This is the
-        * mode that will be compatible with older link partners and switches.
-        * However, both are supported by the hardware and some drivers/tools.
-        */
-
-       reg &= ~(E1000_PCS_LCTL_AN_ENABLE | E1000_PCS_LCTL_FLV_LINK_UP |
-                E1000_PCS_LCTL_FSD | E1000_PCS_LCTL_FORCE_LINK);
-
-       /*
-        * We force flow control to prevent the CTRL register values from being
-        * overwritten by the autonegotiated flow control values
-        */
-       reg |= E1000_PCS_LCTL_FORCE_FCTRL;
-
-       /*
-        * we always set sgmii to autoneg since it is the phy that will be
-        * forcing the link and the serdes is just a go-between
-        */
-       if (hw->mac.autoneg || igb_sgmii_active_82575(hw)) {
-               /* Set PCS register for autoneg */
-               reg |= E1000_PCS_LCTL_FSV_1000 |  /* Force 1000 */
-                      E1000_PCS_LCTL_FDV_FULL |  /* SerDes Full dplx */
-                      E1000_PCS_LCTL_AN_ENABLE | /* Enable Autoneg */
-                      E1000_PCS_LCTL_AN_RESTART; /* Restart autoneg */
-               DEBUGOUT1("Configuring Autoneg:PCS_LCTL=0x%08X\n", reg);
-       } else {
-               /* Check for duplex first */
-               if (hw->mac.forced_speed_duplex & E1000_ALL_FULL_DUPLEX)
-                       reg |= E1000_PCS_LCTL_FDV_FULL;
-
-               /* No need to check for 1000/full since the spec states that
-                * it requires autoneg to be enabled */
-               /* Now set speed */
-               if (hw->mac.forced_speed_duplex & E1000_ALL_100_SPEED)
-                       reg |= E1000_PCS_LCTL_FSV_100;
-
-               /* Force speed and force link */
-               reg |= E1000_PCS_LCTL_FSD |
-                      E1000_PCS_LCTL_FORCE_LINK |
-                      E1000_PCS_LCTL_FLV_LINK_UP;
-
-               DEBUGOUT1("Configuring Forced Link:PCS_LCTL=0x%08X\n", reg);
-       }
-
-       E1000_WRITE_REG(hw, E1000_PCS_LCTL, reg);
-
-       if (!igb_sgmii_active_82575(hw))
-               igb_force_mac_fc_generic(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_valid_led_default_82575 - Verify a valid default LED config
- *  @hw: pointer to the HW structure
- *  @data: pointer to the NVM (EEPROM)
- *
- *  Read the EEPROM for the current default LED configuration.  If the
- *  LED configuration is not valid, set to a valid LED configuration.
- **/
-static s32 igb_valid_led_default_82575(struct e1000_hw *hw, u16 *data)
-{
-       s32 ret_val;
-
-       DEBUGFUNC("igb_valid_led_default_82575");
-
-       ret_val = hw->nvm.ops.read(hw, NVM_ID_LED_SETTINGS, 1, data);
-       if (ret_val) {
-               DEBUGOUT("NVM Read Error\n");
-               goto out;
-       }
-
-       if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF) {
-               switch(hw->phy.media_type) {
-               case e1000_media_type_internal_serdes:
-                       *data = ID_LED_DEFAULT_82575_SERDES;
-                       break;
-               case e1000_media_type_copper:
-               default:
-                       *data = ID_LED_DEFAULT;
-                       break;
-               }
-       }
-out:
-       return ret_val;
-}
-
-/**
- *  igb_sgmii_active_82575 - Return sgmii state
- *  @hw: pointer to the HW structure
- *
- *  82575 silicon has a serialized gigabit media independent interface (sgmii)
- *  which can be enabled for use in the embedded applications.  Simply
- *  return the current state of the sgmii interface.
- **/
-static bool igb_sgmii_active_82575(struct e1000_hw *hw)
-{
-       struct e1000_dev_spec_82575 *dev_spec = &hw->dev_spec._82575;
-       return dev_spec->sgmii_active;
-}
-
-/**
- *  igb_reset_init_script_82575 - Inits HW defaults after reset
- *  @hw: pointer to the HW structure
- *
- *  Inits recommended HW defaults after a reset when there is no EEPROM
- *  detected. This is only for the 82575.
- **/
-static s32 igb_reset_init_script_82575(struct e1000_hw* hw)
-{
-       DEBUGFUNC("igb_reset_init_script_82575");
-
-       if (hw->mac.type == e1000_82575) {
-               DEBUGOUT("Running reset init script for 82575\n");
-               /* SerDes configuration via SERDESCTRL */
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_SCTL, 0x00, 0x0C);
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_SCTL, 0x01, 0x78);
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_SCTL, 0x1B, 0x23);
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_SCTL, 0x23, 0x15);
-
-               /* CCM configuration via CCMCTL register */
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_CCMCTL, 0x14, 0x00);
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_CCMCTL, 0x10, 0x00);
-
-               /* PCIe lanes configuration */
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_GIOCTL, 0x00, 0xEC);
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_GIOCTL, 0x61, 0xDF);
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_GIOCTL, 0x34, 0x05);
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_GIOCTL, 0x2F, 0x81);
-
-               /* PCIe PLL Configuration */
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_SCCTL, 0x02, 0x47);
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_SCCTL, 0x14, 0x00);
-               igb_write_8bit_ctrl_reg_generic(hw, E1000_SCCTL, 0x10, 0x00);
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_read_mac_addr_82575 - Read device MAC address
- *  @hw: pointer to the HW structure
- **/
-static s32 igb_read_mac_addr_82575(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_read_mac_addr_82575");
-
-       /*
-        * If there's an alternate MAC address place it in RAR0
-        * so that it will override the Si installed default perm
-        * address.
-        */
-       ret_val = igb_check_alt_mac_addr_generic(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_read_mac_addr_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- * igb_power_down_phy_copper_82575 - Remove link during PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, remove the link.
- **/
-static void igb_power_down_phy_copper_82575(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       struct e1000_mac_info *mac = &hw->mac;
-
-       if (!(phy->ops.check_reset_block))
-               return;
-
-       /* If the management interface is not enabled, then power down */
-       if (!(mac->ops.check_mng_mode(hw) || phy->ops.check_reset_block(hw)))
-               igb_power_down_phy_copper(hw);
-
-       return;
-}
-
-/**
- *  igb_clear_hw_cntrs_82575 - Clear device specific hardware counters
- *  @hw: pointer to the HW structure
- *
- *  Clears the hardware counters by reading the counter registers.
- **/
-static void igb_clear_hw_cntrs_82575(struct e1000_hw *hw)
-{
-       DEBUGFUNC("igb_clear_hw_cntrs_82575");
-
-       igb_clear_hw_cntrs_base_generic(hw);
-
-       E1000_READ_REG(hw, E1000_PRC64);
-       E1000_READ_REG(hw, E1000_PRC127);
-       E1000_READ_REG(hw, E1000_PRC255);
-       E1000_READ_REG(hw, E1000_PRC511);
-       E1000_READ_REG(hw, E1000_PRC1023);
-       E1000_READ_REG(hw, E1000_PRC1522);
-       E1000_READ_REG(hw, E1000_PTC64);
-       E1000_READ_REG(hw, E1000_PTC127);
-       E1000_READ_REG(hw, E1000_PTC255);
-       E1000_READ_REG(hw, E1000_PTC511);
-       E1000_READ_REG(hw, E1000_PTC1023);
-       E1000_READ_REG(hw, E1000_PTC1522);
-
-       E1000_READ_REG(hw, E1000_ALGNERRC);
-       E1000_READ_REG(hw, E1000_RXERRC);
-       E1000_READ_REG(hw, E1000_TNCRS);
-       E1000_READ_REG(hw, E1000_CEXTERR);
-       E1000_READ_REG(hw, E1000_TSCTC);
-       E1000_READ_REG(hw, E1000_TSCTFC);
-
-       E1000_READ_REG(hw, E1000_MGTPRC);
-       E1000_READ_REG(hw, E1000_MGTPDC);
-       E1000_READ_REG(hw, E1000_MGTPTC);
-
-       E1000_READ_REG(hw, E1000_IAC);
-       E1000_READ_REG(hw, E1000_ICRXOC);
-
-       E1000_READ_REG(hw, E1000_ICRXPTC);
-       E1000_READ_REG(hw, E1000_ICRXATC);
-       E1000_READ_REG(hw, E1000_ICTXPTC);
-       E1000_READ_REG(hw, E1000_ICTXATC);
-       E1000_READ_REG(hw, E1000_ICTXQEC);
-       E1000_READ_REG(hw, E1000_ICTXQMTC);
-       E1000_READ_REG(hw, E1000_ICRXDMTC);
-
-       E1000_READ_REG(hw, E1000_CBTMPC);
-       E1000_READ_REG(hw, E1000_HTDPMC);
-       E1000_READ_REG(hw, E1000_CBRMPC);
-       E1000_READ_REG(hw, E1000_RPTHC);
-       E1000_READ_REG(hw, E1000_HGPTC);
-       E1000_READ_REG(hw, E1000_HTCBDPC);
-       E1000_READ_REG(hw, E1000_HGORCL);
-       E1000_READ_REG(hw, E1000_HGORCH);
-       E1000_READ_REG(hw, E1000_HGOTCL);
-       E1000_READ_REG(hw, E1000_HGOTCH);
-       E1000_READ_REG(hw, E1000_LENERRS);
-
-       /* This register should not be read in copper configurations */
-       if ((hw->phy.media_type == e1000_media_type_internal_serdes) ||
-           igb_sgmii_active_82575(hw))
-               E1000_READ_REG(hw, E1000_SCVPC);
-}
-
-/**
- *  igb_rx_fifo_flush_82575 - Clean rx fifo after RX enable
- *  @hw: pointer to the HW structure
- *
- *  After rx enable if managability is enabled then there is likely some
- *  bad data at the start of the fifo and possibly in the DMA fifo.  This
- *  function clears the fifos and flushes any packets that came in as rx was
- *  being enabled.
- **/
-void igb_rx_fifo_flush_82575(struct e1000_hw *hw)
-{
-       u32 rctl, rlpml, rxdctl[4], rfctl, temp_rctl, rx_enabled;
-       int i, ms_wait;
-
-       DEBUGFUNC("igb_rx_fifo_workaround_82575");
-       if (hw->mac.type != e1000_82575 ||
-           !(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_RCV_TCO_EN))
-               return;
-
-       /* Disable all RX queues */
-       for (i = 0; i < 4; i++) {
-               rxdctl[i] = E1000_READ_REG(hw, E1000_RXDCTL(i));
-               E1000_WRITE_REG(hw, E1000_RXDCTL(i),
-                               rxdctl[i] & ~E1000_RXDCTL_QUEUE_ENABLE);
-       }
-       /* Poll all queues to verify they have shut down */
-       for (ms_wait = 0; ms_wait < 10; ms_wait++) {
-               msec_delay(1);
-               rx_enabled = 0;
-               for (i = 0; i < 4; i++)
-                       rx_enabled |= E1000_READ_REG(hw, E1000_RXDCTL(i));
-               if (!(rx_enabled & E1000_RXDCTL_QUEUE_ENABLE))
-                       break;
-       }
-
-       if (ms_wait == 10) {
-               DEBUGOUT("Queue disable timed out after 10ms\n");
-        }
-       /* Clear RLPML, RCTL.SBP, RFCTL.LEF, and set RCTL.LPE so that all
-        * incoming packets are rejected.  Set enable and wait 2ms so that
-        * any packet that was coming in as RCTL.EN was set is flushed
-        */
-       rfctl = E1000_READ_REG(hw, E1000_RFCTL);
-       E1000_WRITE_REG(hw, E1000_RFCTL, rfctl & ~E1000_RFCTL_LEF);
-
-       rlpml = E1000_READ_REG(hw, E1000_RLPML);
-       E1000_WRITE_REG(hw, E1000_RLPML, 0);
-
-       rctl = E1000_READ_REG(hw, E1000_RCTL);
-       temp_rctl = rctl & ~(E1000_RCTL_EN | E1000_RCTL_SBP);
-       temp_rctl |= E1000_RCTL_LPE;
-
-       E1000_WRITE_REG(hw, E1000_RCTL, temp_rctl);
-       E1000_WRITE_REG(hw, E1000_RCTL, temp_rctl | E1000_RCTL_EN);
-       E1000_WRITE_FLUSH(hw);
-       msec_delay(2);
-
-       /* Enable RX queues that were previously enabled and restore our
-        * previous state
-        */
-       for (i = 0; i < 4; i++)
-               E1000_WRITE_REG(hw, E1000_RXDCTL(i), rxdctl[i]);
-       E1000_WRITE_REG(hw, E1000_RCTL, rctl);
-       E1000_WRITE_FLUSH(hw);
-
-       E1000_WRITE_REG(hw, E1000_RLPML, rlpml);
-       E1000_WRITE_REG(hw, E1000_RFCTL, rfctl);
-
-       /* Flush receive errors generated by workaround */
-       E1000_READ_REG(hw, E1000_ROC);
-       E1000_READ_REG(hw, E1000_RNBC);
-       E1000_READ_REG(hw, E1000_MPC);
-}
-
-/**
- *  igb_set_pcie_completion_timeout - set pci-e completion timeout
- *  @hw: pointer to the HW structure
- *
- *  The defaults for 82575 and 82576 should be in the range of 50us to 50ms,
- *  however the hardware default for these parts is 500us to 1ms which is less
- *  than the 10ms recommended by the pci-e spec.  To address this we need to
- *  increase the value to either 10ms to 200ms for capability version 1 config,
- *  or 16ms to 55ms for version 2.
- **/
-static s32 igb_set_pcie_completion_timeout(struct e1000_hw *hw)
-{
-       u32 gcr = E1000_READ_REG(hw, E1000_GCR);
-       s32 ret_val = E1000_SUCCESS;
-       u16 pcie_devctl2;
-
-       /* only take action if timeout value is defaulted to 0 */
-       if (gcr & E1000_GCR_CMPL_TMOUT_MASK)
-               goto out;
-
-       /*
-        * if capababilities version is type 1 we can write the
-        * timeout of 10ms to 200ms through the GCR register
-        */
-       if (!(gcr & E1000_GCR_CAP_VER2)) {
-               gcr |= E1000_GCR_CMPL_TMOUT_10ms;
-               goto out;
-       }
-
-       /*
-        * for version 2 capabilities we need to write the config space
-        * directly in order to set the completion timeout value for
-        * 16ms to 55ms
-        */
-       ret_val = igb_read_pcie_cap_reg(hw, PCIE_DEVICE_CONTROL2,
-                                         &pcie_devctl2);
-       if (ret_val)
-               goto out;
-
-       pcie_devctl2 |= PCIE_DEVICE_CONTROL2_16ms;
-
-       ret_val = igb_write_pcie_cap_reg(hw, PCIE_DEVICE_CONTROL2,
-                                          &pcie_devctl2);
-out:
-       /* disable completion timeout resend */
-       gcr &= ~E1000_GCR_CMPL_TMOUT_RESEND;
-
-       E1000_WRITE_REG(hw, E1000_GCR, gcr);
-       return ret_val;
-}
-
-/**
- *  igb_vmdq_set_loopback_pf - enable or disable vmdq loopback
- *  @hw: pointer to the hardware struct
- *  @enable: state to enter, either enabled or disabled
- *
- *  enables/disables L2 switch loopback functionality.
- **/
-void igb_vmdq_set_loopback_pf(struct e1000_hw *hw, bool enable)
-{
-       u32 dtxswc = E1000_READ_REG(hw, E1000_DTXSWC);
-
-       if (enable)
-               dtxswc |= E1000_DTXSWC_VMDQ_LOOPBACK_EN;
-       else
-               dtxswc &= ~E1000_DTXSWC_VMDQ_LOOPBACK_EN;
-
-       E1000_WRITE_REG(hw, E1000_DTXSWC, dtxswc);
-}
-
-/**
- *  igb_vmdq_set_replication_pf - enable or disable vmdq replication
- *  @hw: pointer to the hardware struct
- *  @enable: state to enter, either enabled or disabled
- *
- *  enables/disables replication of packets across multiple pools.
- **/
-void igb_vmdq_set_replication_pf(struct e1000_hw *hw, bool enable)
-{
-       u32 vt_ctl = E1000_READ_REG(hw, E1000_VT_CTL);
-
-       if (enable)
-               vt_ctl |= E1000_VT_CTL_VM_REPL_EN;
-       else
-               vt_ctl &= ~E1000_VT_CTL_VM_REPL_EN;
-
-       E1000_WRITE_REG(hw, E1000_VT_CTL, vt_ctl);
-}
-
-static struct pci_device_id igb_82575_nics[] = {
-        PCI_ROM(0x8086, 0x10C9, "E1000_DEV_ID_82576", "E1000_DEV_ID_82576", 0),
-        PCI_ROM(0x8086, 0x150A, "E1000_DEV_ID_82576_NS", "E1000_DEV_ID_82576_NS", 0),
-        PCI_ROM(0x8086, 0x1518, "E1000_DEV_ID_82576_NS_SERDES", "E1000_DEV_ID_82576_NS_SERDES", 0),
-        PCI_ROM(0x8086, 0x10E6, "E1000_DEV_ID_82576_FIBER", "E1000_DEV_ID_82576_FIBER", 0),
-        PCI_ROM(0x8086, 0x10E7, "E1000_DEV_ID_82576_SERDES", "E1000_DEV_ID_82576_SERDES", 0),
-        PCI_ROM(0x8086, 0x150D, "E1000_DEV_ID_82576_SERDES_QUAD", "E1000_DEV_ID_82576_SERDES_QUAD", 0),
-        PCI_ROM(0x8086, 0x10E8, "E1000_DEV_ID_82576_QUAD_COPPER", "E1000_DEV_ID_82576_QUAD_COPPER", 0),
-        PCI_ROM(0x8086, 0x10A7, "E1000_DEV_ID_82575EB_COPPER", "E1000_DEV_ID_82575EB_COPPER", 0),
-        PCI_ROM(0x8086, 0x10A9, "E1000_DEV_ID_82575EB_FIBER_SERDES", "E1000_DEV_ID_82575EB_FIBER_SERDES", 0),
-        PCI_ROM(0x8086, 0x10D6, "E1000_DEV_ID_82575GB_QUAD_COPPER", "E1000_DEV_ID_82575GB_QUAD_COPPER", 0),
-};
-
-struct pci_driver igb_82575_driver __pci_driver = {
-        .ids = igb_82575_nics,
-        .id_count = (sizeof (igb_82575_nics) / sizeof (igb_82575_nics[0])),
-        .probe = igb_probe,
-        .remove = igb_remove,
-};
diff --git a/src/drivers/net/igb/igb_82575.h b/src/drivers/net/igb/igb_82575.h
deleted file mode 100644 (file)
index 12c9a24..0000000
+++ /dev/null
@@ -1,442 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#ifndef _IGB_82575_H_
-#define _IGB_82575_H_
-
-#define ID_LED_DEFAULT_82575_SERDES ((ID_LED_DEF1_DEF2 << 12) | \
-                                     (ID_LED_DEF1_DEF2 <<  8) | \
-                                     (ID_LED_DEF1_DEF2 <<  4) | \
-                                     (ID_LED_OFF1_ON2))
-/*
- * Receive Address Register Count
- * Number of high/low register pairs in the RAR.  The RAR (Receive Address
- * Registers) holds the directed and multicast addresses that we monitor.
- * These entries are also used for MAC-based filtering.
- */
-/*
- * For 82576, there are an additional set of RARs that begin at an offset
- * separate from the first set of RARs.
- */
-#define E1000_RAR_ENTRIES_82575   16
-#define E1000_RAR_ENTRIES_82576   24
-
-struct e1000_adv_data_desc {
-       __le64 buffer_addr;    /* Address of the descriptor's data buffer */
-       union {
-               u32 data;
-               struct {
-                       u32 datalen :16; /* Data buffer length */
-                       u32 rsvd    :4;
-                       u32 dtyp    :4;  /* Descriptor type */
-                       u32 dcmd    :8;  /* Descriptor command */
-               } config;
-       } lower;
-       union {
-               u32 data;
-               struct {
-                       u32 status  :4;  /* Descriptor status */
-                       u32 idx     :4;
-                       u32 popts   :6;  /* Packet Options */
-                       u32 paylen  :18; /* Payload length */
-               } options;
-       } upper;
-};
-
-#define E1000_TXD_DTYP_ADV_C    0x2  /* Advanced Context Descriptor */
-#define E1000_TXD_DTYP_ADV_D    0x3  /* Advanced Data Descriptor */
-#define E1000_ADV_TXD_CMD_DEXT  0x20 /* Descriptor extension (0 = legacy) */
-#define E1000_ADV_TUCMD_IPV4    0x2  /* IP Packet Type: 1=IPv4 */
-#define E1000_ADV_TUCMD_IPV6    0x0  /* IP Packet Type: 0=IPv6 */
-#define E1000_ADV_TUCMD_L4T_UDP 0x0  /* L4 Packet TYPE of UDP */
-#define E1000_ADV_TUCMD_L4T_TCP 0x4  /* L4 Packet TYPE of TCP */
-#define E1000_ADV_TUCMD_MKRREQ  0x10 /* Indicates markers are required */
-#define E1000_ADV_DCMD_EOP      0x1  /* End of Packet */
-#define E1000_ADV_DCMD_IFCS     0x2  /* Insert FCS (Ethernet CRC) */
-#define E1000_ADV_DCMD_RS       0x8  /* Report Status */
-#define E1000_ADV_DCMD_VLE      0x40 /* Add VLAN tag */
-#define E1000_ADV_DCMD_TSE      0x80 /* TCP Seg enable */
-/* Extended Device Control */
-#define E1000_CTRL_EXT_NSICR    0x00000001 /* Disable Intr Clear all on read */
-
-struct e1000_adv_context_desc {
-       union {
-               u32 ip_config;
-               struct {
-                       u32 iplen    :9;
-                       u32 maclen   :7;
-                       u32 vlan_tag :16;
-               } fields;
-       } ip_setup;
-       u32 seq_num;
-       union {
-               u64 l4_config;
-               struct {
-                       u32 mkrloc :9;
-                       u32 tucmd  :11;
-                       u32 dtyp   :4;
-                       u32 adv    :8;
-                       u32 rsvd   :4;
-                       u32 idx    :4;
-                       u32 l4len  :8;
-                       u32 mss    :16;
-               } fields;
-       } l4_setup;
-};
-
-/* SRRCTL bit definitions */
-#define E1000_SRRCTL_BSIZEPKT_SHIFT                     10 /* Shift _right_ */
-#define E1000_SRRCTL_BSIZEHDRSIZE_MASK                  0x00000F00
-#define E1000_SRRCTL_BSIZEHDRSIZE_SHIFT                 2  /* Shift _left_ */
-#define E1000_SRRCTL_DESCTYPE_LEGACY                    0x00000000
-#define E1000_SRRCTL_DESCTYPE_ADV_ONEBUF                0x02000000
-#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT                 0x04000000
-#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS          0x0A000000
-#define E1000_SRRCTL_DESCTYPE_HDR_REPLICATION           0x06000000
-#define E1000_SRRCTL_DESCTYPE_HDR_REPLICATION_LARGE_PKT 0x08000000
-#define E1000_SRRCTL_DESCTYPE_MASK                      0x0E000000
-#define E1000_SRRCTL_DROP_EN                            0x80000000
-
-#define E1000_SRRCTL_BSIZEPKT_MASK      0x0000007F
-#define E1000_SRRCTL_BSIZEHDR_MASK      0x00003F00
-
-#define E1000_TX_HEAD_WB_ENABLE   0x1
-#define E1000_TX_SEQNUM_WB_ENABLE 0x2
-
-#define E1000_MRQC_ENABLE_RSS_4Q            0x00000002
-#define E1000_MRQC_ENABLE_VMDQ              0x00000003
-#define E1000_MRQC_ENABLE_VMDQ_RSS_2Q       0x00000005
-#define E1000_MRQC_RSS_FIELD_IPV4_UDP       0x00400000
-#define E1000_MRQC_RSS_FIELD_IPV6_UDP       0x00800000
-#define E1000_MRQC_RSS_FIELD_IPV6_UDP_EX    0x01000000
-
-#define E1000_VMRCTL_MIRROR_PORT_SHIFT      8
-#define E1000_VMRCTL_MIRROR_DSTPORT_MASK    (7 << E1000_VMRCTL_MIRROR_PORT_SHIFT)
-#define E1000_VMRCTL_POOL_MIRROR_ENABLE     (1 << 0)
-#define E1000_VMRCTL_UPLINK_MIRROR_ENABLE   (1 << 1)
-#define E1000_VMRCTL_DOWNLINK_MIRROR_ENABLE (1 << 2)
-
-#define E1000_EICR_TX_QUEUE ( \
-    E1000_EICR_TX_QUEUE0 |    \
-    E1000_EICR_TX_QUEUE1 |    \
-    E1000_EICR_TX_QUEUE2 |    \
-    E1000_EICR_TX_QUEUE3)
-
-#define E1000_EICR_RX_QUEUE ( \
-    E1000_EICR_RX_QUEUE0 |    \
-    E1000_EICR_RX_QUEUE1 |    \
-    E1000_EICR_RX_QUEUE2 |    \
-    E1000_EICR_RX_QUEUE3)
-
-#define E1000_EIMS_RX_QUEUE E1000_EICR_RX_QUEUE
-#define E1000_EIMS_TX_QUEUE E1000_EICR_TX_QUEUE
-
-#define EIMS_ENABLE_MASK ( \
-    E1000_EIMS_RX_QUEUE  | \
-    E1000_EIMS_TX_QUEUE  | \
-    E1000_EIMS_TCP_TIMER | \
-    E1000_EIMS_OTHER)
-
-/* Immediate Interrupt Rx (A.K.A. Low Latency Interrupt) */
-#define E1000_IMIR_PORT_IM_EN     0x00010000  /* TCP port enable */
-#define E1000_IMIR_PORT_BP        0x00020000  /* TCP port check bypass */
-#define E1000_IMIREXT_SIZE_BP     0x00001000  /* Packet size bypass */
-#define E1000_IMIREXT_CTRL_URG    0x00002000  /* Check URG bit in header */
-#define E1000_IMIREXT_CTRL_ACK    0x00004000  /* Check ACK bit in header */
-#define E1000_IMIREXT_CTRL_PSH    0x00008000  /* Check PSH bit in header */
-#define E1000_IMIREXT_CTRL_RST    0x00010000  /* Check RST bit in header */
-#define E1000_IMIREXT_CTRL_SYN    0x00020000  /* Check SYN bit in header */
-#define E1000_IMIREXT_CTRL_FIN    0x00040000  /* Check FIN bit in header */
-#define E1000_IMIREXT_CTRL_BP     0x00080000  /* Bypass check of ctrl bits */
-
-/* Receive Descriptor - Advanced */
-union e1000_adv_rx_desc {
-       struct {
-               __le64 pkt_addr;             /* Packet buffer address */
-               __le64 hdr_addr;             /* Header buffer address */
-       } read;
-       struct {
-               struct {
-                       union {
-                               __le32 data;
-                               struct {
-                                       __le16 pkt_info; /*RSS type, Pkt type*/
-                                       __le16 hdr_info; /* Split Header,
-                                                         * header buffer len*/
-                               } hs_rss;
-                       } lo_dword;
-                       union {
-                               __le32 rss;          /* RSS Hash */
-                               struct {
-                                       __le16 ip_id;    /* IP id */
-                                       __le16 csum;     /* Packet Checksum */
-                               } csum_ip;
-                       } hi_dword;
-               } lower;
-               struct {
-                       __le32 status_error;     /* ext status/error */
-                       __le16 length;           /* Packet length */
-                       __le16 vlan;             /* VLAN tag */
-               } upper;
-       } wb;  /* writeback */
-};
-
-#define E1000_RXDADV_RSSTYPE_MASK        0x0000000F
-#define E1000_RXDADV_RSSTYPE_SHIFT       12
-#define E1000_RXDADV_HDRBUFLEN_MASK      0x7FE0
-#define E1000_RXDADV_HDRBUFLEN_SHIFT     5
-#define E1000_RXDADV_SPLITHEADER_EN      0x00001000
-#define E1000_RXDADV_SPH                 0x8000
-#define E1000_RXDADV_STAT_TS             0x10000 /* Pkt was time stamped */
-#define E1000_RXDADV_ERR_HBO             0x00800000
-
-/* RSS Hash results */
-#define E1000_RXDADV_RSSTYPE_NONE        0x00000000
-#define E1000_RXDADV_RSSTYPE_IPV4_TCP    0x00000001
-#define E1000_RXDADV_RSSTYPE_IPV4        0x00000002
-#define E1000_RXDADV_RSSTYPE_IPV6_TCP    0x00000003
-#define E1000_RXDADV_RSSTYPE_IPV6_EX     0x00000004
-#define E1000_RXDADV_RSSTYPE_IPV6        0x00000005
-#define E1000_RXDADV_RSSTYPE_IPV6_TCP_EX 0x00000006
-#define E1000_RXDADV_RSSTYPE_IPV4_UDP    0x00000007
-#define E1000_RXDADV_RSSTYPE_IPV6_UDP    0x00000008
-#define E1000_RXDADV_RSSTYPE_IPV6_UDP_EX 0x00000009
-
-/* RSS Packet Types as indicated in the receive descriptor */
-#define E1000_RXDADV_PKTTYPE_NONE        0x00000000
-#define E1000_RXDADV_PKTTYPE_IPV4        0x00000010 /* IPV4 hdr present */
-#define E1000_RXDADV_PKTTYPE_IPV4_EX     0x00000020 /* IPV4 hdr + extensions */
-#define E1000_RXDADV_PKTTYPE_IPV6        0x00000040 /* IPV6 hdr present */
-#define E1000_RXDADV_PKTTYPE_IPV6_EX     0x00000080 /* IPV6 hdr + extensions */
-#define E1000_RXDADV_PKTTYPE_TCP         0x00000100 /* TCP hdr present */
-#define E1000_RXDADV_PKTTYPE_UDP         0x00000200 /* UDP hdr present */
-#define E1000_RXDADV_PKTTYPE_SCTP        0x00000400 /* SCTP hdr present */
-#define E1000_RXDADV_PKTTYPE_NFS         0x00000800 /* NFS hdr present */
-
-#define E1000_RXDADV_PKTTYPE_IPSEC_ESP   0x00001000 /* IPSec ESP */
-#define E1000_RXDADV_PKTTYPE_IPSEC_AH    0x00002000 /* IPSec AH */
-#define E1000_RXDADV_PKTTYPE_LINKSEC     0x00004000 /* LinkSec Encap */
-#define E1000_RXDADV_PKTTYPE_ETQF        0x00008000 /* PKTTYPE is ETQF index */
-#define E1000_RXDADV_PKTTYPE_ETQF_MASK   0x00000070 /* ETQF has 8 indices */
-#define E1000_RXDADV_PKTTYPE_ETQF_SHIFT  4          /* Right-shift 4 bits */
-
-/* LinkSec results */
-/* Security Processing bit Indication */
-#define E1000_RXDADV_LNKSEC_STATUS_SECP         0x00020000
-#define E1000_RXDADV_LNKSEC_ERROR_BIT_MASK      0x18000000
-#define E1000_RXDADV_LNKSEC_ERROR_NO_SA_MATCH   0x08000000
-#define E1000_RXDADV_LNKSEC_ERROR_REPLAY_ERROR  0x10000000
-#define E1000_RXDADV_LNKSEC_ERROR_BAD_SIG       0x18000000
-
-#define E1000_RXDADV_IPSEC_STATUS_SECP          0x00020000
-#define E1000_RXDADV_IPSEC_ERROR_BIT_MASK       0x18000000
-#define E1000_RXDADV_IPSEC_ERROR_INVALID_PROTOCOL       0x08000000
-#define E1000_RXDADV_IPSEC_ERROR_INVALID_LENGTH         0x10000000
-#define E1000_RXDADV_IPSEC_ERROR_AUTHENTICATION_FAILED  0x18000000
-
-/* Transmit Descriptor - Advanced */
-union e1000_adv_tx_desc {
-       struct {
-               __le64 buffer_addr;    /* Address of descriptor's data buf */
-               __le32 cmd_type_len;
-               __le32 olinfo_status;
-       } read;
-       struct {
-               __le64 rsvd;       /* Reserved */
-               __le32 nxtseq_seed;
-               __le32 status;
-       } wb;
-};
-
-/* Adv Transmit Descriptor Config Masks */
-#define E1000_ADVTXD_DTYP_CTXT    0x00200000 /* Advanced Context Descriptor */
-#define E1000_ADVTXD_DTYP_DATA    0x00300000 /* Advanced Data Descriptor */
-#define E1000_ADVTXD_DCMD_EOP     0x01000000 /* End of Packet */
-#define E1000_ADVTXD_DCMD_IFCS    0x02000000 /* Insert FCS (Ethernet CRC) */
-#define E1000_ADVTXD_DCMD_RS      0x08000000 /* Report Status */
-#define E1000_ADVTXD_DCMD_DDTYP_ISCSI  0x10000000 /* DDP hdr type or iSCSI */
-#define E1000_ADVTXD_DCMD_DEXT    0x20000000 /* Descriptor extension (1=Adv) */
-#define E1000_ADVTXD_DCMD_VLE     0x40000000 /* VLAN pkt enable */
-#define E1000_ADVTXD_DCMD_TSE     0x80000000 /* TCP Seg enable */
-#define E1000_ADVTXD_MAC_LINKSEC  0x00040000 /* Apply LinkSec on packet */
-#define E1000_ADVTXD_MAC_TSTAMP   0x00080000 /* IEEE1588 Timestamp packet */
-#define E1000_ADVTXD_STAT_SN_CRC  0x00000002 /* NXTSEQ/SEED present in WB */
-#define E1000_ADVTXD_IDX_SHIFT    4  /* Adv desc Index shift */
-#define E1000_ADVTXD_POPTS_ISCO_1ST  0x00000000 /* 1st TSO of iSCSI PDU */
-#define E1000_ADVTXD_POPTS_ISCO_MDL  0x00000800 /* Middle TSO of iSCSI PDU */
-#define E1000_ADVTXD_POPTS_ISCO_LAST 0x00001000 /* Last TSO of iSCSI PDU */
-#define E1000_ADVTXD_POPTS_ISCO_FULL 0x00001800 /* 1st&Last TSO-full iSCSI PDU*/
-#define E1000_ADVTXD_POPTS_IPSEC     0x00000400 /* IPSec offload request */
-#define E1000_ADVTXD_PAYLEN_SHIFT    14 /* Adv desc PAYLEN shift */
-
-/* Context descriptors */
-struct e1000_adv_tx_context_desc {
-       __le32 vlan_macip_lens;
-       __le32 seqnum_seed;
-       __le32 type_tucmd_mlhl;
-       __le32 mss_l4len_idx;
-};
-
-#define E1000_ADVTXD_MACLEN_SHIFT    9  /* Adv ctxt desc mac len shift */
-#define E1000_ADVTXD_VLAN_SHIFT     16  /* Adv ctxt vlan tag shift */
-#define E1000_ADVTXD_TUCMD_IPV4    0x00000400  /* IP Packet Type: 1=IPv4 */
-#define E1000_ADVTXD_TUCMD_IPV6    0x00000000  /* IP Packet Type: 0=IPv6 */
-#define E1000_ADVTXD_TUCMD_L4T_UDP 0x00000000  /* L4 Packet TYPE of UDP */
-#define E1000_ADVTXD_TUCMD_L4T_TCP 0x00000800  /* L4 Packet TYPE of TCP */
-#define E1000_ADVTXD_TUCMD_L4T_SCTP 0x00001000  /* L4 Packet TYPE of SCTP */
-#define E1000_ADVTXD_TUCMD_IPSEC_TYPE_ESP    0x00002000 /* IPSec Type ESP */
-/* IPSec Encrypt Enable for ESP */
-#define E1000_ADVTXD_TUCMD_IPSEC_ENCRYPT_EN  0x00004000
-#define E1000_ADVTXD_TUCMD_MKRREQ  0x00002000 /* Req requires Markers and CRC */
-#define E1000_ADVTXD_L4LEN_SHIFT     8  /* Adv ctxt L4LEN shift */
-#define E1000_ADVTXD_MSS_SHIFT      16  /* Adv ctxt MSS shift */
-/* Adv ctxt IPSec SA IDX mask */
-#define E1000_ADVTXD_IPSEC_SA_INDEX_MASK     0x000000FF
-/* Adv ctxt IPSec ESP len mask */
-#define E1000_ADVTXD_IPSEC_ESP_LEN_MASK      0x000000FF
-
-/* Additional Transmit Descriptor Control definitions */
-#define E1000_TXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Tx Queue */
-#define E1000_TXDCTL_SWFLSH        0x04000000 /* Tx Desc. write-back flushing */
-/* Tx Queue Arbitration Priority 0=low, 1=high */
-#define E1000_TXDCTL_PRIORITY      0x08000000
-
-/* Additional Receive Descriptor Control definitions */
-#define E1000_RXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Rx Queue */
-#define E1000_RXDCTL_SWFLSH        0x04000000 /* Rx Desc. write-back flushing */
-
-/* Direct Cache Access (DCA) definitions */
-#define E1000_DCA_CTRL_DCA_ENABLE  0x00000000 /* DCA Enable */
-#define E1000_DCA_CTRL_DCA_DISABLE 0x00000001 /* DCA Disable */
-
-#define E1000_DCA_CTRL_DCA_MODE_CB1 0x00 /* DCA Mode CB1 */
-#define E1000_DCA_CTRL_DCA_MODE_CB2 0x02 /* DCA Mode CB2 */
-
-#define E1000_DCA_RXCTRL_CPUID_MASK 0x0000001F /* Rx CPUID Mask */
-#define E1000_DCA_RXCTRL_DESC_DCA_EN (1 << 5) /* DCA Rx Desc enable */
-#define E1000_DCA_RXCTRL_HEAD_DCA_EN (1 << 6) /* DCA Rx Desc header enable */
-#define E1000_DCA_RXCTRL_DATA_DCA_EN (1 << 7) /* DCA Rx Desc payload enable */
-
-#define E1000_DCA_TXCTRL_CPUID_MASK 0x0000001F /* Tx CPUID Mask */
-#define E1000_DCA_TXCTRL_DESC_DCA_EN (1 << 5) /* DCA Tx Desc enable */
-#define E1000_DCA_TXCTRL_TX_WB_RO_EN (1 << 11) /* Tx Desc writeback RO bit */
-
-#define E1000_DCA_TXCTRL_CPUID_MASK_82576 0xFF000000 /* Tx CPUID Mask */
-#define E1000_DCA_RXCTRL_CPUID_MASK_82576 0xFF000000 /* Rx CPUID Mask */
-#define E1000_DCA_TXCTRL_CPUID_SHIFT_82576 24 /* Tx CPUID */
-#define E1000_DCA_RXCTRL_CPUID_SHIFT_82576 24 /* Rx CPUID */
-
-/* Additional interrupt register bit definitions */
-#define E1000_ICR_LSECPNS       0x00000020          /* PN threshold - server */
-#define E1000_IMS_LSECPNS       E1000_ICR_LSECPNS   /* PN threshold - server */
-#define E1000_ICS_LSECPNS       E1000_ICR_LSECPNS   /* PN threshold - server */
-
-/* ETQF register bit definitions */
-#define E1000_ETQF_FILTER_ENABLE   (1 << 26)
-#define E1000_ETQF_IMM_INT         (1 << 29)
-#define E1000_ETQF_1588            (1 << 30)
-#define E1000_ETQF_QUEUE_ENABLE    (1 << 31)
-/*
- * ETQF filter list: one static filter per filter consumer. This is
- *                   to avoid filter collisions later. Add new filters
- *                   here!!
- *
- * Current filters:
- *    EAPOL 802.1x (0x888e): Filter 0
- */
-#define E1000_ETQF_FILTER_EAPOL          0
-
-#define E1000_FTQF_VF_BP               0x00008000
-#define E1000_FTQF_1588_TIME_STAMP     0x08000000
-#define E1000_FTQF_MASK                0xF0000000
-#define E1000_FTQF_MASK_PROTO_BP       0x10000000
-#define E1000_FTQF_MASK_SOURCE_ADDR_BP 0x20000000
-#define E1000_FTQF_MASK_DEST_ADDR_BP   0x40000000
-#define E1000_FTQF_MASK_SOURCE_PORT_BP 0x80000000
-
-#define E1000_NVM_APME_82575          0x0400
-#define MAX_NUM_VFS                   8
-
-#define E1000_DTXSWC_MAC_SPOOF_MASK   0x000000FF /* Per VF MAC spoof control */
-#define E1000_DTXSWC_VLAN_SPOOF_MASK  0x0000FF00 /* Per VF VLAN spoof control */
-#define E1000_DTXSWC_LLE_MASK         0x00FF0000 /* Per VF Local LB enables */
-#define E1000_DTXSWC_VLAN_SPOOF_SHIFT 8
-#define E1000_DTXSWC_LLE_SHIFT        16
-#define E1000_DTXSWC_VMDQ_LOOPBACK_EN (1 << 31)  /* global VF LB enable */
-
-/* Easy defines for setting default pool, would normally be left a zero */
-#define E1000_VT_CTL_DEFAULT_POOL_SHIFT 7
-#define E1000_VT_CTL_DEFAULT_POOL_MASK  (0x7 << E1000_VT_CTL_DEFAULT_POOL_SHIFT)
-
-/* Other useful VMD_CTL register defines */
-#define E1000_VT_CTL_IGNORE_MAC         (1 << 28)
-#define E1000_VT_CTL_DISABLE_DEF_POOL   (1 << 29)
-#define E1000_VT_CTL_VM_REPL_EN         (1 << 30)
-
-/* Per VM Offload register setup */
-#define E1000_VMOLR_RLPML_MASK 0x00003FFF /* Long Packet Maximum Length mask */
-#define E1000_VMOLR_LPE        0x00010000 /* Accept Long packet */
-#define E1000_VMOLR_RSSE       0x00020000 /* Enable RSS */
-#define E1000_VMOLR_AUPE       0x01000000 /* Accept untagged packets */
-#define E1000_VMOLR_ROMPE      0x02000000 /* Accept overflow multicast */
-#define E1000_VMOLR_ROPE       0x04000000 /* Accept overflow unicast */
-#define E1000_VMOLR_BAM        0x08000000 /* Accept Broadcast packets */
-#define E1000_VMOLR_MPME       0x10000000 /* Multicast promiscuous mode */
-#define E1000_VMOLR_STRVLAN    0x40000000 /* Vlan stripping enable */
-#define E1000_VMOLR_STRCRC     0x80000000 /* CRC stripping enable */
-
-#define E1000_VLVF_ARRAY_SIZE     32
-#define E1000_VLVF_VLANID_MASK    0x00000FFF
-#define E1000_VLVF_POOLSEL_SHIFT  12
-#define E1000_VLVF_POOLSEL_MASK   (0xFF << E1000_VLVF_POOLSEL_SHIFT)
-#define E1000_VLVF_LVLAN          0x00100000
-#define E1000_VLVF_VLANID_ENABLE  0x80000000
-
-#define E1000_VF_INIT_TIMEOUT 200 /* Number of retries to clear RSTI */
-
-#define E1000_IOVCTL 0x05BBC
-#define E1000_IOVCTL_REUSE_VFQ 0x00000001
-
-#define E1000_RPLOLR_STRVLAN   0x40000000
-#define E1000_RPLOLR_STRCRC    0x80000000
-
-#define E1000_DTXCTL_8023LL     0x0004
-#define E1000_DTXCTL_VLAN_ADDED 0x0008
-#define E1000_DTXCTL_OOS_ENABLE 0x0010
-#define E1000_DTXCTL_MDP_EN     0x0020
-#define E1000_DTXCTL_SPOOF_INT  0x0040
-
-#define ALL_QUEUES   0xFFFF
-
-/* RX packet buffer size defines */
-#define E1000_RXPBS_SIZE_MASK_82576  0x0000007F
-void e1000_vmdq_set_loopback_pf(struct e1000_hw *hw, bool enable);
-void e1000_vmdq_set_replication_pf(struct e1000_hw *hw, bool enable);
-
-#endif /* _IGB_82575_H_ */
diff --git a/src/drivers/net/igb/igb_api.c b/src/drivers/net/igb/igb_api.c
deleted file mode 100644 (file)
index eda6bc0..0000000
+++ /dev/null
@@ -1,1108 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#include "igb.h"
-
-/**
- *  igb_init_mac_params - Initialize MAC function pointers
- *  @hw: pointer to the HW structure
- *
- *  This function initializes the function pointers for the MAC
- *  set of functions.  Called by drivers or by e1000_setup_init_funcs.
- **/
-s32 igb_init_mac_params(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->mac.ops.init_params) {
-               ret_val = hw->mac.ops.init_params(hw);
-               if (ret_val) {
-                       DEBUGOUT("MAC Initialization Error\n");
-                       goto out;
-               }
-       } else {
-               DEBUGOUT("mac.init_mac_params was NULL\n");
-               ret_val = -E1000_ERR_CONFIG;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_init_nvm_params - Initialize NVM function pointers
- *  @hw: pointer to the HW structure
- *
- *  This function initializes the function pointers for the NVM
- *  set of functions.  Called by drivers or by e1000_setup_init_funcs.
- **/
-s32 igb_init_nvm_params(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->nvm.ops.init_params) {
-               ret_val = hw->nvm.ops.init_params(hw);
-               if (ret_val) {
-                       DEBUGOUT("NVM Initialization Error\n");
-                       goto out;
-               }
-       } else {
-               DEBUGOUT("nvm.init_nvm_params was NULL\n");
-               ret_val = -E1000_ERR_CONFIG;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_init_phy_params - Initialize PHY function pointers
- *  @hw: pointer to the HW structure
- *
- *  This function initializes the function pointers for the PHY
- *  set of functions.  Called by drivers or by e1000_setup_init_funcs.
- **/
-s32 igb_init_phy_params(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->phy.ops.init_params) {
-               ret_val = hw->phy.ops.init_params(hw);
-               if (ret_val) {
-                       DEBUGOUT("PHY Initialization Error\n");
-                       goto out;
-               }
-       } else {
-               DEBUGOUT("phy.init_phy_params was NULL\n");
-               ret_val =  -E1000_ERR_CONFIG;
-       }
-
-out:
-       return ret_val;
-}
-
-#if 0
-/**
- *  igb_init_mbx_params - Initialize mailbox function pointers
- *  @hw: pointer to the HW structure
- *
- *  This function initializes the function pointers for the PHY
- *  set of functions.  Called by drivers or by e1000_setup_init_funcs.
- **/
-s32 igb_init_mbx_params(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       if (hw->mbx.ops.init_params) {
-               ret_val = hw->mbx.ops.init_params(hw);
-               if (ret_val) {
-                       DEBUGOUT("Mailbox Initialization Error\n");
-                       goto out;
-               }
-       } else {
-               DEBUGOUT("mbx.init_mbx_params was NULL\n");
-               ret_val =  -E1000_ERR_CONFIG;
-       }
-
-out:
-       return ret_val;
-}
-#endif
-
-/**
- *  igb_set_mac_type - Sets MAC type
- *  @hw: pointer to the HW structure
- *
- *  This function sets the mac type of the adapter based on the
- *  device ID stored in the hw structure.
- *  MUST BE FIRST FUNCTION CALLED (explicitly or through
- *  igb_setup_init_funcs()).
- **/
-s32 igb_set_mac_type(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_set_mac_type");
-
-       switch (hw->device_id) {
-       case E1000_DEV_ID_82575EB_COPPER:
-       case E1000_DEV_ID_82575EB_FIBER_SERDES:
-       case E1000_DEV_ID_82575GB_QUAD_COPPER:
-               mac->type = e1000_82575;
-               break;
-       case E1000_DEV_ID_82576:
-       case E1000_DEV_ID_82576_FIBER:
-       case E1000_DEV_ID_82576_SERDES:
-       case E1000_DEV_ID_82576_QUAD_COPPER:
-       case E1000_DEV_ID_82576_NS:
-       case E1000_DEV_ID_82576_NS_SERDES:
-       case E1000_DEV_ID_82576_SERDES_QUAD:
-               mac->type = e1000_82576;
-               break;
-       default:
-               /* Should never have loaded on this device */
-               ret_val = -E1000_ERR_MAC_INIT;
-               break;
-       }
-
-       return ret_val;
-}
-
-/**
- *  igb_setup_init_funcs - Initializes function pointers
- *  @hw: pointer to the HW structure
- *  @init_device: true will initialize the rest of the function pointers
- *                 getting the device ready for use.  false will only set
- *                 MAC type and the function pointers for the other init
- *                 functions.  Passing false will not generate any hardware
- *                 reads or writes.
- *
- *  This function must be called by a driver in order to use the rest
- *  of the 'shared' code files. Called by drivers only.
- **/
-s32 igb_setup_init_funcs(struct e1000_hw *hw, bool init_device)
-{
-       s32 ret_val;
-
-       /* Can't do much good without knowing the MAC type. */
-       ret_val = igb_set_mac_type(hw);
-       if (ret_val) {
-               DEBUGOUT("ERROR: MAC type could not be set properly.\n");
-               goto out;
-       }
-
-       if (!hw->hw_addr) {
-               DEBUGOUT("ERROR: Registers not mapped\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       /*
-        * Init function pointers to generic implementations. We do this first
-        * allowing a driver module to override it afterward.
-        */
-       igb_init_mac_ops_generic(hw);
-       igb_init_nvm_ops_generic(hw);
-#if 0
-       igb_init_mbx_ops_generic(hw);
-#endif
-       /*
-        * Set up the init function pointers. These are functions within the
-        * adapter family file that sets up function pointers for the rest of
-        * the functions in that family.
-        */
-       switch (hw->mac.type) {
-       case e1000_82575:
-       case e1000_82576:
-               igb_init_function_pointers_82575(hw);
-               break;
-       default:
-               DEBUGOUT("Hardware not supported\n");
-               ret_val = -E1000_ERR_CONFIG;
-               break;
-       }
-
-       /*
-        * Initialize the rest of the function pointers. These require some
-        * register reads/writes in some cases.
-        */
-       if (!(ret_val) && init_device) {
-               ret_val = igb_init_mac_params(hw);
-               if (ret_val)
-                       goto out;
-
-               ret_val = igb_init_nvm_params(hw);
-               if (ret_val)
-                       goto out;
-
-               ret_val = igb_init_phy_params(hw);
-               if (ret_val)
-                       goto out;
-#if 0
-               ret_val = igb_init_mbx_params(hw);
-               if (ret_val)
-                       goto out;
-#endif
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_get_bus_info - Obtain bus information for adapter
- *  @hw: pointer to the HW structure
- *
- *  This will obtain information about the HW bus for which the
- *  adapter is attached and stores it in the hw structure. This is a
- *  function pointer entry point called by drivers.
- **/
-s32 igb_get_bus_info(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.get_bus_info)
-               return hw->mac.ops.get_bus_info(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_clear_vfta - Clear VLAN filter table
- *  @hw: pointer to the HW structure
- *
- *  This clears the VLAN filter table on the adapter. This is a function
- *  pointer entry point called by drivers.
- **/
-void igb_clear_vfta(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.clear_vfta)
-               hw->mac.ops.clear_vfta(hw);
-}
-
-/**
- *  igb_write_vfta - Write value to VLAN filter table
- *  @hw: pointer to the HW structure
- *  @offset: the 32-bit offset in which to write the value to.
- *  @value: the 32-bit value to write at location offset.
- *
- *  This writes a 32-bit value to a 32-bit offset in the VLAN filter
- *  table. This is a function pointer entry point called by drivers.
- **/
-void igb_write_vfta(struct e1000_hw *hw, u32 offset, u32 value)
-{
-       if (hw->mac.ops.write_vfta)
-               hw->mac.ops.write_vfta(hw, offset, value);
-}
-
-/**
- *  igb_update_mc_addr_list - Update Multicast addresses
- *  @hw: pointer to the HW structure
- *  @mc_addr_list: array of multicast addresses to program
- *  @mc_addr_count: number of multicast addresses to program
- *
- *  Updates the Multicast Table Array.
- *  The caller must have a packed mc_addr_list of multicast addresses.
- **/
-void igb_update_mc_addr_list(struct e1000_hw *hw, u8 *mc_addr_list,
-                               u32 mc_addr_count)
-{
-       if (hw->mac.ops.update_mc_addr_list)
-               hw->mac.ops.update_mc_addr_list(hw, mc_addr_list,
-                                               mc_addr_count);
-}
-
-/**
- *  igb_force_mac_fc - Force MAC flow control
- *  @hw: pointer to the HW structure
- *
- *  Force the MAC's flow control settings. Currently no func pointer exists
- *  and all implementations are handled in the generic version of this
- *  function.
- **/
-s32 igb_force_mac_fc(struct e1000_hw *hw)
-{
-       return igb_force_mac_fc_generic(hw);
-}
-
-/**
- *  igb_check_for_link - Check/Store link connection
- *  @hw: pointer to the HW structure
- *
- *  This checks the link condition of the adapter and stores the
- *  results in the hw->mac structure. This is a function pointer entry
- *  point called by drivers.
- **/
-s32 igb_check_for_link(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.check_for_link)
-               return hw->mac.ops.check_for_link(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  igb_check_mng_mode - Check management mode
- *  @hw: pointer to the HW structure
- *
- *  This checks if the adapter has manageability enabled.
- *  This is a function pointer entry point called by drivers.
- **/
-bool igb_check_mng_mode(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.check_mng_mode)
-               return hw->mac.ops.check_mng_mode(hw);
-
-       return false;
-}
-
-#if 0
-/**
- *  igb_mng_write_dhcp_info - Writes DHCP info to host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface
- *  @length: size of the buffer
- *
- *  Writes the DHCP information to the host interface.
- **/
-s32 igb_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length)
-{
-       return igb_mng_write_dhcp_info_generic(hw, buffer, length);
-}
-#endif
-
-/**
- *  igb_reset_hw - Reset hardware
- *  @hw: pointer to the HW structure
- *
- *  This resets the hardware into a known state. This is a function pointer
- *  entry point called by drivers.
- **/
-s32 igb_reset_hw(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.reset_hw)
-               return hw->mac.ops.reset_hw(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  igb_init_hw - Initialize hardware
- *  @hw: pointer to the HW structure
- *
- *  This inits the hardware readying it for operation. This is a function
- *  pointer entry point called by drivers.
- **/
-s32 igb_init_hw(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.init_hw)
-               return hw->mac.ops.init_hw(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  igb_setup_link - Configures link and flow control
- *  @hw: pointer to the HW structure
- *
- *  This configures link and flow control settings for the adapter. This
- *  is a function pointer entry point called by drivers. While modules can
- *  also call this, they probably call their own version of this function.
- **/
-s32 igb_setup_link(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.setup_link)
-               return hw->mac.ops.setup_link(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  igb_get_speed_and_duplex - Returns current speed and duplex
- *  @hw: pointer to the HW structure
- *  @speed: pointer to a 16-bit value to store the speed
- *  @duplex: pointer to a 16-bit value to store the duplex.
- *
- *  This returns the speed and duplex of the adapter in the two 'out'
- *  variables passed in. This is a function pointer entry point called
- *  by drivers.
- **/
-s32 igb_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex)
-{
-       if (hw->mac.ops.get_link_up_info)
-               return hw->mac.ops.get_link_up_info(hw, speed, duplex);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  igb_setup_led - Configures SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This prepares the SW controllable LED for use and saves the current state
- *  of the LED so it can be later restored. This is a function pointer entry
- *  point called by drivers.
- **/
-s32 igb_setup_led(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.setup_led)
-               return hw->mac.ops.setup_led(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_cleanup_led - Restores SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This restores the SW controllable LED to the value saved off by
- *  e1000_setup_led. This is a function pointer entry point called by drivers.
- **/
-s32 igb_cleanup_led(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.cleanup_led)
-               return hw->mac.ops.cleanup_led(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_blink_led - Blink SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This starts the adapter LED blinking. Request the LED to be setup first
- *  and cleaned up after. This is a function pointer entry point called by
- *  drivers.
- **/
-s32 igb_blink_led(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.blink_led)
-               return hw->mac.ops.blink_led(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_id_led_init - store LED configurations in SW
- *  @hw: pointer to the HW structure
- *
- *  Initializes the LED config in SW. This is a function pointer entry point
- *  called by drivers.
- **/
-s32 igb_id_led_init(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.id_led_init)
-               return hw->mac.ops.id_led_init(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_led_on - Turn on SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  Turns the SW defined LED on. This is a function pointer entry point
- *  called by drivers.
- **/
-s32 igb_led_on(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.led_on)
-               return hw->mac.ops.led_on(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_led_off - Turn off SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  Turns the SW defined LED off. This is a function pointer entry point
- *  called by drivers.
- **/
-s32 igb_led_off(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.led_off)
-               return hw->mac.ops.led_off(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_reset_adaptive - Reset adaptive IFS
- *  @hw: pointer to the HW structure
- *
- *  Resets the adaptive IFS. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-void igb_reset_adaptive(struct e1000_hw *hw)
-{
-       igb_reset_adaptive_generic(hw);
-}
-
-/**
- *  igb_update_adaptive - Update adaptive IFS
- *  @hw: pointer to the HW structure
- *
- *  Updates adapter IFS. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-void igb_update_adaptive(struct e1000_hw *hw)
-{
-       igb_update_adaptive_generic(hw);
-}
-
-/**
- *  igb_disable_pcie_master - Disable PCI-Express master access
- *  @hw: pointer to the HW structure
- *
- *  Disables PCI-Express master access and verifies there are no pending
- *  requests. Currently no func pointer exists and all implementations are
- *  handled in the generic version of this function.
- **/
-s32 igb_disable_pcie_master(struct e1000_hw *hw)
-{
-       return igb_disable_pcie_master_generic(hw);
-}
-
-/**
- *  igb_config_collision_dist - Configure collision distance
- *  @hw: pointer to the HW structure
- *
- *  Configures the collision distance to the default value and is used
- *  during link setup.
- **/
-void igb_config_collision_dist(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.config_collision_dist)
-               hw->mac.ops.config_collision_dist(hw);
-}
-
-/**
- *  igb_rar_set - Sets a receive address register
- *  @hw: pointer to the HW structure
- *  @addr: address to set the RAR to
- *  @index: the RAR to set
- *
- *  Sets a Receive Address Register (RAR) to the specified address.
- **/
-void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
-{
-       if (hw->mac.ops.rar_set)
-               hw->mac.ops.rar_set(hw, addr, index);
-}
-
-/**
- *  igb_validate_mdi_setting - Ensures valid MDI/MDIX SW state
- *  @hw: pointer to the HW structure
- *
- *  Ensures that the MDI/MDIX SW state is valid.
- **/
-s32 igb_validate_mdi_setting(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.validate_mdi_setting)
-               return hw->mac.ops.validate_mdi_setting(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_mta_set - Sets multicast table bit
- *  @hw: pointer to the HW structure
- *  @hash_value: Multicast hash value.
- *
- *  This sets the bit in the multicast table corresponding to the
- *  hash value.  This is a function pointer entry point called by drivers.
- **/
-void igb_mta_set(struct e1000_hw *hw, u32 hash_value)
-{
-       if (hw->mac.ops.mta_set)
-               hw->mac.ops.mta_set(hw, hash_value);
-}
-
-/**
- *  igb_hash_mc_addr - Determines address location in multicast table
- *  @hw: pointer to the HW structure
- *  @mc_addr: Multicast address to hash.
- *
- *  This hashes an address to determine its location in the multicast
- *  table. Currently no func pointer exists and all implementations
- *  are handled in the generic version of this function.
- **/
-u32 igb_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr)
-{
-       return igb_hash_mc_addr_generic(hw, mc_addr);
-}
-
-/**
- *  igb_enable_tx_pkt_filtering - Enable packet filtering on TX
- *  @hw: pointer to the HW structure
- *
- *  Enables packet filtering on transmit packets if manageability is enabled
- *  and host interface is enabled.
- *  Currently no func pointer exists and all implementations are handled in the
- *  generic version of this function.
- **/
-#if 0
-bool igb_enable_tx_pkt_filtering(struct e1000_hw *hw)
-{
-       return igb_enable_tx_pkt_filtering_generic(hw);
-}
-#endif
-
-/**
- *  igb_mng_host_if_write - Writes to the manageability host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface buffer
- *  @length: size of the buffer
- *  @offset: location in the buffer to write to
- *  @sum: sum of the data (not checksum)
- *
- *  This function writes the buffer content at the offset given on the host if.
- *  It also does alignment considerations to do the writes in most efficient
- *  way.  Also fills up the sum of the buffer in *buffer parameter.
- **/
-s32 igb_mng_host_if_write(struct e1000_hw * hw, u8 *buffer, u16 length,
-                            u16 offset, u8 *sum)
-{
-       if (hw->mac.ops.mng_host_if_write)
-               return hw->mac.ops.mng_host_if_write(hw, buffer, length,
-                                                    offset, sum);
-
-       return E1000_NOT_IMPLEMENTED;
-}
-
-/**
- *  igb_mng_write_cmd_header - Writes manageability command header
- *  @hw: pointer to the HW structure
- *  @hdr: pointer to the host interface command header
- *
- *  Writes the command header after does the checksum calculation.
- **/
-s32 igb_mng_write_cmd_header(struct e1000_hw *hw,
-                               struct e1000_host_mng_command_header *hdr)
-{
-       if (hw->mac.ops.mng_write_cmd_header)
-               return hw->mac.ops.mng_write_cmd_header(hw, hdr);
-
-       return E1000_NOT_IMPLEMENTED;
-}
-
-/**
- *  igb_mng_enable_host_if - Checks host interface is enabled
- *  @hw: pointer to the HW structure
- *
- *  Returns E1000_success upon success, else E1000_ERR_HOST_INTERFACE_COMMAND
- *
- *  This function checks whether the HOST IF is enabled for command operation
- *  and also checks whether the previous command is completed.  It busy waits
- *  in case of previous command is not completed.
- **/
-s32 igb_mng_enable_host_if(struct e1000_hw * hw)
-{
-       if (hw->mac.ops.mng_enable_host_if)
-               return hw->mac.ops.mng_enable_host_if(hw);
-
-       return E1000_NOT_IMPLEMENTED;
-}
-
-/**
- *  igb_wait_autoneg - Waits for autonegotiation completion
- *  @hw: pointer to the HW structure
- *
- *  Waits for autoneg to complete. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-s32 igb_wait_autoneg(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.wait_autoneg)
-               return hw->mac.ops.wait_autoneg(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_check_reset_block - Verifies PHY can be reset
- *  @hw: pointer to the HW structure
- *
- *  Checks if the PHY is in a state that can be reset or if manageability
- *  has it tied up. This is a function pointer entry point called by drivers.
- **/
-s32 igb_check_reset_block(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.check_reset_block)
-               return hw->phy.ops.check_reset_block(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_read_phy_reg - Reads PHY register
- *  @hw: pointer to the HW structure
- *  @offset: the register to read
- *  @data: the buffer to store the 16-bit read.
- *
- *  Reads the PHY register and returns the value in data.
- *  This is a function pointer entry point called by drivers.
- **/
-s32 igb_read_phy_reg(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       if (hw->phy.ops.read_reg)
-               return hw->phy.ops.read_reg(hw, offset, data);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_write_phy_reg - Writes PHY register
- *  @hw: pointer to the HW structure
- *  @offset: the register to write
- *  @data: the value to write.
- *
- *  Writes the PHY register at offset with the value in data.
- *  This is a function pointer entry point called by drivers.
- **/
-s32 igb_write_phy_reg(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       if (hw->phy.ops.write_reg)
-               return hw->phy.ops.write_reg(hw, offset, data);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_release_phy - Generic release PHY
- *  @hw: pointer to the HW structure
- *
- *  Return if silicon family does not require a semaphore when accessing the
- *  PHY.
- **/
-void igb_release_phy(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.release)
-               hw->phy.ops.release(hw);
-}
-
-/**
- *  igb_acquire_phy - Generic acquire PHY
- *  @hw: pointer to the HW structure
- *
- *  Return success if silicon family does not require a semaphore when
- *  accessing the PHY.
- **/
-s32 igb_acquire_phy(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.acquire)
-               return hw->phy.ops.acquire(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_read_kmrn_reg - Reads register using Kumeran interface
- *  @hw: pointer to the HW structure
- *  @offset: the register to read
- *  @data: the location to store the 16-bit value read.
- *
- *  Reads a register out of the Kumeran interface. Currently no func pointer
- *  exists and all implementations are handled in the generic version of
- *  this function.
- **/
-s32 igb_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return igb_read_kmrn_reg_generic(hw, offset, data);
-}
-
-/**
- *  igb_write_kmrn_reg - Writes register using Kumeran interface
- *  @hw: pointer to the HW structure
- *  @offset: the register to write
- *  @data: the value to write.
- *
- *  Writes a register to the Kumeran interface. Currently no func pointer
- *  exists and all implementations are handled in the generic version of
- *  this function.
- **/
-s32 igb_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return igb_write_kmrn_reg_generic(hw, offset, data);
-}
-
-#if 0
-/**
- *  igb_get_cable_length - Retrieves cable length estimation
- *  @hw: pointer to the HW structure
- *
- *  This function estimates the cable length and stores them in
- *  hw->phy.min_length and hw->phy.max_length. This is a function pointer
- *  entry point called by drivers.
- **/
-s32 igb_get_cable_length(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.get_cable_length)
-               return hw->phy.ops.get_cable_length(hw);
-
-       return E1000_SUCCESS;
-}
-#endif
-
-/**
- *  igb_get_phy_info - Retrieves PHY information from registers
- *  @hw: pointer to the HW structure
- *
- *  This function gets some information from various PHY registers and
- *  populates hw->phy values with it. This is a function pointer entry
- *  point called by drivers.
- **/
-s32 igb_get_phy_info(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.get_info)
-               return hw->phy.ops.get_info(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_phy_hw_reset - Hard PHY reset
- *  @hw: pointer to the HW structure
- *
- *  Performs a hard PHY reset. This is a function pointer entry point called
- *  by drivers.
- **/
-s32 igb_phy_hw_reset(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.reset)
-               return hw->phy.ops.reset(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_phy_commit - Soft PHY reset
- *  @hw: pointer to the HW structure
- *
- *  Performs a soft PHY reset on those that apply. This is a function pointer
- *  entry point called by drivers.
- **/
-s32 igb_phy_commit(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.commit)
-               return hw->phy.ops.commit(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_set_d0_lplu_state - Sets low power link up state for D0
- *  @hw: pointer to the HW structure
- *  @active: boolean used to enable/disable lplu
- *
- *  Success returns 0, Failure returns 1
- *
- *  The low power link up (lplu) state is set to the power management level D0
- *  and SmartSpeed is disabled when active is true, else clear lplu for D0
- *  and enable Smartspeed.  LPLU and Smartspeed are mutually exclusive.  LPLU
- *  is used during Dx states where the power conservation is most important.
- *  During driver activity, SmartSpeed should be enabled so performance is
- *  maintained.  This is a function pointer entry point called by drivers.
- **/
-s32 igb_set_d0_lplu_state(struct e1000_hw *hw, bool active)
-{
-       if (hw->phy.ops.set_d0_lplu_state)
-               return hw->phy.ops.set_d0_lplu_state(hw, active);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_set_d3_lplu_state - Sets low power link up state for D3
- *  @hw: pointer to the HW structure
- *  @active: boolean used to enable/disable lplu
- *
- *  Success returns 0, Failure returns 1
- *
- *  The low power link up (lplu) state is set to the power management level D3
- *  and SmartSpeed is disabled when active is true, else clear lplu for D3
- *  and enable Smartspeed.  LPLU and Smartspeed are mutually exclusive.  LPLU
- *  is used during Dx states where the power conservation is most important.
- *  During driver activity, SmartSpeed should be enabled so performance is
- *  maintained.  This is a function pointer entry point called by drivers.
- **/
-s32 igb_set_d3_lplu_state(struct e1000_hw *hw, bool active)
-{
-       if (hw->phy.ops.set_d3_lplu_state)
-               return hw->phy.ops.set_d3_lplu_state(hw, active);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_read_mac_addr - Reads MAC address
- *  @hw: pointer to the HW structure
- *
- *  Reads the MAC address out of the adapter and stores it in the HW structure.
- *  Currently no func pointer exists and all implementations are handled in the
- *  generic version of this function.
- **/
-s32 igb_read_mac_addr(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.read_mac_addr)
-               return hw->mac.ops.read_mac_addr(hw);
-
-       return igb_read_mac_addr_generic(hw);
-}
-
-/**
- *  igb_read_pba_num - Read device part number
- *  @hw: pointer to the HW structure
- *  @pba_num: pointer to device part number
- *
- *  Reads the product board assembly (PBA) number from the EEPROM and stores
- *  the value in pba_num.
- *  Currently no func pointer exists and all implementations are handled in the
- *  generic version of this function.
- **/
-s32 igb_read_pba_num(struct e1000_hw *hw, u32 *pba_num)
-{
-       return igb_read_pba_num_generic(hw, pba_num);
-}
-
-/**
- *  igb_validate_nvm_checksum - Verifies NVM (EEPROM) checksum
- *  @hw: pointer to the HW structure
- *
- *  Validates the NVM checksum is correct. This is a function pointer entry
- *  point called by drivers.
- **/
-s32 igb_validate_nvm_checksum(struct e1000_hw *hw)
-{
-       if (hw->nvm.ops.validate)
-               return hw->nvm.ops.validate(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  igb_update_nvm_checksum - Updates NVM (EEPROM) checksum
- *  @hw: pointer to the HW structure
- *
- *  Updates the NVM checksum. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-s32 igb_update_nvm_checksum(struct e1000_hw *hw)
-{
-       if (hw->nvm.ops.update)
-               return hw->nvm.ops.update(hw);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  igb_reload_nvm - Reloads EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Reloads the EEPROM by setting the "Reinitialize from EEPROM" bit in the
- *  extended control register.
- **/
-void igb_reload_nvm(struct e1000_hw *hw)
-{
-       if (hw->nvm.ops.reload)
-               hw->nvm.ops.reload(hw);
-}
-
-/**
- *  igb_read_nvm - Reads NVM (EEPROM)
- *  @hw: pointer to the HW structure
- *  @offset: the word offset to read
- *  @words: number of 16-bit words to read
- *  @data: pointer to the properly sized buffer for the data.
- *
- *  Reads 16-bit chunks of data from the NVM (EEPROM). This is a function
- *  pointer entry point called by drivers.
- **/
-s32 igb_read_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       if (hw->nvm.ops.read)
-               return hw->nvm.ops.read(hw, offset, words, data);
-
-       return -E1000_ERR_CONFIG;
-}
-
-/**
- *  igb_write_nvm - Writes to NVM (EEPROM)
- *  @hw: pointer to the HW structure
- *  @offset: the word offset to read
- *  @words: number of 16-bit words to write
- *  @data: pointer to the properly sized buffer for the data.
- *
- *  Writes 16-bit chunks of data to the NVM (EEPROM). This is a function
- *  pointer entry point called by drivers.
- **/
-s32 igb_write_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       if (hw->nvm.ops.write)
-               return hw->nvm.ops.write(hw, offset, words, data);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_write_8bit_ctrl_reg - Writes 8bit Control register
- *  @hw: pointer to the HW structure
- *  @reg: 32bit register offset
- *  @offset: the register to write
- *  @data: the value to write.
- *
- *  Writes the PHY register at offset with the value in data.
- *  This is a function pointer entry point called by drivers.
- **/
-s32 igb_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg, u32 offset,
-                              u8 data)
-{
-       return igb_write_8bit_ctrl_reg_generic(hw, reg, offset, data);
-}
-
-/**
- * igb_power_up_phy - Restores link in case of PHY power down
- * @hw: pointer to the HW structure
- *
- * The phy may be powered down to save power, to turn off link when the
- * driver is unloaded, or wake on lan is not enabled (among others).
- **/
-void igb_power_up_phy(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.power_up)
-               hw->phy.ops.power_up(hw);
-
-       igb_setup_link(hw);
-}
-
-/**
- * igb_power_down_phy - Power down PHY
- * @hw: pointer to the HW structure
- *
- * The phy may be powered down to save power, to turn off link when the
- * driver is unloaded, or wake on lan is not enabled (among others).
- **/
-void igb_power_down_phy(struct e1000_hw *hw)
-{
-       if (hw->phy.ops.power_down)
-               hw->phy.ops.power_down(hw);
-}
-
-/**
- *  igb_shutdown_fiber_serdes_link - Remove link during power down
- *  @hw: pointer to the HW structure
- *
- *  Shutdown the optics and PCS on driver unload.
- **/
-void igb_shutdown_fiber_serdes_link(struct e1000_hw *hw)
-{
-       if (hw->mac.ops.shutdown_serdes)
-               hw->mac.ops.shutdown_serdes(hw);
-}
-
diff --git a/src/drivers/net/igb/igb_api.h b/src/drivers/net/igb/igb_api.h
deleted file mode 100644 (file)
index 2d97fec..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#ifndef _IGB_API_H_
-#define _IGB_API_H_
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <ipxe/io.h>
-#include <errno.h>
-#include <byteswap.h>
-#include <ipxe/pci.h>
-#include <ipxe/malloc.h>
-#include <ipxe/if_ether.h>
-#include <ipxe/ethernet.h>
-#include <ipxe/iobuf.h>
-#include <ipxe/netdevice.h>
-
-#include "igb_hw.h"
-
-extern void    igb_init_function_pointers_82575(struct e1000_hw *hw) __attribute__((weak));
-extern void    igb_rx_fifo_flush_82575(struct e1000_hw *hw) __attribute__((weak));
-extern void    igb_init_function_pointers_vf(struct e1000_hw *hw) __attribute__((weak));
-extern void    igb_shutdown_fiber_serdes_link(struct e1000_hw *hw) __attribute__((weak));
-
-s32  igb_set_mac_type(struct e1000_hw *hw);
-s32  igb_setup_init_funcs(struct e1000_hw *hw, bool init_device);
-s32  igb_init_mac_params(struct e1000_hw *hw);
-s32  igb_init_nvm_params(struct e1000_hw *hw);
-s32  igb_init_phy_params(struct e1000_hw *hw);
-s32  igb_init_mbx_params(struct e1000_hw *hw);
-s32  igb_get_bus_info(struct e1000_hw *hw);
-void igb_clear_vfta(struct e1000_hw *hw);
-void igb_write_vfta(struct e1000_hw *hw, u32 offset, u32 value);
-s32  igb_force_mac_fc(struct e1000_hw *hw);
-s32  igb_check_for_link(struct e1000_hw *hw);
-s32  igb_reset_hw(struct e1000_hw *hw);
-s32  igb_init_hw(struct e1000_hw *hw);
-s32  igb_setup_link(struct e1000_hw *hw);
-s32  igb_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed,
-                                u16 *duplex);
-s32  igb_disable_pcie_master(struct e1000_hw *hw);
-void igb_config_collision_dist(struct e1000_hw *hw);
-void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
-void igb_mta_set(struct e1000_hw *hw, u32 hash_value);
-u32  igb_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr);
-void igb_update_mc_addr_list(struct e1000_hw *hw,
-                               u8 *mc_addr_list, u32 mc_addr_count);
-s32  igb_setup_led(struct e1000_hw *hw);
-s32  igb_cleanup_led(struct e1000_hw *hw);
-s32  igb_check_reset_block(struct e1000_hw *hw);
-s32  igb_blink_led(struct e1000_hw *hw);
-s32  igb_led_on(struct e1000_hw *hw);
-s32  igb_led_off(struct e1000_hw *hw);
-s32 igb_id_led_init(struct e1000_hw *hw);
-void igb_reset_adaptive(struct e1000_hw *hw);
-void igb_update_adaptive(struct e1000_hw *hw);
-#if 0
-s32  igb_get_cable_length(struct e1000_hw *hw);
-#endif
-s32  igb_validate_mdi_setting(struct e1000_hw *hw);
-s32  igb_read_phy_reg(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  igb_write_phy_reg(struct e1000_hw *hw, u32 offset, u16 data);
-s32  igb_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg,
-                               u32 offset, u8 data);
-s32  igb_get_phy_info(struct e1000_hw *hw);
-void igb_release_phy(struct e1000_hw *hw);
-s32  igb_acquire_phy(struct e1000_hw *hw);
-s32  igb_phy_hw_reset(struct e1000_hw *hw);
-s32  igb_phy_commit(struct e1000_hw *hw);
-void igb_power_up_phy(struct e1000_hw *hw);
-void igb_power_down_phy(struct e1000_hw *hw);
-s32  igb_read_mac_addr(struct e1000_hw *hw);
-s32  igb_read_pba_num(struct e1000_hw *hw, u32 *part_num);
-void igb_reload_nvm(struct e1000_hw *hw);
-s32  igb_update_nvm_checksum(struct e1000_hw *hw);
-s32  igb_validate_nvm_checksum(struct e1000_hw *hw);
-s32  igb_read_nvm(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
-s32  igb_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  igb_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data);
-s32  igb_write_nvm(struct e1000_hw *hw, u16 offset, u16 words,
-                     u16 *data);
-s32  igb_wait_autoneg(struct e1000_hw *hw);
-s32  igb_set_d3_lplu_state(struct e1000_hw *hw, bool active);
-s32  igb_set_d0_lplu_state(struct e1000_hw *hw, bool active);
-bool igb_check_mng_mode(struct e1000_hw *hw);
-bool igb_enable_tx_pkt_filtering(struct e1000_hw *hw);
-s32  igb_mng_enable_host_if(struct e1000_hw *hw);
-s32  igb_mng_host_if_write(struct e1000_hw *hw,
-                             u8 *buffer, u16 length, u16 offset, u8 *sum);
-s32  igb_mng_write_cmd_header(struct e1000_hw *hw,
-                                struct e1000_host_mng_command_header *hdr);
-s32  igb_mng_write_dhcp_info(struct e1000_hw * hw,
-                                    u8 *buffer, u16 length);
-
-/*
- * TBI_ACCEPT macro definition:
- *
- * This macro requires:
- *      adapter = a pointer to struct e1000_hw
- *      status = the 8 bit status field of the Rx descriptor with EOP set
- *      error = the 8 bit error field of the Rx descriptor with EOP set
- *      length = the sum of all the length fields of the Rx descriptors that
- *               make up the current frame
- *      last_byte = the last byte of the frame DMAed by the hardware
- *      max_frame_length = the maximum frame length we want to accept.
- *      min_frame_length = the minimum frame length we want to accept.
- *
- * This macro is a conditional that should be used in the interrupt
- * handler's Rx processing routine when RxErrors have been detected.
- *
- * Typical use:
- *  ...
- *  if (TBI_ACCEPT) {
- *      accept_frame = true;
- *      e1000_tbi_adjust_stats(adapter, MacAddress);
- *      frame_length--;
- *  } else {
- *      accept_frame = false;
- *  }
- *  ...
- */
-
-/* The carrier extension symbol, as received by the NIC. */
-#define CARRIER_EXTENSION   0x0F
-
-#define TBI_ACCEPT(a, status, errors, length, last_byte, min_frame_size, max_frame_size) \
-    (e1000_tbi_sbp_enabled_82543(a) && \
-     (((errors) & E1000_RXD_ERR_FRAME_ERR_MASK) == E1000_RXD_ERR_CE) && \
-     ((last_byte) == CARRIER_EXTENSION) && \
-     (((status) & E1000_RXD_STAT_VP) ? \
-          (((length) > (min_frame_size - VLAN_TAG_SIZE)) && \
-           ((length) <= (max_frame_size + 1))) : \
-          (((length) > min_frame_size) && \
-           ((length) <= (max_frame_size + VLAN_TAG_SIZE + 1)))))
-
-#endif /* _IGB_API_H_ */
diff --git a/src/drivers/net/igb/igb_defines.h b/src/drivers/net/igb/igb_defines.h
deleted file mode 100644 (file)
index 4f58ba8..0000000
+++ /dev/null
@@ -1,1515 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#ifndef _IGB_DEFINES_H_
-#define _IGB_DEFINES_H_
-
-/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
-#define REQ_TX_DESCRIPTOR_MULTIPLE  8
-#define REQ_RX_DESCRIPTOR_MULTIPLE  8
-
-/* Definitions for power management and wakeup registers */
-/* Wake Up Control */
-#define E1000_WUC_APME       0x00000001 /* APM Enable */
-#define E1000_WUC_PME_EN     0x00000002 /* PME Enable */
-#define E1000_WUC_PME_STATUS 0x00000004 /* PME Status */
-#define E1000_WUC_APMPME     0x00000008 /* Assert PME on APM Wakeup */
-#define E1000_WUC_LSCWE      0x00000010 /* Link Status wake up enable */
-#define E1000_WUC_LSCWO      0x00000020 /* Link Status wake up override */
-#define E1000_WUC_SPM        0x80000000 /* Enable SPM */
-#define E1000_WUC_PHY_WAKE   0x00000100 /* if PHY supports wakeup */
-
-/* Wake Up Filter Control */
-#define E1000_WUFC_LNKC 0x00000001 /* Link Status Change Wakeup Enable */
-#define E1000_WUFC_MAG  0x00000002 /* Magic Packet Wakeup Enable */
-#define E1000_WUFC_EX   0x00000004 /* Directed Exact Wakeup Enable */
-#define E1000_WUFC_MC   0x00000008 /* Directed Multicast Wakeup Enable */
-#define E1000_WUFC_BC   0x00000010 /* Broadcast Wakeup Enable */
-#define E1000_WUFC_ARP  0x00000020 /* ARP Request Packet Wakeup Enable */
-#define E1000_WUFC_IPV4 0x00000040 /* Directed IPv4 Packet Wakeup Enable */
-#define E1000_WUFC_IPV6 0x00000080 /* Directed IPv6 Packet Wakeup Enable */
-#define E1000_WUFC_IGNORE_TCO   0x00008000 /* Ignore WakeOn TCO packets */
-#define E1000_WUFC_FLX0 0x00010000 /* Flexible Filter 0 Enable */
-#define E1000_WUFC_FLX1 0x00020000 /* Flexible Filter 1 Enable */
-#define E1000_WUFC_FLX2 0x00040000 /* Flexible Filter 2 Enable */
-#define E1000_WUFC_FLX3 0x00080000 /* Flexible Filter 3 Enable */
-#define E1000_WUFC_FLX4 0x00100000 /* Flexible Filter 4 Enable */
-#define E1000_WUFC_FLX5 0x00200000 /* Flexible Filter 5 Enable */
-#define E1000_WUFC_ALL_FILTERS  0x000F00FF /* Mask for all wakeup filters */
-#define E1000_WUFC_FLX_OFFSET   16 /* Offset to the Flexible Filters bits */
-#define E1000_WUFC_FLX_FILTERS  0x000F0000 /*Mask for the 4 flexible filters */
-/*
- * For 82576 to utilize Extended filter masks in addition to
- * existing (filter) masks
- */
-#define E1000_WUFC_EXT_FLX_FILTERS      0x00300000 /* Ext. FLX filter mask */
-
-/* Wake Up Status */
-#define E1000_WUS_LNKC         E1000_WUFC_LNKC
-#define E1000_WUS_MAG          E1000_WUFC_MAG
-#define E1000_WUS_EX           E1000_WUFC_EX
-#define E1000_WUS_MC           E1000_WUFC_MC
-#define E1000_WUS_BC           E1000_WUFC_BC
-#define E1000_WUS_ARP          E1000_WUFC_ARP
-#define E1000_WUS_IPV4         E1000_WUFC_IPV4
-#define E1000_WUS_IPV6         E1000_WUFC_IPV6
-#define E1000_WUS_FLX0         E1000_WUFC_FLX0
-#define E1000_WUS_FLX1         E1000_WUFC_FLX1
-#define E1000_WUS_FLX2         E1000_WUFC_FLX2
-#define E1000_WUS_FLX3         E1000_WUFC_FLX3
-#define E1000_WUS_FLX_FILTERS  E1000_WUFC_FLX_FILTERS
-
-/* Wake Up Packet Length */
-#define E1000_WUPL_LENGTH_MASK 0x0FFF   /* Only the lower 12 bits are valid */
-
-/* Four Flexible Filters are supported */
-#define E1000_FLEXIBLE_FILTER_COUNT_MAX 4
-/* Two Extended Flexible Filters are supported (82576) */
-#define E1000_EXT_FLEXIBLE_FILTER_COUNT_MAX     2
-#define E1000_FHFT_LENGTH_OFFSET        0xFC /* Length byte in FHFT */
-#define E1000_FHFT_LENGTH_MASK          0x0FF /* Length in lower byte */
-
-/* Each Flexible Filter is at most 128 (0x80) bytes in length */
-#define E1000_FLEXIBLE_FILTER_SIZE_MAX  128
-
-#define E1000_FFLT_SIZE E1000_FLEXIBLE_FILTER_COUNT_MAX
-#define E1000_FFMT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
-#define E1000_FFVT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
-
-/* Extended Device Control */
-#define E1000_CTRL_EXT_GPI0_EN   0x00000001 /* Maps SDP4 to GPI0 */
-#define E1000_CTRL_EXT_GPI1_EN   0x00000002 /* Maps SDP5 to GPI1 */
-#define E1000_CTRL_EXT_PHYINT_EN E1000_CTRL_EXT_GPI1_EN
-#define E1000_CTRL_EXT_GPI2_EN   0x00000004 /* Maps SDP6 to GPI2 */
-#define E1000_CTRL_EXT_GPI3_EN   0x00000008 /* Maps SDP7 to GPI3 */
-/* Reserved (bits 4,5) in >= 82575 */
-#define E1000_CTRL_EXT_SDP4_DATA 0x00000010 /* Value of SW Definable Pin 4 */
-#define E1000_CTRL_EXT_SDP5_DATA 0x00000020 /* Value of SW Definable Pin 5 */
-#define E1000_CTRL_EXT_PHY_INT   E1000_CTRL_EXT_SDP5_DATA
-#define E1000_CTRL_EXT_SDP6_DATA 0x00000040 /* Value of SW Definable Pin 6 */
-#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */
-/* SDP 4/5 (bits 8,9) are reserved in >= 82575 */
-#define E1000_CTRL_EXT_SDP4_DIR  0x00000100 /* Direction of SDP4 0=in 1=out */
-#define E1000_CTRL_EXT_SDP5_DIR  0x00000200 /* Direction of SDP5 0=in 1=out */
-#define E1000_CTRL_EXT_SDP6_DIR  0x00000400 /* Direction of SDP6 0=in 1=out */
-#define E1000_CTRL_EXT_SDP3_DIR  0x00000800 /* Direction of SDP3 0=in 1=out */
-#define E1000_CTRL_EXT_ASDCHK    0x00001000 /* Initiate an ASD sequence */
-#define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
-#define E1000_CTRL_EXT_IPS       0x00004000 /* Invert Power State */
-/* Physical Func Reset Done Indication */
-#define E1000_CTRL_EXT_PFRSTD    0x00004000
-#define E1000_CTRL_EXT_SPD_BYPS  0x00008000 /* Speed Select Bypass */
-#define E1000_CTRL_EXT_RO_DIS    0x00020000 /* Relaxed Ordering disable */
-#define E1000_CTRL_EXT_DMA_DYN_CLK_EN 0x00080000 /* DMA Dynamic Clock Gating */
-#define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_GMII 0x00000000
-#define E1000_CTRL_EXT_LINK_MODE_TBI  0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_KMRN    0x00000000
-#define E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES  0x00C00000
-#define E1000_CTRL_EXT_LINK_MODE_PCIX_SERDES  0x00800000
-#define E1000_CTRL_EXT_LINK_MODE_SGMII   0x00800000
-#define E1000_CTRL_EXT_EIAME          0x01000000
-#define E1000_CTRL_EXT_IRCA           0x00000001
-#define E1000_CTRL_EXT_WR_WMARK_MASK  0x03000000
-#define E1000_CTRL_EXT_WR_WMARK_256   0x00000000
-#define E1000_CTRL_EXT_WR_WMARK_320   0x01000000
-#define E1000_CTRL_EXT_WR_WMARK_384   0x02000000
-#define E1000_CTRL_EXT_WR_WMARK_448   0x03000000
-#define E1000_CTRL_EXT_CANC           0x04000000 /* Int delay cancellation */
-#define E1000_CTRL_EXT_DRV_LOAD       0x10000000 /* Driver loaded bit for FW */
-/* IAME enable bit (27) was removed in >= 82575 */
-#define E1000_CTRL_EXT_IAME          0x08000000 /* Int acknowledge Auto-mask */
-#define E1000_CRTL_EXT_PB_PAREN       0x01000000 /* packet buffer parity error
-                                                  * detection enabled */
-#define E1000_CTRL_EXT_DF_PAREN       0x02000000 /* descriptor FIFO parity
-                                                  * error detection enable */
-#define E1000_CTRL_EXT_GHOST_PAREN    0x40000000
-#define E1000_CTRL_EXT_PBA_CLR        0x80000000 /* PBA Clear */
-#define E1000_I2CCMD_REG_ADDR_SHIFT   16
-#define E1000_I2CCMD_REG_ADDR         0x00FF0000
-#define E1000_I2CCMD_PHY_ADDR_SHIFT   24
-#define E1000_I2CCMD_PHY_ADDR         0x07000000
-#define E1000_I2CCMD_OPCODE_READ      0x08000000
-#define E1000_I2CCMD_OPCODE_WRITE     0x00000000
-#define E1000_I2CCMD_RESET            0x10000000
-#define E1000_I2CCMD_READY            0x20000000
-#define E1000_I2CCMD_INTERRUPT_ENA    0x40000000
-#define E1000_I2CCMD_ERROR            0x80000000
-#define E1000_MAX_SGMII_PHY_REG_ADDR  255
-#define E1000_I2CCMD_PHY_TIMEOUT      200
-#define E1000_IVAR_VALID        0x80
-#define E1000_GPIE_NSICR        0x00000001
-#define E1000_GPIE_MSIX_MODE    0x00000010
-#define E1000_GPIE_EIAME        0x40000000
-#define E1000_GPIE_PBA          0x80000000
-
-/* Receive Descriptor bit definitions */
-#define E1000_RXD_STAT_DD       0x01    /* Descriptor Done */
-#define E1000_RXD_STAT_EOP      0x02    /* End of Packet */
-#define E1000_RXD_STAT_IXSM     0x04    /* Ignore checksum */
-#define E1000_RXD_STAT_VP       0x08    /* IEEE VLAN Packet */
-#define E1000_RXD_STAT_UDPCS    0x10    /* UDP xsum calculated */
-#define E1000_RXD_STAT_TCPCS    0x20    /* TCP xsum calculated */
-#define E1000_RXD_STAT_IPCS     0x40    /* IP xsum calculated */
-#define E1000_RXD_STAT_PIF      0x80    /* passed in-exact filter */
-#define E1000_RXD_STAT_CRCV     0x100   /* Speculative CRC Valid */
-#define E1000_RXD_STAT_IPIDV    0x200   /* IP identification valid */
-#define E1000_RXD_STAT_UDPV     0x400   /* Valid UDP checksum */
-#define E1000_RXD_STAT_DYNINT   0x800   /* Pkt caused INT via DYNINT */
-#define E1000_RXD_STAT_ACK      0x8000  /* ACK Packet indication */
-#define E1000_RXD_ERR_CE        0x01    /* CRC Error */
-#define E1000_RXD_ERR_SE        0x02    /* Symbol Error */
-#define E1000_RXD_ERR_SEQ       0x04    /* Sequence Error */
-#define E1000_RXD_ERR_CXE       0x10    /* Carrier Extension Error */
-#define E1000_RXD_ERR_TCPE      0x20    /* TCP/UDP Checksum Error */
-#define E1000_RXD_ERR_IPE       0x40    /* IP Checksum Error */
-#define E1000_RXD_ERR_RXE       0x80    /* Rx Data Error */
-#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */
-#define E1000_RXD_SPC_PRI_MASK  0xE000  /* Priority is in upper 3 bits */
-#define E1000_RXD_SPC_PRI_SHIFT 13
-#define E1000_RXD_SPC_CFI_MASK  0x1000  /* CFI is bit 12 */
-#define E1000_RXD_SPC_CFI_SHIFT 12
-
-#define E1000_RXDEXT_STATERR_CE    0x01000000
-#define E1000_RXDEXT_STATERR_SE    0x02000000
-#define E1000_RXDEXT_STATERR_SEQ   0x04000000
-#define E1000_RXDEXT_STATERR_CXE   0x10000000
-#define E1000_RXDEXT_STATERR_TCPE  0x20000000
-#define E1000_RXDEXT_STATERR_IPE   0x40000000
-#define E1000_RXDEXT_STATERR_RXE   0x80000000
-
-/* mask to determine if packets should be dropped due to frame errors */
-#define E1000_RXD_ERR_FRAME_ERR_MASK ( \
-    E1000_RXD_ERR_CE  |                \
-    E1000_RXD_ERR_SE  |                \
-    E1000_RXD_ERR_SEQ |                \
-    E1000_RXD_ERR_CXE |                \
-    E1000_RXD_ERR_RXE)
-
-/* Same mask, but for extended and packet split descriptors */
-#define E1000_RXDEXT_ERR_FRAME_ERR_MASK ( \
-    E1000_RXDEXT_STATERR_CE  |            \
-    E1000_RXDEXT_STATERR_SE  |            \
-    E1000_RXDEXT_STATERR_SEQ |            \
-    E1000_RXDEXT_STATERR_CXE |            \
-    E1000_RXDEXT_STATERR_RXE)
-
-#define E1000_MRQC_ENABLE_MASK                 0x00000007
-#define E1000_MRQC_ENABLE_RSS_2Q               0x00000001
-#define E1000_MRQC_ENABLE_RSS_INT              0x00000004
-#define E1000_MRQC_RSS_FIELD_MASK              0xFFFF0000
-#define E1000_MRQC_RSS_FIELD_IPV4_TCP          0x00010000
-#define E1000_MRQC_RSS_FIELD_IPV4              0x00020000
-#define E1000_MRQC_RSS_FIELD_IPV6_TCP_EX       0x00040000
-#define E1000_MRQC_RSS_FIELD_IPV6_EX           0x00080000
-#define E1000_MRQC_RSS_FIELD_IPV6              0x00100000
-#define E1000_MRQC_RSS_FIELD_IPV6_TCP          0x00200000
-
-#define E1000_RXDPS_HDRSTAT_HDRSP              0x00008000
-#define E1000_RXDPS_HDRSTAT_HDRLEN_MASK        0x000003FF
-
-/* Management Control */
-#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
-#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
-#define E1000_MANC_R_ON_FORCE    0x00000004 /* Reset on Force TCO - RO */
-#define E1000_MANC_RMCP_EN       0x00000100 /* Enable RCMP 026Fh Filtering */
-#define E1000_MANC_0298_EN       0x00000200 /* Enable RCMP 0298h Filtering */
-#define E1000_MANC_IPV4_EN       0x00000400 /* Enable IPv4 */
-#define E1000_MANC_IPV6_EN       0x00000800 /* Enable IPv6 */
-#define E1000_MANC_SNAP_EN       0x00001000 /* Accept LLC/SNAP */
-#define E1000_MANC_ARP_EN        0x00002000 /* Enable ARP Request Filtering */
-/* Enable Neighbor Discovery Filtering */
-#define E1000_MANC_NEIGHBOR_EN   0x00004000
-#define E1000_MANC_ARP_RES_EN    0x00008000 /* Enable ARP response Filtering */
-#define E1000_MANC_TCO_RESET     0x00010000 /* TCO Reset Occurred */
-#define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets Enabled */
-#define E1000_MANC_REPORT_STATUS 0x00040000 /* Status Reporting Enabled */
-#define E1000_MANC_RCV_ALL       0x00080000 /* Receive All Enabled */
-#define E1000_MANC_BLK_PHY_RST_ON_IDE   0x00040000 /* Block phy resets */
-/* Enable MAC address filtering */
-#define E1000_MANC_EN_MAC_ADDR_FILTER   0x00100000
-/* Enable MNG packets to host memory */
-#define E1000_MANC_EN_MNG2HOST   0x00200000
-/* Enable IP address filtering */
-#define E1000_MANC_EN_IP_ADDR_FILTER    0x00400000
-#define E1000_MANC_EN_XSUM_FILTER   0x00800000 /* Enable checksum filtering */
-#define E1000_MANC_BR_EN            0x01000000 /* Enable broadcast filtering */
-#define E1000_MANC_SMB_REQ       0x01000000 /* SMBus Request */
-#define E1000_MANC_SMB_GNT       0x02000000 /* SMBus Grant */
-#define E1000_MANC_SMB_CLK_IN    0x04000000 /* SMBus Clock In */
-#define E1000_MANC_SMB_DATA_IN   0x08000000 /* SMBus Data In */
-#define E1000_MANC_SMB_DATA_OUT  0x10000000 /* SMBus Data Out */
-#define E1000_MANC_SMB_CLK_OUT   0x20000000 /* SMBus Clock Out */
-
-#define E1000_MANC_SMB_DATA_OUT_SHIFT  28 /* SMBus Data Out Shift */
-#define E1000_MANC_SMB_CLK_OUT_SHIFT   29 /* SMBus Clock Out Shift */
-
-/* Receive Control */
-#define E1000_RCTL_RST            0x00000001    /* Software reset */
-#define E1000_RCTL_EN             0x00000002    /* enable */
-#define E1000_RCTL_SBP            0x00000004    /* store bad packet */
-#define E1000_RCTL_UPE            0x00000008    /* unicast promisc enable */
-#define E1000_RCTL_MPE            0x00000010    /* multicast promisc enable */
-#define E1000_RCTL_LPE            0x00000020    /* long packet enable */
-#define E1000_RCTL_LBM_NO         0x00000000    /* no loopback mode */
-#define E1000_RCTL_LBM_MAC        0x00000040    /* MAC loopback mode */
-#define E1000_RCTL_LBM_SLP        0x00000080    /* serial link loopback mode */
-#define E1000_RCTL_LBM_TCVR       0x000000C0    /* tcvr loopback mode */
-#define E1000_RCTL_DTYP_MASK      0x00000C00    /* Descriptor type mask */
-#define E1000_RCTL_DTYP_PS        0x00000400    /* Packet Split descriptor */
-#define E1000_RCTL_RDMTS_HALF     0x00000000    /* rx desc min thresh size */
-#define E1000_RCTL_RDMTS_QUAT     0x00000100    /* rx desc min thresh size */
-#define E1000_RCTL_RDMTS_EIGTH    0x00000200    /* rx desc min thresh size */
-#define E1000_RCTL_MO_SHIFT       12            /* multicast offset shift */
-#define E1000_RCTL_MO_0           0x00000000    /* multicast offset 11:0 */
-#define E1000_RCTL_MO_1           0x00001000    /* multicast offset 12:1 */
-#define E1000_RCTL_MO_2           0x00002000    /* multicast offset 13:2 */
-#define E1000_RCTL_MO_3           0x00003000    /* multicast offset 15:4 */
-#define E1000_RCTL_MDR            0x00004000    /* multicast desc ring 0 */
-#define E1000_RCTL_BAM            0x00008000    /* broadcast enable */
-/* these buffer sizes are valid if E1000_RCTL_BSEX is 0 */
-#define E1000_RCTL_SZ_2048        0x00000000    /* rx buffer size 2048 */
-#define E1000_RCTL_SZ_1024        0x00010000    /* rx buffer size 1024 */
-#define E1000_RCTL_SZ_512         0x00020000    /* rx buffer size 512 */
-#define E1000_RCTL_SZ_256         0x00030000    /* rx buffer size 256 */
-/* these buffer sizes are valid if E1000_RCTL_BSEX is 1 */
-#define E1000_RCTL_SZ_16384       0x00010000    /* rx buffer size 16384 */
-#define E1000_RCTL_SZ_8192        0x00020000    /* rx buffer size 8192 */
-#define E1000_RCTL_SZ_4096        0x00030000    /* rx buffer size 4096 */
-#define E1000_RCTL_VFE            0x00040000    /* vlan filter enable */
-#define E1000_RCTL_CFIEN          0x00080000    /* canonical form enable */
-#define E1000_RCTL_CFI            0x00100000    /* canonical form indicator */
-#define E1000_RCTL_DPF            0x00400000    /* discard pause frames */
-#define E1000_RCTL_PMCF           0x00800000    /* pass MAC control frames */
-#define E1000_RCTL_BSEX           0x02000000    /* Buffer size extension */
-#define E1000_RCTL_SECRC          0x04000000    /* Strip Ethernet CRC */
-#define E1000_RCTL_FLXBUF_MASK    0x78000000    /* Flexible buffer size */
-#define E1000_RCTL_FLXBUF_SHIFT   27            /* Flexible buffer shift */
-
-/*
- * Use byte values for the following shift parameters
- * Usage:
- *     psrctl |= (((ROUNDUP(value0, 128) >> E1000_PSRCTL_BSIZE0_SHIFT) &
- *                  E1000_PSRCTL_BSIZE0_MASK) |
- *                ((ROUNDUP(value1, 1024) >> E1000_PSRCTL_BSIZE1_SHIFT) &
- *                  E1000_PSRCTL_BSIZE1_MASK) |
- *                ((ROUNDUP(value2, 1024) << E1000_PSRCTL_BSIZE2_SHIFT) &
- *                  E1000_PSRCTL_BSIZE2_MASK) |
- *                ((ROUNDUP(value3, 1024) << E1000_PSRCTL_BSIZE3_SHIFT) |;
- *                  E1000_PSRCTL_BSIZE3_MASK))
- * where value0 = [128..16256],  default=256
- *       value1 = [1024..64512], default=4096
- *       value2 = [0..64512],    default=4096
- *       value3 = [0..64512],    default=0
- */
-
-#define E1000_PSRCTL_BSIZE0_MASK   0x0000007F
-#define E1000_PSRCTL_BSIZE1_MASK   0x00003F00
-#define E1000_PSRCTL_BSIZE2_MASK   0x003F0000
-#define E1000_PSRCTL_BSIZE3_MASK   0x3F000000
-
-#define E1000_PSRCTL_BSIZE0_SHIFT  7            /* Shift _right_ 7 */
-#define E1000_PSRCTL_BSIZE1_SHIFT  2            /* Shift _right_ 2 */
-#define E1000_PSRCTL_BSIZE2_SHIFT  6            /* Shift _left_ 6 */
-#define E1000_PSRCTL_BSIZE3_SHIFT 14            /* Shift _left_ 14 */
-
-/* SWFW_SYNC Definitions */
-#define E1000_SWFW_EEP_SM   0x01
-#define E1000_SWFW_PHY0_SM  0x02
-#define E1000_SWFW_PHY1_SM  0x04
-#define E1000_SWFW_CSR_SM   0x08
-
-/* FACTPS Definitions */
-#define E1000_FACTPS_LFS    0x40000000  /* LAN Function Select */
-/* Device Control */
-#define E1000_CTRL_FD       0x00000001  /* Full duplex.0=half; 1=full */
-#define E1000_CTRL_BEM      0x00000002  /* Endian Mode.0=little,1=big */
-#define E1000_CTRL_PRIOR    0x00000004  /* Priority on PCI. 0=rx,1=fair */
-#define E1000_CTRL_GIO_MASTER_DISABLE 0x00000004 /*Blocks new Master reqs */
-#define E1000_CTRL_LRST     0x00000008  /* Link reset. 0=normal,1=reset */
-#define E1000_CTRL_TME      0x00000010  /* Test mode. 0=normal,1=test */
-#define E1000_CTRL_SLE      0x00000020  /* Serial Link on 0=dis,1=en */
-#define E1000_CTRL_ASDE     0x00000020  /* Auto-speed detect enable */
-#define E1000_CTRL_SLU      0x00000040  /* Set link up (Force Link) */
-#define E1000_CTRL_ILOS     0x00000080  /* Invert Loss-Of Signal */
-#define E1000_CTRL_SPD_SEL  0x00000300  /* Speed Select Mask */
-#define E1000_CTRL_SPD_10   0x00000000  /* Force 10Mb */
-#define E1000_CTRL_SPD_100  0x00000100  /* Force 100Mb */
-#define E1000_CTRL_SPD_1000 0x00000200  /* Force 1Gb */
-#define E1000_CTRL_BEM32    0x00000400  /* Big Endian 32 mode */
-#define E1000_CTRL_FRCSPD   0x00000800  /* Force Speed */
-#define E1000_CTRL_FRCDPX   0x00001000  /* Force Duplex */
-#define E1000_CTRL_D_UD_EN  0x00002000  /* Dock/Undock enable */
-#define E1000_CTRL_D_UD_POLARITY 0x00004000 /* Defined polarity of Dock/Undock
-                                             * indication in SDP[0] */
-#define E1000_CTRL_FORCE_PHY_RESET 0x00008000 /* Reset both PHY ports, through
-                                               * PHYRST_N pin */
-#define E1000_CTRL_EXT_LINK_EN 0x00010000 /* enable link status from external
-                                           * LINK_0 and LINK_1 pins */
-#define E1000_CTRL_SWDPIN0  0x00040000  /* SWDPIN 0 value */
-#define E1000_CTRL_SWDPIN1  0x00080000  /* SWDPIN 1 value */
-#define E1000_CTRL_SWDPIN2  0x00100000  /* SWDPIN 2 value */
-#define E1000_CTRL_ADVD3WUC 0x00100000  /* D3 WUC */
-#define E1000_CTRL_SWDPIN3  0x00200000  /* SWDPIN 3 value */
-#define E1000_CTRL_SWDPIO0  0x00400000  /* SWDPIN 0 Input or output */
-#define E1000_CTRL_SWDPIO1  0x00800000  /* SWDPIN 1 input or output */
-#define E1000_CTRL_SWDPIO2  0x01000000  /* SWDPIN 2 input or output */
-#define E1000_CTRL_SWDPIO3  0x02000000  /* SWDPIN 3 input or output */
-#define E1000_CTRL_RST      0x04000000  /* Global reset */
-#define E1000_CTRL_RFCE     0x08000000  /* Receive Flow Control enable */
-#define E1000_CTRL_TFCE     0x10000000  /* Transmit flow control enable */
-#define E1000_CTRL_RTE      0x20000000  /* Routing tag enable */
-#define E1000_CTRL_VME      0x40000000  /* IEEE VLAN mode enable */
-#define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */
-#define E1000_CTRL_SW2FW_INT 0x02000000 /* Initiate an interrupt to ME */
-#define E1000_CTRL_I2C_ENA  0x02000000  /* I2C enable */
-
-/*
- * Bit definitions for the Management Data IO (MDIO) and Management Data
- * Clock (MDC) pins in the Device Control Register.
- */
-#define E1000_CTRL_PHY_RESET_DIR  E1000_CTRL_SWDPIO0
-#define E1000_CTRL_PHY_RESET      E1000_CTRL_SWDPIN0
-#define E1000_CTRL_MDIO_DIR       E1000_CTRL_SWDPIO2
-#define E1000_CTRL_MDIO           E1000_CTRL_SWDPIN2
-#define E1000_CTRL_MDC_DIR        E1000_CTRL_SWDPIO3
-#define E1000_CTRL_MDC            E1000_CTRL_SWDPIN3
-#define E1000_CTRL_PHY_RESET_DIR4 E1000_CTRL_EXT_SDP4_DIR
-#define E1000_CTRL_PHY_RESET4     E1000_CTRL_EXT_SDP4_DATA
-
-#define E1000_CONNSW_ENRGSRC             0x4
-#define E1000_PCS_CFG_PCS_EN             8
-#define E1000_PCS_LCTL_FLV_LINK_UP       1
-#define E1000_PCS_LCTL_FSV_10            0
-#define E1000_PCS_LCTL_FSV_100           2
-#define E1000_PCS_LCTL_FSV_1000          4
-#define E1000_PCS_LCTL_FDV_FULL          8
-#define E1000_PCS_LCTL_FSD               0x10
-#define E1000_PCS_LCTL_FORCE_LINK        0x20
-#define E1000_PCS_LCTL_LOW_LINK_LATCH    0x40
-#define E1000_PCS_LCTL_FORCE_FCTRL       0x80
-#define E1000_PCS_LCTL_AN_ENABLE         0x10000
-#define E1000_PCS_LCTL_AN_RESTART        0x20000
-#define E1000_PCS_LCTL_AN_TIMEOUT        0x40000
-#define E1000_PCS_LCTL_AN_SGMII_BYPASS   0x80000
-#define E1000_PCS_LCTL_AN_SGMII_TRIGGER  0x100000
-#define E1000_PCS_LCTL_FAST_LINK_TIMER   0x1000000
-#define E1000_PCS_LCTL_LINK_OK_FIX       0x2000000
-#define E1000_PCS_LCTL_CRS_ON_NI         0x4000000
-#define E1000_ENABLE_SERDES_LOOPBACK     0x0410
-
-#define E1000_PCS_LSTS_LINK_OK           1
-#define E1000_PCS_LSTS_SPEED_10          0
-#define E1000_PCS_LSTS_SPEED_100         2
-#define E1000_PCS_LSTS_SPEED_1000        4
-#define E1000_PCS_LSTS_DUPLEX_FULL       8
-#define E1000_PCS_LSTS_SYNK_OK           0x10
-#define E1000_PCS_LSTS_AN_COMPLETE       0x10000
-#define E1000_PCS_LSTS_AN_PAGE_RX        0x20000
-#define E1000_PCS_LSTS_AN_TIMED_OUT      0x40000
-#define E1000_PCS_LSTS_AN_REMOTE_FAULT   0x80000
-#define E1000_PCS_LSTS_AN_ERROR_RWS      0x100000
-
-/* Device Status */
-#define E1000_STATUS_FD         0x00000001      /* Full duplex.0=half,1=full */
-#define E1000_STATUS_LU         0x00000002      /* Link up.0=no,1=link */
-#define E1000_STATUS_FUNC_MASK  0x0000000C      /* PCI Function Mask */
-#define E1000_STATUS_FUNC_SHIFT 2
-#define E1000_STATUS_FUNC_0     0x00000000      /* Function 0 */
-#define E1000_STATUS_FUNC_1     0x00000004      /* Function 1 */
-#define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
-#define E1000_STATUS_TBIMODE    0x00000020      /* TBI mode */
-#define E1000_STATUS_SPEED_MASK 0x000000C0
-#define E1000_STATUS_SPEED_10   0x00000000      /* Speed 10Mb/s */
-#define E1000_STATUS_SPEED_100  0x00000040      /* Speed 100Mb/s */
-#define E1000_STATUS_SPEED_1000 0x00000080      /* Speed 1000Mb/s */
-#define E1000_STATUS_LAN_INIT_DONE 0x00000200  /* Lan Init Completion by NVM */
-#define E1000_STATUS_ASDV       0x00000300      /* Auto speed detect value */
-#define E1000_STATUS_PHYRA      0x00000400      /* PHY Reset Asserted */
-#define E1000_STATUS_DOCK_CI    0x00000800      /* Change in Dock/Undock state.
-                                                 * Clear on write '0'. */
-#define E1000_STATUS_GIO_MASTER_ENABLE 0x00080000 /* Master request status */
-#define E1000_STATUS_MTXCKOK    0x00000400      /* MTX clock running OK */
-#define E1000_STATUS_PCI66      0x00000800      /* In 66Mhz slot */
-#define E1000_STATUS_BUS64      0x00001000      /* In 64 bit slot */
-#define E1000_STATUS_PCIX_MODE  0x00002000      /* PCI-X mode */
-#define E1000_STATUS_PCIX_SPEED 0x0000C000      /* PCI-X bus speed */
-#define E1000_STATUS_BMC_SKU_0  0x00100000 /* BMC USB redirect disabled */
-#define E1000_STATUS_BMC_SKU_1  0x00200000 /* BMC SRAM disabled */
-#define E1000_STATUS_BMC_SKU_2  0x00400000 /* BMC SDRAM disabled */
-#define E1000_STATUS_BMC_CRYPTO 0x00800000 /* BMC crypto disabled */
-#define E1000_STATUS_BMC_LITE   0x01000000 /* BMC external code execution
-                                            * disabled */
-#define E1000_STATUS_RGMII_ENABLE 0x02000000 /* RGMII disabled */
-#define E1000_STATUS_FUSE_8       0x04000000
-#define E1000_STATUS_FUSE_9       0x08000000
-#define E1000_STATUS_SERDES0_DIS  0x10000000 /* SERDES disabled on port 0 */
-#define E1000_STATUS_SERDES1_DIS  0x20000000 /* SERDES disabled on port 1 */
-
-/* Constants used to interpret the masked PCI-X bus speed. */
-#define E1000_STATUS_PCIX_SPEED_66  0x00000000 /* PCI-X bus speed 50-66 MHz */
-#define E1000_STATUS_PCIX_SPEED_100 0x00004000 /* PCI-X bus speed 66-100 MHz */
-#define E1000_STATUS_PCIX_SPEED_133 0x00008000 /*PCI-X bus speed 100-133 MHz*/
-
-#define SPEED_10    10
-#define SPEED_100   100
-#define SPEED_1000  1000
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
-
-#define PHY_FORCE_TIME   20
-
-#define ADVERTISE_10_HALF                 0x0001
-#define ADVERTISE_10_FULL                 0x0002
-#define ADVERTISE_100_HALF                0x0004
-#define ADVERTISE_100_FULL                0x0008
-#define ADVERTISE_1000_HALF               0x0010 /* Not used, just FYI */
-#define ADVERTISE_1000_FULL               0x0020
-
-/* 1000/H is not supported, nor spec-compliant. */
-#define E1000_ALL_SPEED_DUPLEX  (ADVERTISE_10_HALF |   ADVERTISE_10_FULL | \
-                                ADVERTISE_100_HALF |  ADVERTISE_100_FULL | \
-                                                     ADVERTISE_1000_FULL)
-#define E1000_ALL_NOT_GIG       (ADVERTISE_10_HALF |   ADVERTISE_10_FULL | \
-                                ADVERTISE_100_HALF |  ADVERTISE_100_FULL)
-#define E1000_ALL_100_SPEED    (ADVERTISE_100_HALF |  ADVERTISE_100_FULL)
-#define E1000_ALL_10_SPEED      (ADVERTISE_10_HALF |   ADVERTISE_10_FULL)
-#define E1000_ALL_FULL_DUPLEX   (ADVERTISE_10_FULL |  ADVERTISE_100_FULL | \
-                                                     ADVERTISE_1000_FULL)
-#define E1000_ALL_HALF_DUPLEX   (ADVERTISE_10_HALF |  ADVERTISE_100_HALF)
-
-#define AUTONEG_ADVERTISE_SPEED_DEFAULT   E1000_ALL_SPEED_DUPLEX
-
-/* LED Control */
-#define E1000_LEDCTL_LED0_MODE_MASK       0x0000000F
-#define E1000_LEDCTL_LED0_MODE_SHIFT      0
-#define E1000_LEDCTL_LED0_BLINK_RATE      0x00000020
-#define E1000_LEDCTL_LED0_IVRT            0x00000040
-#define E1000_LEDCTL_LED0_BLINK           0x00000080
-#define E1000_LEDCTL_LED1_MODE_MASK       0x00000F00
-#define E1000_LEDCTL_LED1_MODE_SHIFT      8
-#define E1000_LEDCTL_LED1_BLINK_RATE      0x00002000
-#define E1000_LEDCTL_LED1_IVRT            0x00004000
-#define E1000_LEDCTL_LED1_BLINK           0x00008000
-#define E1000_LEDCTL_LED2_MODE_MASK       0x000F0000
-#define E1000_LEDCTL_LED2_MODE_SHIFT      16
-#define E1000_LEDCTL_LED2_BLINK_RATE      0x00200000
-#define E1000_LEDCTL_LED2_IVRT            0x00400000
-#define E1000_LEDCTL_LED2_BLINK           0x00800000
-#define E1000_LEDCTL_LED3_MODE_MASK       0x0F000000
-#define E1000_LEDCTL_LED3_MODE_SHIFT      24
-#define E1000_LEDCTL_LED3_BLINK_RATE      0x20000000
-#define E1000_LEDCTL_LED3_IVRT            0x40000000
-#define E1000_LEDCTL_LED3_BLINK           0x80000000
-
-#define E1000_LEDCTL_MODE_LINK_10_1000  0x0
-#define E1000_LEDCTL_MODE_LINK_100_1000 0x1
-#define E1000_LEDCTL_MODE_LINK_UP       0x2
-#define E1000_LEDCTL_MODE_ACTIVITY      0x3
-#define E1000_LEDCTL_MODE_LINK_ACTIVITY 0x4
-#define E1000_LEDCTL_MODE_LINK_10       0x5
-#define E1000_LEDCTL_MODE_LINK_100      0x6
-#define E1000_LEDCTL_MODE_LINK_1000     0x7
-#define E1000_LEDCTL_MODE_PCIX_MODE     0x8
-#define E1000_LEDCTL_MODE_FULL_DUPLEX   0x9
-#define E1000_LEDCTL_MODE_COLLISION     0xA
-#define E1000_LEDCTL_MODE_BUS_SPEED     0xB
-#define E1000_LEDCTL_MODE_BUS_SIZE      0xC
-#define E1000_LEDCTL_MODE_PAUSED        0xD
-#define E1000_LEDCTL_MODE_LED_ON        0xE
-#define E1000_LEDCTL_MODE_LED_OFF       0xF
-
-/* Transmit Descriptor bit definitions */
-#define E1000_TXD_DTYP_D     0x00100000 /* Data Descriptor */
-#define E1000_TXD_DTYP_C     0x00000000 /* Context Descriptor */
-#define E1000_TXD_POPTS_SHIFT 8         /* POPTS shift */
-#define E1000_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
-#define E1000_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
-#define E1000_TXD_CMD_EOP    0x01000000 /* End of Packet */
-#define E1000_TXD_CMD_IFCS   0x02000000 /* Insert FCS (Ethernet CRC) */
-#define E1000_TXD_CMD_IC     0x04000000 /* Insert Checksum */
-#define E1000_TXD_CMD_RS     0x08000000 /* Report Status */
-#define E1000_TXD_CMD_RPS    0x10000000 /* Report Packet Sent */
-#define E1000_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
-#define E1000_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
-#define E1000_TXD_CMD_IDE    0x80000000 /* Enable Tidv register */
-#define E1000_TXD_STAT_DD    0x00000001 /* Descriptor Done */
-#define E1000_TXD_STAT_EC    0x00000002 /* Excess Collisions */
-#define E1000_TXD_STAT_LC    0x00000004 /* Late Collisions */
-#define E1000_TXD_STAT_TU    0x00000008 /* Transmit underrun */
-#define E1000_TXD_CMD_TCP    0x01000000 /* TCP packet */
-#define E1000_TXD_CMD_IP     0x02000000 /* IP packet */
-#define E1000_TXD_CMD_TSE    0x04000000 /* TCP Seg enable */
-#define E1000_TXD_STAT_TC    0x00000004 /* Tx Underrun */
-/* Extended desc bits for Linksec and timesync */
-
-/* Transmit Control */
-#define E1000_TCTL_RST    0x00000001    /* software reset */
-#define E1000_TCTL_EN     0x00000002    /* enable tx */
-#define E1000_TCTL_BCE    0x00000004    /* busy check enable */
-#define E1000_TCTL_PSP    0x00000008    /* pad short packets */
-#define E1000_TCTL_CT     0x00000ff0    /* collision threshold */
-#define E1000_TCTL_COLD   0x003ff000    /* collision distance */
-#define E1000_TCTL_SWXOFF 0x00400000    /* SW Xoff transmission */
-#define E1000_TCTL_PBE    0x00800000    /* Packet Burst Enable */
-#define E1000_TCTL_RTLC   0x01000000    /* Re-transmit on late collision */
-#define E1000_TCTL_NRTU   0x02000000    /* No Re-transmit on underrun */
-#define E1000_TCTL_MULR   0x10000000    /* Multiple request support */
-
-/* Transmit Arbitration Count */
-#define E1000_TARC0_ENABLE     0x00000400   /* Enable Tx Queue 0 */
-
-/* SerDes Control */
-#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400
-
-/* Receive Checksum Control */
-#define E1000_RXCSUM_PCSS_MASK 0x000000FF   /* Packet Checksum Start */
-#define E1000_RXCSUM_IPOFL     0x00000100   /* IPv4 checksum offload */
-#define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
-#define E1000_RXCSUM_IPV6OFL   0x00000400   /* IPv6 checksum offload */
-#define E1000_RXCSUM_CRCOFL    0x00000800   /* CRC32 offload enable */
-#define E1000_RXCSUM_IPPCSE    0x00001000   /* IP payload checksum enable */
-#define E1000_RXCSUM_PCSD      0x00002000   /* packet checksum disabled */
-
-/* Header split receive */
-#define E1000_RFCTL_ISCSI_DIS           0x00000001
-#define E1000_RFCTL_ISCSI_DWC_MASK      0x0000003E
-#define E1000_RFCTL_ISCSI_DWC_SHIFT     1
-#define E1000_RFCTL_NFSW_DIS            0x00000040
-#define E1000_RFCTL_NFSR_DIS            0x00000080
-#define E1000_RFCTL_NFS_VER_MASK        0x00000300
-#define E1000_RFCTL_NFS_VER_SHIFT       8
-#define E1000_RFCTL_IPV6_DIS            0x00000400
-#define E1000_RFCTL_IPV6_XSUM_DIS       0x00000800
-#define E1000_RFCTL_ACK_DIS             0x00001000
-#define E1000_RFCTL_ACKD_DIS            0x00002000
-#define E1000_RFCTL_IPFRSP_DIS          0x00004000
-#define E1000_RFCTL_EXTEN               0x00008000
-#define E1000_RFCTL_IPV6_EX_DIS         0x00010000
-#define E1000_RFCTL_NEW_IPV6_EXT_DIS    0x00020000
-#define E1000_RFCTL_LEF                 0x00040000
-
-/* Collision related configuration parameters */
-#define E1000_COLLISION_THRESHOLD       15
-#define E1000_CT_SHIFT                  4
-#define E1000_COLLISION_DISTANCE        63
-#define E1000_COLD_SHIFT                12
-
-/* Default values for the transmit IPG register */
-#define DEFAULT_82543_TIPG_IPGT_FIBER  9
-#define DEFAULT_82543_TIPG_IPGT_COPPER 8
-
-#define E1000_TIPG_IPGT_MASK  0x000003FF
-#define E1000_TIPG_IPGR1_MASK 0x000FFC00
-#define E1000_TIPG_IPGR2_MASK 0x3FF00000
-
-#define DEFAULT_82543_TIPG_IPGR1 8
-#define E1000_TIPG_IPGR1_SHIFT  10
-
-#define DEFAULT_82543_TIPG_IPGR2 6
-#define DEFAULT_80003ES2LAN_TIPG_IPGR2 7
-#define E1000_TIPG_IPGR2_SHIFT  20
-
-/* Ethertype field values */
-#define ETHERNET_IEEE_VLAN_TYPE 0x8100  /* 802.3ac packet */
-
-#define ETHERNET_FCS_SIZE       4
-#define MAX_JUMBO_FRAME_SIZE    0x3F00
-
-/* Extended Configuration Control and Size */
-#define E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP      0x00000020
-#define E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE       0x00000001
-#define E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE       0x00000008
-#define E1000_EXTCNF_CTRL_SWFLAG                 0x00000020
-#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK   0x00FF0000
-#define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_SHIFT          16
-#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK   0x0FFF0000
-#define E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT          16
-
-#define E1000_PHY_CTRL_SPD_EN             0x00000001
-#define E1000_PHY_CTRL_D0A_LPLU           0x00000002
-#define E1000_PHY_CTRL_NOND0A_LPLU        0x00000004
-#define E1000_PHY_CTRL_NOND0A_GBE_DISABLE 0x00000008
-#define E1000_PHY_CTRL_GBE_DISABLE        0x00000040
-
-#define E1000_KABGTXD_BGSQLBIAS           0x00050000
-
-/* PBA constants */
-#define E1000_PBA_6K  0x0006    /* 6KB */
-#define E1000_PBA_8K  0x0008    /* 8KB */
-#define E1000_PBA_10K 0x000A    /* 10KB */
-#define E1000_PBA_12K 0x000C    /* 12KB */
-#define E1000_PBA_14K 0x000E    /* 14KB */
-#define E1000_PBA_16K 0x0010    /* 16KB */
-#define E1000_PBA_18K 0x0012
-#define E1000_PBA_20K 0x0014
-#define E1000_PBA_22K 0x0016
-#define E1000_PBA_24K 0x0018
-#define E1000_PBA_26K 0x001A
-#define E1000_PBA_30K 0x001E
-#define E1000_PBA_32K 0x0020
-#define E1000_PBA_34K 0x0022
-#define E1000_PBA_35K 0x0023
-#define E1000_PBA_38K 0x0026
-#define E1000_PBA_40K 0x0028
-#define E1000_PBA_48K 0x0030    /* 48KB */
-#define E1000_PBA_64K 0x0040    /* 64KB */
-
-#define E1000_PBS_16K E1000_PBA_16K
-#define E1000_PBS_24K E1000_PBA_24K
-
-#define IFS_MAX       80
-#define IFS_MIN       40
-#define IFS_RATIO     4
-#define IFS_STEP      10
-#define MIN_NUM_XMITS 1000
-
-/* SW Semaphore Register */
-#define E1000_SWSM_SMBI         0x00000001 /* Driver Semaphore bit */
-#define E1000_SWSM_SWESMBI      0x00000002 /* FW Semaphore bit */
-#define E1000_SWSM_WMNG         0x00000004 /* Wake MNG Clock */
-#define E1000_SWSM_DRV_LOAD     0x00000008 /* Driver Loaded Bit */
-
-#define E1000_SWSM2_LOCK        0x00000002 /* Secondary driver semaphore bit */
-
-/* Interrupt Cause Read */
-#define E1000_ICR_TXDW          0x00000001 /* Transmit desc written back */
-#define E1000_ICR_TXQE          0x00000002 /* Transmit Queue empty */
-#define E1000_ICR_LSC           0x00000004 /* Link Status Change */
-#define E1000_ICR_RXSEQ         0x00000008 /* rx sequence error */
-#define E1000_ICR_RXDMT0        0x00000010 /* rx desc min. threshold (0) */
-#define E1000_ICR_RXO           0x00000040 /* rx overrun */
-#define E1000_ICR_RXT0          0x00000080 /* rx timer intr (ring 0) */
-#define E1000_ICR_VMMB          0x00000100 /* VM MB event */
-#define E1000_ICR_MDAC          0x00000200 /* MDIO access complete */
-#define E1000_ICR_RXCFG         0x00000400 /* Rx /c/ ordered set */
-#define E1000_ICR_GPI_EN0       0x00000800 /* GP Int 0 */
-#define E1000_ICR_GPI_EN1       0x00001000 /* GP Int 1 */
-#define E1000_ICR_GPI_EN2       0x00002000 /* GP Int 2 */
-#define E1000_ICR_GPI_EN3       0x00004000 /* GP Int 3 */
-#define E1000_ICR_TXD_LOW       0x00008000
-#define E1000_ICR_SRPD          0x00010000
-#define E1000_ICR_ACK           0x00020000 /* Receive Ack frame */
-#define E1000_ICR_MNG           0x00040000 /* Manageability event */
-#define E1000_ICR_DOCK          0x00080000 /* Dock/Undock */
-#define E1000_ICR_INT_ASSERTED  0x80000000 /* If this bit asserted, the driver
-                                            * should claim the interrupt */
-#define E1000_ICR_RXD_FIFO_PAR0 0x00100000 /* Q0 Rx desc FIFO parity error */
-#define E1000_ICR_TXD_FIFO_PAR0 0x00200000 /* Q0 Tx desc FIFO parity error */
-#define E1000_ICR_HOST_ARB_PAR 0x00400000 /* host arb read buffer parity err */
-#define E1000_ICR_PB_PAR        0x00800000 /* packet buffer parity error */
-#define E1000_ICR_RXD_FIFO_PAR1 0x01000000 /* Q1 Rx desc FIFO parity error */
-#define E1000_ICR_TXD_FIFO_PAR1 0x02000000 /* Q1 Tx desc FIFO parity error */
-#define E1000_ICR_ALL_PARITY    0x03F00000 /* all parity error bits */
-#define E1000_ICR_DSW           0x00000020 /* FW changed the status of DISSW
-                                            * bit in the FWSM */
-#define E1000_ICR_PHYINT        0x00001000 /* LAN connected device generates
-                                            * an interrupt */
-#define E1000_ICR_DOUTSYNC      0x10000000 /* NIC DMA out of sync */
-#define E1000_ICR_EPRST         0x00100000 /* ME hardware reset occurs */
-
-
-/* Extended Interrupt Cause Read */
-#define E1000_EICR_RX_QUEUE0    0x00000001 /* Rx Queue 0 Interrupt */
-#define E1000_EICR_RX_QUEUE1    0x00000002 /* Rx Queue 1 Interrupt */
-#define E1000_EICR_RX_QUEUE2    0x00000004 /* Rx Queue 2 Interrupt */
-#define E1000_EICR_RX_QUEUE3    0x00000008 /* Rx Queue 3 Interrupt */
-#define E1000_EICR_TX_QUEUE0    0x00000100 /* Tx Queue 0 Interrupt */
-#define E1000_EICR_TX_QUEUE1    0x00000200 /* Tx Queue 1 Interrupt */
-#define E1000_EICR_TX_QUEUE2    0x00000400 /* Tx Queue 2 Interrupt */
-#define E1000_EICR_TX_QUEUE3    0x00000800 /* Tx Queue 3 Interrupt */
-#define E1000_EICR_TCP_TIMER    0x40000000 /* TCP Timer */
-#define E1000_EICR_OTHER        0x80000000 /* Interrupt Cause Active */
-/* TCP Timer */
-#define E1000_TCPTIMER_KS       0x00000100 /* KickStart */
-#define E1000_TCPTIMER_COUNT_ENABLE       0x00000200 /* Count Enable */
-#define E1000_TCPTIMER_COUNT_FINISH       0x00000400 /* Count finish */
-#define E1000_TCPTIMER_LOOP     0x00000800 /* Loop */
-
-/*
- * This defines the bits that are set in the Interrupt Mask
- * Set/Read Register.  Each bit is documented below:
- *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
- *   o RXSEQ  = Receive Sequence Error
- */
-#define POLL_IMS_ENABLE_MASK ( \
-    E1000_IMS_RXDMT0 |    \
-    E1000_IMS_RXSEQ)
-
-/*
- * This defines the bits that are set in the Interrupt Mask
- * Set/Read Register.  Each bit is documented below:
- *   o RXT0   = Receiver Timer Interrupt (ring 0)
- *   o TXDW   = Transmit Descriptor Written Back
- *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
- *   o RXSEQ  = Receive Sequence Error
- *   o LSC    = Link Status Change
- */
-#define IMS_ENABLE_MASK ( \
-    E1000_IMS_RXT0   |    \
-    E1000_IMS_TXDW   |    \
-    E1000_IMS_RXDMT0 |    \
-    E1000_IMS_RXSEQ  |    \
-    E1000_IMS_LSC)
-
-/* Interrupt Mask Set */
-#define E1000_IMS_TXDW      E1000_ICR_TXDW      /* Tx desc written back */
-#define E1000_IMS_TXQE      E1000_ICR_TXQE      /* Transmit Queue empty */
-#define E1000_IMS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_IMS_VMMB      E1000_ICR_VMMB      /* Mail box activity */
-#define E1000_IMS_RXSEQ     E1000_ICR_RXSEQ     /* rx sequence error */
-#define E1000_IMS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
-#define E1000_IMS_RXO       E1000_ICR_RXO       /* rx overrun */
-#define E1000_IMS_RXT0      E1000_ICR_RXT0      /* rx timer intr */
-#define E1000_IMS_MDAC      E1000_ICR_MDAC      /* MDIO access complete */
-#define E1000_IMS_RXCFG     E1000_ICR_RXCFG     /* Rx /c/ ordered set */
-#define E1000_IMS_GPI_EN0   E1000_ICR_GPI_EN0   /* GP Int 0 */
-#define E1000_IMS_GPI_EN1   E1000_ICR_GPI_EN1   /* GP Int 1 */
-#define E1000_IMS_GPI_EN2   E1000_ICR_GPI_EN2   /* GP Int 2 */
-#define E1000_IMS_GPI_EN3   E1000_ICR_GPI_EN3   /* GP Int 3 */
-#define E1000_IMS_TXD_LOW   E1000_ICR_TXD_LOW
-#define E1000_IMS_SRPD      E1000_ICR_SRPD
-#define E1000_IMS_ACK       E1000_ICR_ACK       /* Receive Ack frame */
-#define E1000_IMS_MNG       E1000_ICR_MNG       /* Manageability event */
-#define E1000_IMS_DOCK      E1000_ICR_DOCK      /* Dock/Undock */
-#define E1000_IMS_RXD_FIFO_PAR0 E1000_ICR_RXD_FIFO_PAR0 /* Q0 Rx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0 /* Q0 Tx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_HOST_ARB_PAR  E1000_ICR_HOST_ARB_PAR  /* host arb read buffer
-                                                         * parity error */
-#define E1000_IMS_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer parity
-                                                         * error */
-#define E1000_IMS_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* Q1 Rx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* Q1 Tx desc FIFO
-                                                         * parity error */
-#define E1000_IMS_DSW       E1000_ICR_DSW
-#define E1000_IMS_PHYINT    E1000_ICR_PHYINT
-#define E1000_IMS_DOUTSYNC  E1000_ICR_DOUTSYNC /* NIC DMA out of sync */
-#define E1000_IMS_EPRST     E1000_ICR_EPRST
-
-/* Extended Interrupt Mask Set */
-#define E1000_EIMS_RX_QUEUE0    E1000_EICR_RX_QUEUE0 /* Rx Queue 0 Interrupt */
-#define E1000_EIMS_RX_QUEUE1    E1000_EICR_RX_QUEUE1 /* Rx Queue 1 Interrupt */
-#define E1000_EIMS_RX_QUEUE2    E1000_EICR_RX_QUEUE2 /* Rx Queue 2 Interrupt */
-#define E1000_EIMS_RX_QUEUE3    E1000_EICR_RX_QUEUE3 /* Rx Queue 3 Interrupt */
-#define E1000_EIMS_TX_QUEUE0    E1000_EICR_TX_QUEUE0 /* Tx Queue 0 Interrupt */
-#define E1000_EIMS_TX_QUEUE1    E1000_EICR_TX_QUEUE1 /* Tx Queue 1 Interrupt */
-#define E1000_EIMS_TX_QUEUE2    E1000_EICR_TX_QUEUE2 /* Tx Queue 2 Interrupt */
-#define E1000_EIMS_TX_QUEUE3    E1000_EICR_TX_QUEUE3 /* Tx Queue 3 Interrupt */
-#define E1000_EIMS_TCP_TIMER    E1000_EICR_TCP_TIMER /* TCP Timer */
-#define E1000_EIMS_OTHER        E1000_EICR_OTHER   /* Interrupt Cause Active */
-
-/* Interrupt Cause Set */
-#define E1000_ICS_TXDW      E1000_ICR_TXDW      /* Tx desc written back */
-#define E1000_ICS_TXQE      E1000_ICR_TXQE      /* Transmit Queue empty */
-#define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */
-#define E1000_ICS_RXSEQ     E1000_ICR_RXSEQ     /* rx sequence error */
-#define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* rx desc min. threshold */
-#define E1000_ICS_RXO       E1000_ICR_RXO       /* rx overrun */
-#define E1000_ICS_RXT0      E1000_ICR_RXT0      /* rx timer intr */
-#define E1000_ICS_MDAC      E1000_ICR_MDAC      /* MDIO access complete */
-#define E1000_ICS_RXCFG     E1000_ICR_RXCFG     /* Rx /c/ ordered set */
-#define E1000_ICS_GPI_EN0   E1000_ICR_GPI_EN0   /* GP Int 0 */
-#define E1000_ICS_GPI_EN1   E1000_ICR_GPI_EN1   /* GP Int 1 */
-#define E1000_ICS_GPI_EN2   E1000_ICR_GPI_EN2   /* GP Int 2 */
-#define E1000_ICS_GPI_EN3   E1000_ICR_GPI_EN3   /* GP Int 3 */
-#define E1000_ICS_TXD_LOW   E1000_ICR_TXD_LOW
-#define E1000_ICS_SRPD      E1000_ICR_SRPD
-#define E1000_ICS_ACK       E1000_ICR_ACK       /* Receive Ack frame */
-#define E1000_ICS_MNG       E1000_ICR_MNG       /* Manageability event */
-#define E1000_ICS_DOCK      E1000_ICR_DOCK      /* Dock/Undock */
-#define E1000_ICS_RXD_FIFO_PAR0 E1000_ICR_RXD_FIFO_PAR0 /* Q0 Rx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_TXD_FIFO_PAR0 E1000_ICR_TXD_FIFO_PAR0 /* Q0 Tx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_HOST_ARB_PAR  E1000_ICR_HOST_ARB_PAR  /* host arb read buffer
-                                                         * parity error */
-#define E1000_ICS_PB_PAR        E1000_ICR_PB_PAR        /* packet buffer parity
-                                                         * error */
-#define E1000_ICS_RXD_FIFO_PAR1 E1000_ICR_RXD_FIFO_PAR1 /* Q1 Rx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_TXD_FIFO_PAR1 E1000_ICR_TXD_FIFO_PAR1 /* Q1 Tx desc FIFO
-                                                         * parity error */
-#define E1000_ICS_DSW       E1000_ICR_DSW
-#define E1000_ICS_DOUTSYNC  E1000_ICR_DOUTSYNC /* NIC DMA out of sync */
-#define E1000_ICS_PHYINT    E1000_ICR_PHYINT
-#define E1000_ICS_EPRST     E1000_ICR_EPRST
-
-/* Extended Interrupt Cause Set */
-#define E1000_EICS_RX_QUEUE0    E1000_EICR_RX_QUEUE0 /* Rx Queue 0 Interrupt */
-#define E1000_EICS_RX_QUEUE1    E1000_EICR_RX_QUEUE1 /* Rx Queue 1 Interrupt */
-#define E1000_EICS_RX_QUEUE2    E1000_EICR_RX_QUEUE2 /* Rx Queue 2 Interrupt */
-#define E1000_EICS_RX_QUEUE3    E1000_EICR_RX_QUEUE3 /* Rx Queue 3 Interrupt */
-#define E1000_EICS_TX_QUEUE0    E1000_EICR_TX_QUEUE0 /* Tx Queue 0 Interrupt */
-#define E1000_EICS_TX_QUEUE1    E1000_EICR_TX_QUEUE1 /* Tx Queue 1 Interrupt */
-#define E1000_EICS_TX_QUEUE2    E1000_EICR_TX_QUEUE2 /* Tx Queue 2 Interrupt */
-#define E1000_EICS_TX_QUEUE3    E1000_EICR_TX_QUEUE3 /* Tx Queue 3 Interrupt */
-#define E1000_EICS_TCP_TIMER    E1000_EICR_TCP_TIMER /* TCP Timer */
-#define E1000_EICS_OTHER        E1000_EICR_OTHER   /* Interrupt Cause Active */
-
-#define E1000_EITR_ITR_INT_MASK 0x0000FFFF
-
-/* Transmit Descriptor Control */
-#define E1000_TXDCTL_PTHRESH 0x0000003F /* TXDCTL Prefetch Threshold */
-#define E1000_TXDCTL_HTHRESH 0x00003F00 /* TXDCTL Host Threshold */
-#define E1000_TXDCTL_WTHRESH 0x003F0000 /* TXDCTL Writeback Threshold */
-#define E1000_TXDCTL_GRAN    0x01000000 /* TXDCTL Granularity */
-#define E1000_TXDCTL_LWTHRESH 0xFE000000 /* TXDCTL Low Threshold */
-#define E1000_TXDCTL_FULL_TX_DESC_WB 0x01010000 /* GRAN=1, WTHRESH=1 */
-#define E1000_TXDCTL_MAX_TX_DESC_PREFETCH 0x0100001F /* GRAN=1, PTHRESH=31 */
-/* Enable the counting of descriptors still to be processed. */
-#define E1000_TXDCTL_COUNT_DESC 0x00400000
-
-/* Flow Control Constants */
-#define FLOW_CONTROL_ADDRESS_LOW  0x00C28001
-#define FLOW_CONTROL_ADDRESS_HIGH 0x00000100
-#define FLOW_CONTROL_TYPE         0x8808
-
-/* 802.1q VLAN Packet Size */
-#define VLAN_TAG_SIZE              4    /* 802.3ac tag (not DMA'd) */
-#define E1000_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */
-
-/* Receive Address */
-/*
- * Number of high/low register pairs in the RAR. The RAR (Receive Address
- * Registers) holds the directed and multicast addresses that we monitor.
- * Technically, we have 16 spots.  However, we reserve one of these spots
- * (RAR[15]) for our directed address used by controllers with
- * manageability enabled, allowing us room for 15 multicast addresses.
- */
-#define E1000_RAR_ENTRIES     15
-#define E1000_RAH_AV  0x80000000        /* Receive descriptor valid */
-#define E1000_RAL_MAC_ADDR_LEN 4
-#define E1000_RAH_MAC_ADDR_LEN 2
-#define E1000_RAH_POOL_MASK 0x03FC0000
-#define E1000_RAH_POOL_1 0x00040000
-
-/* Error Codes */
-#define E1000_SUCCESS      0
-#define E1000_ERR_NVM      1
-#define E1000_ERR_PHY      2
-#define E1000_ERR_CONFIG   3
-#define E1000_ERR_PARAM    4
-#define E1000_ERR_MAC_INIT 5
-#define E1000_ERR_PHY_TYPE 6
-#define E1000_ERR_RESET   9
-#define E1000_ERR_MASTER_REQUESTS_PENDING 10
-#define E1000_ERR_HOST_INTERFACE_COMMAND 11
-#define E1000_BLK_PHY_RESET   12
-#define E1000_ERR_SWFW_SYNC 13
-#define E1000_NOT_IMPLEMENTED 14
-#define E1000_ERR_MBX      15
-
-/* Loop limit on how long we wait for auto-negotiation to complete */
-#define FIBER_LINK_UP_LIMIT               50
-#define COPPER_LINK_UP_LIMIT              10
-#define PHY_AUTO_NEG_LIMIT                45
-#define PHY_FORCE_LIMIT                   20
-/* Number of 100 microseconds we wait for PCI Express master disable */
-#define MASTER_DISABLE_TIMEOUT      800
-/* Number of milliseconds we wait for PHY configuration done after MAC reset */
-#define PHY_CFG_TIMEOUT             100
-/* Number of 2 milliseconds we wait for acquiring MDIO ownership. */
-#define MDIO_OWNERSHIP_TIMEOUT      10
-/* Number of milliseconds for NVM auto read done after MAC reset. */
-#define AUTO_READ_DONE_TIMEOUT      10
-
-/* Flow Control */
-#define E1000_FCRTH_RTH  0x0000FFF8     /* Mask Bits[15:3] for RTH */
-#define E1000_FCRTH_XFCE 0x80000000     /* External Flow Control Enable */
-#define E1000_FCRTL_RTL  0x0000FFF8     /* Mask Bits[15:3] for RTL */
-#define E1000_FCRTL_XONE 0x80000000     /* Enable XON frame transmission */
-
-/* Transmit Configuration Word */
-#define E1000_TXCW_FD         0x00000020        /* TXCW full duplex */
-#define E1000_TXCW_HD         0x00000040        /* TXCW half duplex */
-#define E1000_TXCW_PAUSE      0x00000080        /* TXCW sym pause request */
-#define E1000_TXCW_ASM_DIR    0x00000100        /* TXCW astm pause direction */
-#define E1000_TXCW_PAUSE_MASK 0x00000180        /* TXCW pause request mask */
-#define E1000_TXCW_RF         0x00003000        /* TXCW remote fault */
-#define E1000_TXCW_NP         0x00008000        /* TXCW next page */
-#define E1000_TXCW_CW         0x0000ffff        /* TxConfigWord mask */
-#define E1000_TXCW_TXC        0x40000000        /* Transmit Config control */
-#define E1000_TXCW_ANE        0x80000000        /* Auto-neg enable */
-
-/* Receive Configuration Word */
-#define E1000_RXCW_CW         0x0000ffff        /* RxConfigWord mask */
-#define E1000_RXCW_NC         0x04000000        /* Receive config no carrier */
-#define E1000_RXCW_IV         0x08000000        /* Receive config invalid */
-#define E1000_RXCW_CC         0x10000000        /* Receive config change */
-#define E1000_RXCW_C          0x20000000        /* Receive config */
-#define E1000_RXCW_SYNCH      0x40000000        /* Receive config synch */
-#define E1000_RXCW_ANC        0x80000000        /* Auto-neg complete */
-
-#define E1000_TSYNCTXCTL_VALID    0x00000001 /* tx timestamp valid */
-#define E1000_TSYNCTXCTL_ENABLED  0x00000010 /* enable tx timestampping */
-
-#define E1000_TSYNCRXCTL_VALID      0x00000001 /* rx timestamp valid */
-#define E1000_TSYNCRXCTL_TYPE_MASK  0x0000000E /* rx type mask */
-#define E1000_TSYNCRXCTL_TYPE_L2_V2       0x00
-#define E1000_TSYNCRXCTL_TYPE_L4_V1       0x02
-#define E1000_TSYNCRXCTL_TYPE_L2_L4_V2    0x04
-#define E1000_TSYNCRXCTL_TYPE_ALL         0x08
-#define E1000_TSYNCRXCTL_TYPE_EVENT_V2    0x0A
-#define E1000_TSYNCRXCTL_ENABLED    0x00000010 /* enable rx timestampping */
-
-#define E1000_TSYNCRXCFG_PTP_V1_CTRLT_MASK   0x000000FF
-#define E1000_TSYNCRXCFG_PTP_V1_SYNC_MESSAGE       0x00
-#define E1000_TSYNCRXCFG_PTP_V1_DELAY_REQ_MESSAGE  0x01
-#define E1000_TSYNCRXCFG_PTP_V1_FOLLOWUP_MESSAGE   0x02
-#define E1000_TSYNCRXCFG_PTP_V1_DELAY_RESP_MESSAGE 0x03
-#define E1000_TSYNCRXCFG_PTP_V1_MANAGEMENT_MESSAGE 0x04
-
-#define E1000_TSYNCRXCFG_PTP_V2_MSGID_MASK               0x00000F00
-#define E1000_TSYNCRXCFG_PTP_V2_SYNC_MESSAGE                 0x0000
-#define E1000_TSYNCRXCFG_PTP_V2_DELAY_REQ_MESSAGE            0x0100
-#define E1000_TSYNCRXCFG_PTP_V2_PATH_DELAY_REQ_MESSAGE       0x0200
-#define E1000_TSYNCRXCFG_PTP_V2_PATH_DELAY_RESP_MESSAGE      0x0300
-#define E1000_TSYNCRXCFG_PTP_V2_FOLLOWUP_MESSAGE             0x0800
-#define E1000_TSYNCRXCFG_PTP_V2_DELAY_RESP_MESSAGE           0x0900
-#define E1000_TSYNCRXCFG_PTP_V2_PATH_DELAY_FOLLOWUP_MESSAGE  0x0A00
-#define E1000_TSYNCRXCFG_PTP_V2_ANNOUNCE_MESSAGE             0x0B00
-#define E1000_TSYNCRXCFG_PTP_V2_SIGNALLING_MESSAGE           0x0C00
-#define E1000_TSYNCRXCFG_PTP_V2_MANAGEMENT_MESSAGE           0x0D00
-
-#define E1000_TIMINCA_16NS_SHIFT 24
-
-/* PCI Express Control */
-#define E1000_GCR_RXD_NO_SNOOP          0x00000001
-#define E1000_GCR_RXDSCW_NO_SNOOP       0x00000002
-#define E1000_GCR_RXDSCR_NO_SNOOP       0x00000004
-#define E1000_GCR_TXD_NO_SNOOP          0x00000008
-#define E1000_GCR_TXDSCW_NO_SNOOP       0x00000010
-#define E1000_GCR_TXDSCR_NO_SNOOP       0x00000020
-#define E1000_GCR_CMPL_TMOUT_MASK       0x0000F000
-#define E1000_GCR_CMPL_TMOUT_10ms       0x00001000
-#define E1000_GCR_CMPL_TMOUT_RESEND     0x00010000
-#define E1000_GCR_CAP_VER2              0x00040000
-
-#define PCIE_NO_SNOOP_ALL (E1000_GCR_RXD_NO_SNOOP         | \
-                           E1000_GCR_RXDSCW_NO_SNOOP      | \
-                           E1000_GCR_RXDSCR_NO_SNOOP      | \
-                           E1000_GCR_TXD_NO_SNOOP         | \
-                           E1000_GCR_TXDSCW_NO_SNOOP      | \
-                           E1000_GCR_TXDSCR_NO_SNOOP)
-
-/* PHY Control Register */
-#define MII_CR_SPEED_SELECT_MSB 0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_COLL_TEST_ENABLE 0x0080  /* Collision test enable */
-#define MII_CR_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */
-#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */
-#define MII_CR_ISOLATE          0x0400  /* Isolate PHY from MII */
-#define MII_CR_POWER_DOWN       0x0800  /* Power down */
-#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */
-#define MII_CR_SPEED_SELECT_LSB 0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_LOOPBACK         0x4000  /* 0 = normal, 1 = loopback */
-#define MII_CR_RESET            0x8000  /* 0 = normal, 1 = PHY reset */
-#define MII_CR_SPEED_1000       0x0040
-#define MII_CR_SPEED_100        0x2000
-#define MII_CR_SPEED_10         0x0000
-
-/* PHY Status Register */
-#define MII_SR_EXTENDED_CAPS     0x0001 /* Extended register capabilities */
-#define MII_SR_JABBER_DETECT     0x0002 /* Jabber Detected */
-#define MII_SR_LINK_STATUS       0x0004 /* Link Status 1 = link */
-#define MII_SR_AUTONEG_CAPS      0x0008 /* Auto Neg Capable */
-#define MII_SR_REMOTE_FAULT      0x0010 /* Remote Fault Detect */
-#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
-#define MII_SR_PREAMBLE_SUPPRESS 0x0040 /* Preamble may be suppressed */
-#define MII_SR_EXTENDED_STATUS   0x0100 /* Ext. status info in Reg 0x0F */
-#define MII_SR_100T2_HD_CAPS     0x0200 /* 100T2 Half Duplex Capable */
-#define MII_SR_100T2_FD_CAPS     0x0400 /* 100T2 Full Duplex Capable */
-#define MII_SR_10T_HD_CAPS       0x0800 /* 10T   Half Duplex Capable */
-#define MII_SR_10T_FD_CAPS       0x1000 /* 10T   Full Duplex Capable */
-#define MII_SR_100X_HD_CAPS      0x2000 /* 100X  Half Duplex Capable */
-#define MII_SR_100X_FD_CAPS      0x4000 /* 100X  Full Duplex Capable */
-#define MII_SR_100T4_CAPS        0x8000 /* 100T4 Capable */
-
-/* Autoneg Advertisement Register */
-#define NWAY_AR_SELECTOR_FIELD   0x0001   /* indicates IEEE 802.3 CSMA/CD */
-#define NWAY_AR_10T_HD_CAPS      0x0020   /* 10T   Half Duplex Capable */
-#define NWAY_AR_10T_FD_CAPS      0x0040   /* 10T   Full Duplex Capable */
-#define NWAY_AR_100TX_HD_CAPS    0x0080   /* 100TX Half Duplex Capable */
-#define NWAY_AR_100TX_FD_CAPS    0x0100   /* 100TX Full Duplex Capable */
-#define NWAY_AR_100T4_CAPS       0x0200   /* 100T4 Capable */
-#define NWAY_AR_PAUSE            0x0400   /* Pause operation desired */
-#define NWAY_AR_ASM_DIR          0x0800   /* Asymmetric Pause Direction bit */
-#define NWAY_AR_REMOTE_FAULT     0x2000   /* Remote Fault detected */
-#define NWAY_AR_NEXT_PAGE        0x8000   /* Next Page ability supported */
-
-/* Link Partner Ability Register (Base Page) */
-#define NWAY_LPAR_SELECTOR_FIELD 0x0000 /* LP protocol selector field */
-#define NWAY_LPAR_10T_HD_CAPS    0x0020 /* LP is 10T   Half Duplex Capable */
-#define NWAY_LPAR_10T_FD_CAPS    0x0040 /* LP is 10T   Full Duplex Capable */
-#define NWAY_LPAR_100TX_HD_CAPS  0x0080 /* LP is 100TX Half Duplex Capable */
-#define NWAY_LPAR_100TX_FD_CAPS  0x0100 /* LP is 100TX Full Duplex Capable */
-#define NWAY_LPAR_100T4_CAPS     0x0200 /* LP is 100T4 Capable */
-#define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
-#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
-#define NWAY_LPAR_REMOTE_FAULT   0x2000 /* LP has detected Remote Fault */
-#define NWAY_LPAR_ACKNOWLEDGE    0x4000 /* LP has rx'd link code word */
-#define NWAY_LPAR_NEXT_PAGE      0x8000 /* Next Page ability supported */
-
-/* Autoneg Expansion Register */
-#define NWAY_ER_LP_NWAY_CAPS      0x0001 /* LP has Auto Neg Capability */
-#define NWAY_ER_PAGE_RXD          0x0002 /* LP is 10T   Half Duplex Capable */
-#define NWAY_ER_NEXT_PAGE_CAPS    0x0004 /* LP is 10T   Full Duplex Capable */
-#define NWAY_ER_LP_NEXT_PAGE_CAPS 0x0008 /* LP is 100TX Half Duplex Capable */
-#define NWAY_ER_PAR_DETECT_FAULT  0x0010 /* LP is 100TX Full Duplex Capable */
-
-/* 1000BASE-T Control Register */
-#define CR_1000T_ASYM_PAUSE      0x0080 /* Advertise asymmetric pause bit */
-#define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
-#define CR_1000T_FD_CAPS         0x0200 /* Advertise 1000T FD capability  */
-#define CR_1000T_REPEATER_DTE    0x0400 /* 1=Repeater/switch device port */
-                                        /* 0=DTE device */
-#define CR_1000T_MS_VALUE        0x0800 /* 1=Configure PHY as Master */
-                                        /* 0=Configure PHY as Slave */
-#define CR_1000T_MS_ENABLE      0x1000 /* 1=Master/Slave manual config value */
-                                        /* 0=Automatic Master/Slave config */
-#define CR_1000T_TEST_MODE_NORMAL 0x0000 /* Normal Operation */
-#define CR_1000T_TEST_MODE_1     0x2000 /* Transmit Waveform test */
-#define CR_1000T_TEST_MODE_2     0x4000 /* Master Transmit Jitter test */
-#define CR_1000T_TEST_MODE_3     0x6000 /* Slave Transmit Jitter test */
-#define CR_1000T_TEST_MODE_4     0x8000 /* Transmitter Distortion test */
-
-/* 1000BASE-T Status Register */
-#define SR_1000T_IDLE_ERROR_CNT   0x00FF /* Num idle errors since last read */
-#define SR_1000T_ASYM_PAUSE_DIR  0x0100 /* LP asymmetric pause direction bit */
-#define SR_1000T_LP_HD_CAPS       0x0400 /* LP is 1000T HD capable */
-#define SR_1000T_LP_FD_CAPS       0x0800 /* LP is 1000T FD capable */
-#define SR_1000T_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
-#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
-#define SR_1000T_MS_CONFIG_RES    0x4000 /* 1=Local Tx is Master, 0=Slave */
-#define SR_1000T_MS_CONFIG_FAULT  0x8000 /* Master/Slave config fault */
-
-#define SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT 5
-
-/* PHY 1000 MII Register/Bit Definitions */
-/* PHY Registers defined by IEEE */
-#define PHY_CONTROL      0x00 /* Control Register */
-#define PHY_STATUS       0x01 /* Status Register */
-#define PHY_ID1          0x02 /* Phy Id Reg (word 1) */
-#define PHY_ID2          0x03 /* Phy Id Reg (word 2) */
-#define PHY_AUTONEG_ADV  0x04 /* Autoneg Advertisement */
-#define PHY_LP_ABILITY   0x05 /* Link Partner Ability (Base Page) */
-#define PHY_AUTONEG_EXP  0x06 /* Autoneg Expansion Reg */
-#define PHY_NEXT_PAGE_TX 0x07 /* Next Page Tx */
-#define PHY_LP_NEXT_PAGE 0x08 /* Link Partner Next Page */
-#define PHY_1000T_CTRL   0x09 /* 1000Base-T Control Reg */
-#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */
-#define PHY_EXT_STATUS   0x0F /* Extended Status Reg */
-
-#define PHY_CONTROL_LB   0x4000 /* PHY Loopback bit */
-
-/* NVM Control */
-#define E1000_EECD_SK        0x00000001 /* NVM Clock */
-#define E1000_EECD_CS        0x00000002 /* NVM Chip Select */
-#define E1000_EECD_DI        0x00000004 /* NVM Data In */
-#define E1000_EECD_DO        0x00000008 /* NVM Data Out */
-#define E1000_EECD_FWE_MASK  0x00000030
-#define E1000_EECD_FWE_DIS   0x00000010 /* Disable FLASH writes */
-#define E1000_EECD_FWE_EN    0x00000020 /* Enable FLASH writes */
-#define E1000_EECD_FWE_SHIFT 4
-#define E1000_EECD_REQ       0x00000040 /* NVM Access Request */
-#define E1000_EECD_GNT       0x00000080 /* NVM Access Grant */
-#define E1000_EECD_PRES      0x00000100 /* NVM Present */
-#define E1000_EECD_SIZE      0x00000200 /* NVM Size (0=64 word 1=256 word) */
-/* NVM Addressing bits based on type 0=small, 1=large */
-#define E1000_EECD_ADDR_BITS 0x00000400
-#define E1000_EECD_TYPE      0x00002000 /* NVM Type (1-SPI, 0-Microwire) */
-#define E1000_NVM_GRANT_ATTEMPTS   1000 /* NVM # attempts to gain grant */
-#define E1000_EECD_AUTO_RD          0x00000200  /* NVM Auto Read done */
-#define E1000_EECD_SIZE_EX_MASK     0x00007800  /* NVM Size */
-#define E1000_EECD_SIZE_EX_SHIFT     11
-#define E1000_EECD_NVADDS    0x00018000 /* NVM Address Size */
-#define E1000_EECD_SELSHAD   0x00020000 /* Select Shadow RAM */
-#define E1000_EECD_INITSRAM  0x00040000 /* Initialize Shadow RAM */
-#define E1000_EECD_FLUPD     0x00080000 /* Update FLASH */
-#define E1000_EECD_AUPDEN    0x00100000 /* Enable Autonomous FLASH update */
-#define E1000_EECD_SHADV     0x00200000 /* Shadow RAM Data Valid */
-#define E1000_EECD_SEC1VAL   0x00400000 /* Sector One Valid */
-#define E1000_EECD_SECVAL_SHIFT      22
-#define E1000_EECD_SEC1VAL_VALID_MASK (E1000_EECD_AUTO_RD | E1000_EECD_PRES)
-
-#define E1000_NVM_SWDPIN0   0x0001   /* SWDPIN 0 NVM Value */
-#define E1000_NVM_LED_LOGIC 0x0020   /* Led Logic Word */
-#define E1000_NVM_RW_REG_DATA   16  /* Offset to data in NVM read/write regs */
-#define E1000_NVM_RW_REG_DONE   2    /* Offset to READ/WRITE done bit */
-#define E1000_NVM_RW_REG_START  1    /* Start operation */
-#define E1000_NVM_RW_ADDR_SHIFT 2    /* Shift to the address bits */
-#define E1000_NVM_POLL_WRITE    1    /* Flag for polling for write complete */
-#define E1000_NVM_POLL_READ     0    /* Flag for polling for read complete */
-#define E1000_FLASH_UPDATES  2000
-
-/* NVM Word Offsets */
-#define NVM_COMPAT                 0x0003
-#define NVM_ID_LED_SETTINGS        0x0004
-#define NVM_VERSION                0x0005
-#define NVM_SERDES_AMPLITUDE       0x0006 /* SERDES output amplitude */
-#define NVM_PHY_CLASS_WORD         0x0007
-#define NVM_INIT_CONTROL1_REG      0x000A
-#define NVM_INIT_CONTROL2_REG      0x000F
-#define NVM_SWDEF_PINS_CTRL_PORT_1 0x0010
-#define NVM_INIT_CONTROL3_PORT_B   0x0014
-#define NVM_INIT_3GIO_3            0x001A
-#define NVM_SWDEF_PINS_CTRL_PORT_0 0x0020
-#define NVM_INIT_CONTROL3_PORT_A   0x0024
-#define NVM_CFG                    0x0012
-#define NVM_FLASH_VERSION          0x0032
-#define NVM_ALT_MAC_ADDR_PTR       0x0037
-#define NVM_CHECKSUM_REG           0x003F
-
-#define E1000_NVM_CFG_DONE_PORT_0  0x040000 /* MNG config cycle done */
-#define E1000_NVM_CFG_DONE_PORT_1  0x080000 /* ...for second port */
-
-/* Mask bits for fields in Word 0x0f of the NVM */
-#define NVM_WORD0F_PAUSE_MASK       0x3000
-#define NVM_WORD0F_PAUSE            0x1000
-#define NVM_WORD0F_ASM_DIR          0x2000
-#define NVM_WORD0F_ANE              0x0800
-#define NVM_WORD0F_SWPDIO_EXT_MASK  0x00F0
-#define NVM_WORD0F_LPLU             0x0001
-
-/* Mask bits for fields in Word 0x1a of the NVM */
-#define NVM_WORD1A_ASPM_MASK  0x000C
-
-/* For checksumming, the sum of all words in the NVM should equal 0xBABA. */
-#define NVM_SUM                    0xBABA
-
-#define NVM_MAC_ADDR_OFFSET        0
-#define NVM_PBA_OFFSET_0           8
-#define NVM_PBA_OFFSET_1           9
-#define NVM_RESERVED_WORD          0xFFFF
-#define NVM_PHY_CLASS_A            0x8000
-#define NVM_SERDES_AMPLITUDE_MASK  0x000F
-#define NVM_SIZE_MASK              0x1C00
-#define NVM_SIZE_SHIFT             10
-#define NVM_WORD_SIZE_BASE_SHIFT   6
-#define NVM_SWDPIO_EXT_SHIFT       4
-
-/* NVM Commands - SPI */
-#define NVM_MAX_RETRY_SPI          5000 /* Max wait of 5ms, for RDY signal */
-#define NVM_READ_OPCODE_SPI        0x03 /* NVM read opcode */
-#define NVM_WRITE_OPCODE_SPI       0x02 /* NVM write opcode */
-#define NVM_A8_OPCODE_SPI          0x08 /* opcode bit-3 = address bit-8 */
-#define NVM_WREN_OPCODE_SPI        0x06 /* NVM set Write Enable latch */
-#define NVM_WRDI_OPCODE_SPI        0x04 /* NVM reset Write Enable latch */
-#define NVM_RDSR_OPCODE_SPI        0x05 /* NVM read Status register */
-#define NVM_WRSR_OPCODE_SPI        0x01 /* NVM write Status register */
-
-/* SPI NVM Status Register */
-#define NVM_STATUS_RDY_SPI         0x01
-#define NVM_STATUS_WEN_SPI         0x02
-#define NVM_STATUS_BP0_SPI         0x04
-#define NVM_STATUS_BP1_SPI         0x08
-#define NVM_STATUS_WPEN_SPI        0x80
-
-/* Word definitions for ID LED Settings */
-#define ID_LED_RESERVED_0000 0x0000
-#define ID_LED_RESERVED_FFFF 0xFFFF
-#define ID_LED_DEFAULT       ((ID_LED_OFF1_ON2  << 12) | \
-                              (ID_LED_OFF1_OFF2 <<  8) | \
-                              (ID_LED_DEF1_DEF2 <<  4) | \
-                              (ID_LED_DEF1_DEF2))
-#define ID_LED_DEF1_DEF2     0x1
-#define ID_LED_DEF1_ON2      0x2
-#define ID_LED_DEF1_OFF2     0x3
-#define ID_LED_ON1_DEF2      0x4
-#define ID_LED_ON1_ON2       0x5
-#define ID_LED_ON1_OFF2      0x6
-#define ID_LED_OFF1_DEF2     0x7
-#define ID_LED_OFF1_ON2      0x8
-#define ID_LED_OFF1_OFF2     0x9
-
-#define IGP_ACTIVITY_LED_MASK   0xFFFFF0FF
-#define IGP_ACTIVITY_LED_ENABLE 0x0300
-#define IGP_LED3_MODE           0x07000000
-
-/* PCI/PCI-X/PCI-EX Config space */
-#define PCI_HEADER_TYPE_REGISTER     0x0E
-#define PCIE_LINK_STATUS             0x12
-#define PCIE_DEVICE_CONTROL2         0x28
-
-#define PCI_HEADER_TYPE_MULTIFUNC    0x80
-#define PCIE_LINK_WIDTH_MASK         0x3F0
-#define PCIE_LINK_WIDTH_SHIFT        4
-#define PCIE_DEVICE_CONTROL2_16ms    0x0005
-
-#ifndef ETH_ADDR_LEN
-#define ETH_ADDR_LEN                 6
-#endif
-
-#define PHY_REVISION_MASK      0xFFFFFFF0
-#define MAX_PHY_REG_ADDRESS    0x1F  /* 5 bit address bus (0-0x1F) */
-#define MAX_PHY_MULTI_PAGE_REG 0xF
-
-/* Bit definitions for valid PHY IDs. */
-/*
- * I = Integrated
- * E = External
- */
-#define M88E1000_E_PHY_ID    0x01410C50
-#define M88E1000_I_PHY_ID    0x01410C30
-#define M88E1011_I_PHY_ID    0x01410C20
-#define IGP01E1000_I_PHY_ID  0x02A80380
-#define M88E1011_I_REV_4     0x04
-#define M88E1111_I_PHY_ID    0x01410CC0
-#define GG82563_E_PHY_ID     0x01410CA0
-#define IGP03E1000_E_PHY_ID  0x02A80390
-#define IFE_E_PHY_ID         0x02A80330
-#define IFE_PLUS_E_PHY_ID    0x02A80320
-#define IFE_C_E_PHY_ID       0x02A80310
-#define IGP04E1000_E_PHY_ID  0x02A80391
-#define M88_VENDOR           0x0141
-
-/* M88E1000 Specific Registers */
-#define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */
-#define M88E1000_PHY_SPEC_STATUS   0x11  /* PHY Specific Status Register */
-#define M88E1000_INT_ENABLE        0x12  /* Interrupt Enable Register */
-#define M88E1000_INT_STATUS        0x13  /* Interrupt Status Register */
-#define M88E1000_EXT_PHY_SPEC_CTRL 0x14  /* Extended PHY Specific Control */
-#define M88E1000_RX_ERR_CNTR       0x15  /* Receive Error Counter */
-
-#define M88E1000_PHY_EXT_CTRL      0x1A  /* PHY extend control register */
-#define M88E1000_PHY_PAGE_SELECT   0x1D  /* Reg 29 for page number setting */
-#define M88E1000_PHY_GEN_CONTROL   0x1E  /* Its meaning depends on reg 29 */
-#define M88E1000_PHY_VCO_REG_BIT8  0x100 /* Bits 8 & 11 are adjusted for */
-#define M88E1000_PHY_VCO_REG_BIT11 0x800    /* improved BER performance */
-
-/* M88E1000 PHY Specific Control Register */
-#define M88E1000_PSCR_JABBER_DISABLE    0x0001 /* 1=Jabber Function disabled */
-#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reverse enabled */
-#define M88E1000_PSCR_SQE_TEST          0x0004 /* 1=SQE Test enabled */
-/* 1=CLK125 low, 0=CLK125 toggling */
-#define M88E1000_PSCR_CLK125_DISABLE    0x0010
-#define M88E1000_PSCR_MDI_MANUAL_MODE  0x0000 /* MDI Crossover Mode bits 6:5 */
-                                               /* Manual MDI configuration */
-#define M88E1000_PSCR_MDIX_MANUAL_MODE 0x0020  /* Manual MDIX configuration */
-/* 1000BASE-T: Auto crossover, 100BASE-TX/10BASE-T: MDI Mode */
-#define M88E1000_PSCR_AUTO_X_1000T     0x0040
-/* Auto crossover enabled all speeds */
-#define M88E1000_PSCR_AUTO_X_MODE      0x0060
-/*
- * 1=Enable Extended 10BASE-T distance (Lower 10BASE-T Rx Threshold
- * 0=Normal 10BASE-T Rx Threshold
- */
-#define M88E1000_PSCR_EN_10BT_EXT_DIST 0x0080
-/* 1=5-bit interface in 100BASE-TX, 0=MII interface in 100BASE-TX */
-#define M88E1000_PSCR_MII_5BIT_ENABLE      0x0100
-#define M88E1000_PSCR_SCRAMBLER_DISABLE    0x0200 /* 1=Scrambler disable */
-#define M88E1000_PSCR_FORCE_LINK_GOOD      0x0400 /* 1=Force link good */
-#define M88E1000_PSCR_ASSERT_CRS_ON_TX     0x0800 /* 1=Assert CRS on Tx */
-
-/* M88E1000 PHY Specific Status Register */
-#define M88E1000_PSSR_JABBER             0x0001 /* 1=Jabber */
-#define M88E1000_PSSR_REV_POLARITY       0x0002 /* 1=Polarity reversed */
-#define M88E1000_PSSR_DOWNSHIFT          0x0020 /* 1=Downshifted */
-#define M88E1000_PSSR_MDIX               0x0040 /* 1=MDIX; 0=MDI */
-/*
- * 0 = <50M
- * 1 = 50-80M
- * 2 = 80-110M
- * 3 = 110-140M
- * 4 = >140M
- */
-#define M88E1000_PSSR_CABLE_LENGTH       0x0380
-#define M88E1000_PSSR_LINK               0x0400 /* 1=Link up, 0=Link down */
-#define M88E1000_PSSR_SPD_DPLX_RESOLVED  0x0800 /* 1=Speed & Duplex resolved */
-#define M88E1000_PSSR_PAGE_RCVD          0x1000 /* 1=Page received */
-#define M88E1000_PSSR_DPLX               0x2000 /* 1=Duplex 0=Half Duplex */
-#define M88E1000_PSSR_SPEED              0xC000 /* Speed, bits 14:15 */
-#define M88E1000_PSSR_10MBS              0x0000 /* 00=10Mbs */
-#define M88E1000_PSSR_100MBS             0x4000 /* 01=100Mbs */
-#define M88E1000_PSSR_1000MBS            0x8000 /* 10=1000Mbs */
-
-#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
-
-/* M88E1000 Extended PHY Specific Control Register */
-#define M88E1000_EPSCR_FIBER_LOOPBACK 0x4000 /* 1=Fiber loopback */
-/*
- * 1 = Lost lock detect enabled.
- * Will assert lost lock and bring
- * link down if idle not seen
- * within 1ms in 1000BASE-T
- */
-#define M88E1000_EPSCR_DOWN_NO_IDLE   0x8000
-/*
- * Number of times we will attempt to autonegotiate before downshifting if we
- * are the master
- */
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK 0x0C00
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_1X   0x0000
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_2X   0x0400
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_3X   0x0800
-#define M88E1000_EPSCR_MASTER_DOWNSHIFT_4X   0x0C00
-/*
- * Number of times we will attempt to autonegotiate before downshifting if we
- * are the slave
- */
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK  0x0300
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_DIS   0x0000
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X    0x0100
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_2X    0x0200
-#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_3X    0x0300
-#define M88E1000_EPSCR_TX_CLK_2_5     0x0060 /* 2.5 MHz TX_CLK */
-#define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
-#define M88E1000_EPSCR_TX_CLK_0       0x0000 /* NO  TX_CLK */
-
-/* M88EC018 Rev 2 specific DownShift settings */
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK  0x0E00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_1X    0x0000
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_2X    0x0200
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_3X    0x0400
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_4X    0x0600
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X    0x0800
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_6X    0x0A00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_7X    0x0C00
-#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_8X    0x0E00
-
-/*
- * Bits...
- * 15-5: page
- * 4-0: register offset
- */
-#define GG82563_PAGE_SHIFT        5
-#define GG82563_REG(page, reg)    \
-        (((page) << GG82563_PAGE_SHIFT) | ((reg) & MAX_PHY_REG_ADDRESS))
-#define GG82563_MIN_ALT_REG       30
-
-/* GG82563 Specific Registers */
-#define GG82563_PHY_SPEC_CTRL           \
-        GG82563_REG(0, 16) /* PHY Specific Control */
-#define GG82563_PHY_SPEC_STATUS         \
-        GG82563_REG(0, 17) /* PHY Specific Status */
-#define GG82563_PHY_INT_ENABLE          \
-        GG82563_REG(0, 18) /* Interrupt Enable */
-#define GG82563_PHY_SPEC_STATUS_2       \
-        GG82563_REG(0, 19) /* PHY Specific Status 2 */
-#define GG82563_PHY_RX_ERR_CNTR         \
-        GG82563_REG(0, 21) /* Receive Error Counter */
-#define GG82563_PHY_PAGE_SELECT         \
-        GG82563_REG(0, 22) /* Page Select */
-#define GG82563_PHY_SPEC_CTRL_2         \
-        GG82563_REG(0, 26) /* PHY Specific Control 2 */
-#define GG82563_PHY_PAGE_SELECT_ALT     \
-        GG82563_REG(0, 29) /* Alternate Page Select */
-#define GG82563_PHY_TEST_CLK_CTRL       \
-        GG82563_REG(0, 30) /* Test Clock Control (use reg. 29 to select) */
-
-#define GG82563_PHY_MAC_SPEC_CTRL       \
-        GG82563_REG(2, 21) /* MAC Specific Control Register */
-#define GG82563_PHY_MAC_SPEC_CTRL_2     \
-        GG82563_REG(2, 26) /* MAC Specific Control 2 */
-
-#define GG82563_PHY_DSP_DISTANCE    \
-        GG82563_REG(5, 26) /* DSP Distance */
-
-/* Page 193 - Port Control Registers */
-#define GG82563_PHY_KMRN_MODE_CTRL   \
-        GG82563_REG(193, 16) /* Kumeran Mode Control */
-#define GG82563_PHY_PORT_RESET          \
-        GG82563_REG(193, 17) /* Port Reset */
-#define GG82563_PHY_REVISION_ID         \
-        GG82563_REG(193, 18) /* Revision ID */
-#define GG82563_PHY_DEVICE_ID           \
-        GG82563_REG(193, 19) /* Device ID */
-#define GG82563_PHY_PWR_MGMT_CTRL       \
-        GG82563_REG(193, 20) /* Power Management Control */
-#define GG82563_PHY_RATE_ADAPT_CTRL     \
-        GG82563_REG(193, 25) /* Rate Adaptation Control */
-
-/* Page 194 - KMRN Registers */
-#define GG82563_PHY_KMRN_FIFO_CTRL_STAT \
-        GG82563_REG(194, 16) /* FIFO's Control/Status */
-#define GG82563_PHY_KMRN_CTRL           \
-        GG82563_REG(194, 17) /* Control */
-#define GG82563_PHY_INBAND_CTRL         \
-        GG82563_REG(194, 18) /* Inband Control */
-#define GG82563_PHY_KMRN_DIAGNOSTIC     \
-        GG82563_REG(194, 19) /* Diagnostic */
-#define GG82563_PHY_ACK_TIMEOUTS        \
-        GG82563_REG(194, 20) /* Acknowledge Timeouts */
-#define GG82563_PHY_ADV_ABILITY         \
-        GG82563_REG(194, 21) /* Advertised Ability */
-#define GG82563_PHY_LINK_PARTNER_ADV_ABILITY \
-        GG82563_REG(194, 23) /* Link Partner Advertised Ability */
-#define GG82563_PHY_ADV_NEXT_PAGE       \
-        GG82563_REG(194, 24) /* Advertised Next Page */
-#define GG82563_PHY_LINK_PARTNER_ADV_NEXT_PAGE \
-        GG82563_REG(194, 25) /* Link Partner Advertised Next page */
-#define GG82563_PHY_KMRN_MISC           \
-        GG82563_REG(194, 26) /* Misc. */
-
-/* MDI Control */
-#define E1000_MDIC_DATA_MASK 0x0000FFFF
-#define E1000_MDIC_REG_MASK  0x001F0000
-#define E1000_MDIC_REG_SHIFT 16
-#define E1000_MDIC_PHY_MASK  0x03E00000
-#define E1000_MDIC_PHY_SHIFT 21
-#define E1000_MDIC_OP_WRITE  0x04000000
-#define E1000_MDIC_OP_READ   0x08000000
-#define E1000_MDIC_READY     0x10000000
-#define E1000_MDIC_INT_EN    0x20000000
-#define E1000_MDIC_ERROR     0x40000000
-
-/* SerDes Control */
-#define E1000_GEN_CTL_READY             0x80000000
-#define E1000_GEN_CTL_ADDRESS_SHIFT     8
-#define E1000_GEN_POLL_TIMEOUT          640
-
-/* LinkSec register fields */
-#define E1000_LSECTXCAP_SUM_MASK        0x00FF0000
-#define E1000_LSECTXCAP_SUM_SHIFT       16
-#define E1000_LSECRXCAP_SUM_MASK        0x00FF0000
-#define E1000_LSECRXCAP_SUM_SHIFT       16
-
-#define E1000_LSECTXCTRL_EN_MASK        0x00000003
-#define E1000_LSECTXCTRL_DISABLE        0x0
-#define E1000_LSECTXCTRL_AUTH           0x1
-#define E1000_LSECTXCTRL_AUTH_ENCRYPT   0x2
-#define E1000_LSECTXCTRL_AISCI          0x00000020
-#define E1000_LSECTXCTRL_PNTHRSH_MASK   0xFFFFFF00
-#define E1000_LSECTXCTRL_RSV_MASK       0x000000D8
-
-#define E1000_LSECRXCTRL_EN_MASK        0x0000000C
-#define E1000_LSECRXCTRL_EN_SHIFT       2
-#define E1000_LSECRXCTRL_DISABLE        0x0
-#define E1000_LSECRXCTRL_CHECK          0x1
-#define E1000_LSECRXCTRL_STRICT         0x2
-#define E1000_LSECRXCTRL_DROP           0x3
-#define E1000_LSECRXCTRL_PLSH           0x00000040
-#define E1000_LSECRXCTRL_RP             0x00000080
-#define E1000_LSECRXCTRL_RSV_MASK       0xFFFFFF33
-
-
-
-#endif /* _IGB_DEFINES_H_ */
diff --git a/src/drivers/net/igb/igb_hw.h b/src/drivers/net/igb/igb_hw.h
deleted file mode 100644 (file)
index 65a04f2..0000000
+++ /dev/null
@@ -1,697 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#ifndef _IGB_HW_H_
-#define _IGB_HW_H_
-
-#include "igb_osdep.h"
-#include "igb_regs.h"
-#include "igb_defines.h"
-
-struct e1000_hw;
-
-#define E1000_DEV_ID_82576                    0x10C9
-#define E1000_DEV_ID_82576_FIBER              0x10E6
-#define E1000_DEV_ID_82576_SERDES             0x10E7
-#define E1000_DEV_ID_82576_QUAD_COPPER        0x10E8
-#define E1000_DEV_ID_82576_NS                 0x150A
-#define E1000_DEV_ID_82576_NS_SERDES          0x1518
-#define E1000_DEV_ID_82576_SERDES_QUAD        0x150D
-#define E1000_DEV_ID_82575EB_COPPER           0x10A7
-#define E1000_DEV_ID_82575EB_FIBER_SERDES     0x10A9
-#define E1000_DEV_ID_82575GB_QUAD_COPPER      0x10D6
-#define E1000_REVISION_0 0
-#define E1000_REVISION_1 1
-#define E1000_REVISION_2 2
-#define E1000_REVISION_3 3
-#define E1000_REVISION_4 4
-
-#define E1000_FUNC_0     0
-#define E1000_FUNC_1     1
-
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN0   0
-#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1   3
-
-enum e1000_mac_type {
-       e1000_undefined = 0,
-       e1000_82575,
-       e1000_82576,
-       e1000_num_macs  /* List is 1-based, so subtract 1 for true count. */
-};
-
-enum e1000_media_type {
-       e1000_media_type_unknown = 0,
-       e1000_media_type_copper = 1,
-       e1000_media_type_fiber = 2,
-       e1000_media_type_internal_serdes = 3,
-       e1000_num_media_types
-};
-
-enum e1000_nvm_type {
-       e1000_nvm_unknown = 0,
-       e1000_nvm_none,
-       e1000_nvm_eeprom_spi,
-       e1000_nvm_flash_hw,
-       e1000_nvm_flash_sw
-};
-
-enum e1000_nvm_override {
-       e1000_nvm_override_none = 0,
-       e1000_nvm_override_spi_small,
-       e1000_nvm_override_spi_large,
-};
-
-enum e1000_phy_type {
-       e1000_phy_unknown = 0,
-       e1000_phy_none,
-       e1000_phy_m88,
-       e1000_phy_igp,
-       e1000_phy_igp_2,
-       e1000_phy_gg82563,
-       e1000_phy_igp_3,
-       e1000_phy_ife,
-       e1000_phy_vf,
-};
-
-enum e1000_bus_type {
-       e1000_bus_type_unknown = 0,
-       e1000_bus_type_pci,
-       e1000_bus_type_pcix,
-       e1000_bus_type_pci_express,
-       e1000_bus_type_reserved
-};
-
-enum e1000_bus_speed {
-       e1000_bus_speed_unknown = 0,
-       e1000_bus_speed_33,
-       e1000_bus_speed_66,
-       e1000_bus_speed_100,
-       e1000_bus_speed_120,
-       e1000_bus_speed_133,
-       e1000_bus_speed_2500,
-       e1000_bus_speed_5000,
-       e1000_bus_speed_reserved
-};
-
-enum e1000_bus_width {
-       e1000_bus_width_unknown = 0,
-       e1000_bus_width_pcie_x1,
-       e1000_bus_width_pcie_x2,
-       e1000_bus_width_pcie_x4 = 4,
-       e1000_bus_width_pcie_x8 = 8,
-       e1000_bus_width_32,
-       e1000_bus_width_64,
-       e1000_bus_width_reserved
-};
-
-enum e1000_1000t_rx_status {
-       e1000_1000t_rx_status_not_ok = 0,
-       e1000_1000t_rx_status_ok,
-       e1000_1000t_rx_status_undefined = 0xFF
-};
-
-enum e1000_rev_polarity {
-       e1000_rev_polarity_normal = 0,
-       e1000_rev_polarity_reversed,
-       e1000_rev_polarity_undefined = 0xFF
-};
-
-enum e1000_fc_mode {
-       e1000_fc_none = 0,
-       e1000_fc_rx_pause,
-       e1000_fc_tx_pause,
-       e1000_fc_full,
-       e1000_fc_default = 0xFF
-};
-
-enum e1000_ms_type {
-       e1000_ms_hw_default = 0,
-       e1000_ms_force_master,
-       e1000_ms_force_slave,
-       e1000_ms_auto
-};
-
-enum e1000_smart_speed {
-       e1000_smart_speed_default = 0,
-       e1000_smart_speed_on,
-       e1000_smart_speed_off
-};
-
-enum e1000_serdes_link_state {
-       e1000_serdes_link_down = 0,
-       e1000_serdes_link_autoneg_progress,
-       e1000_serdes_link_autoneg_complete,
-       e1000_serdes_link_forced_up
-};
-
-/* Receive Descriptor */
-struct e1000_rx_desc {
-       __le64 buffer_addr; /* Address of the descriptor's data buffer */
-       __le16 length;      /* Length of data DMAed into data buffer */
-       __le16 csum;        /* Packet checksum */
-       u8  status;         /* Descriptor status */
-       u8  errors;         /* Descriptor Errors */
-       __le16 special;
-};
-
-/* Receive Descriptor - Extended */
-union e1000_rx_desc_extended {
-       struct {
-               __le64 buffer_addr;
-               __le64 reserved;
-       } read;
-       struct {
-               struct {
-                       __le32 mrq;           /* Multiple Rx Queues */
-                       union {
-                               __le32 rss;         /* RSS Hash */
-                               struct {
-                                       __le16 ip_id;  /* IP id */
-                                       __le16 csum;   /* Packet Checksum */
-                               } csum_ip;
-                       } hi_dword;
-               } lower;
-               struct {
-                       __le32 status_error;  /* ext status/error */
-                       __le16 length;
-                       __le16 vlan;          /* VLAN tag */
-               } upper;
-       } wb;  /* writeback */
-};
-
-#define MAX_PS_BUFFERS 4
-/* Receive Descriptor - Packet Split */
-union e1000_rx_desc_packet_split {
-       struct {
-               /* one buffer for protocol header(s), three data buffers */
-               __le64 buffer_addr[MAX_PS_BUFFERS];
-       } read;
-       struct {
-               struct {
-                       __le32 mrq;           /* Multiple Rx Queues */
-                       union {
-                               __le32 rss;           /* RSS Hash */
-                               struct {
-                                       __le16 ip_id;    /* IP id */
-                                       __le16 csum;     /* Packet Checksum */
-                               } csum_ip;
-                       } hi_dword;
-               } lower;
-               struct {
-                       __le32 status_error;  /* ext status/error */
-                       __le16 length0;       /* length of buffer 0 */
-                       __le16 vlan;          /* VLAN tag */
-               } middle;
-               struct {
-                       __le16 header_status;
-                       __le16 length[3];     /* length of buffers 1-3 */
-               } upper;
-               __le64 reserved;
-       } wb; /* writeback */
-};
-
-/* Transmit Descriptor */
-struct e1000_tx_desc {
-       __le64 buffer_addr;   /* Address of the descriptor's data buffer */
-       union {
-               __le32 data;
-               struct {
-                       __le16 length;    /* Data buffer length */
-                       u8 cso;           /* Checksum offset */
-                       u8 cmd;           /* Descriptor control */
-               } flags;
-       } lower;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;        /* Descriptor status */
-                       u8 css;           /* Checksum start */
-                       __le16 special;
-               } fields;
-       } upper;
-};
-
-/* Offload Context Descriptor */
-struct e1000_context_desc {
-       union {
-               __le32 ip_config;
-               struct {
-                       u8 ipcss;         /* IP checksum start */
-                       u8 ipcso;         /* IP checksum offset */
-                       __le16 ipcse;     /* IP checksum end */
-               } ip_fields;
-       } lower_setup;
-       union {
-               __le32 tcp_config;
-               struct {
-                       u8 tucss;         /* TCP checksum start */
-                       u8 tucso;         /* TCP checksum offset */
-                       __le16 tucse;     /* TCP checksum end */
-               } tcp_fields;
-       } upper_setup;
-       __le32 cmd_and_length;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;        /* Descriptor status */
-                       u8 hdr_len;       /* Header length */
-                       __le16 mss;       /* Maximum segment size */
-               } fields;
-       } tcp_seg_setup;
-};
-
-/* Offload data descriptor */
-struct e1000_data_desc {
-       __le64 buffer_addr;   /* Address of the descriptor's buffer address */
-       union {
-               __le32 data;
-               struct {
-                       __le16 length;    /* Data buffer length */
-                       u8 typ_len_ext;
-                       u8 cmd;
-               } flags;
-       } lower;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;        /* Descriptor status */
-                       u8 popts;         /* Packet Options */
-                       __le16 special;
-               } fields;
-       } upper;
-};
-
-/* Statistics counters collected by the MAC */
-struct e1000_hw_stats {
-       u64 crcerrs;
-       u64 algnerrc;
-       u64 symerrs;
-       u64 rxerrc;
-       u64 mpc;
-       u64 scc;
-       u64 ecol;
-       u64 mcc;
-       u64 latecol;
-       u64 colc;
-       u64 dc;
-       u64 tncrs;
-       u64 sec;
-       u64 cexterr;
-       u64 rlec;
-       u64 xonrxc;
-       u64 xontxc;
-       u64 xoffrxc;
-       u64 xofftxc;
-       u64 fcruc;
-       u64 prc64;
-       u64 prc127;
-       u64 prc255;
-       u64 prc511;
-       u64 prc1023;
-       u64 prc1522;
-       u64 gprc;
-       u64 bprc;
-       u64 mprc;
-       u64 gptc;
-       u64 gorc;
-       u64 gotc;
-       u64 rnbc;
-       u64 ruc;
-       u64 rfc;
-       u64 roc;
-       u64 rjc;
-       u64 mgprc;
-       u64 mgpdc;
-       u64 mgptc;
-       u64 tor;
-       u64 tot;
-       u64 tpr;
-       u64 tpt;
-       u64 ptc64;
-       u64 ptc127;
-       u64 ptc255;
-       u64 ptc511;
-       u64 ptc1023;
-       u64 ptc1522;
-       u64 mptc;
-       u64 bptc;
-       u64 tsctc;
-       u64 tsctfc;
-       u64 iac;
-       u64 icrxptc;
-       u64 icrxatc;
-       u64 ictxptc;
-       u64 ictxatc;
-       u64 ictxqec;
-       u64 ictxqmtc;
-       u64 icrxdmtc;
-       u64 icrxoc;
-       u64 cbtmpc;
-       u64 htdpmc;
-       u64 cbrdpc;
-       u64 cbrmpc;
-       u64 rpthc;
-       u64 hgptc;
-       u64 htcbdpc;
-       u64 hgorc;
-       u64 hgotc;
-       u64 lenerrs;
-       u64 scvpc;
-       u64 hrmpc;
-       u64 doosync;
-};
-
-
-struct e1000_phy_stats {
-       u32 idle_errors;
-       u32 receive_errors;
-};
-
-struct e1000_host_mng_dhcp_cookie {
-       u32 signature;
-       u8  status;
-       u8  reserved0;
-       u16 vlan_id;
-       u32 reserved1;
-       u16 reserved2;
-       u8  reserved3;
-       u8  checksum;
-};
-
-/* Host Interface "Rev 1" */
-struct e1000_host_command_header {
-       u8 command_id;
-       u8 command_length;
-       u8 command_options;
-       u8 checksum;
-};
-
-#define E1000_HI_MAX_DATA_LENGTH     252
-struct e1000_host_command_info {
-       struct e1000_host_command_header command_header;
-       u8 command_data[E1000_HI_MAX_DATA_LENGTH];
-};
-
-/* Host Interface "Rev 2" */
-struct e1000_host_mng_command_header {
-       u8  command_id;
-       u8  checksum;
-       u16 reserved1;
-       u16 reserved2;
-       u16 command_length;
-};
-
-#define E1000_HI_MAX_MNG_DATA_LENGTH 0x6F8
-struct e1000_host_mng_command_info {
-       struct e1000_host_mng_command_header command_header;
-       u8 command_data[E1000_HI_MAX_MNG_DATA_LENGTH];
-};
-
-#include "igb_mac.h"
-#include "igb_phy.h"
-#include "igb_nvm.h"
-#include "igb_manage.h"
-
-struct e1000_mac_operations {
-       /* Function pointers for the MAC. */
-       s32  (*init_params)(struct e1000_hw *);
-       s32  (*id_led_init)(struct e1000_hw *);
-       s32  (*blink_led)(struct e1000_hw *);
-       s32  (*check_for_link)(struct e1000_hw *);
-       bool (*check_mng_mode)(struct e1000_hw *hw);
-       s32  (*cleanup_led)(struct e1000_hw *);
-       void (*clear_hw_cntrs)(struct e1000_hw *);
-       void (*clear_vfta)(struct e1000_hw *);
-       s32  (*get_bus_info)(struct e1000_hw *);
-       void (*set_lan_id)(struct e1000_hw *);
-       s32  (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *);
-       s32  (*led_on)(struct e1000_hw *);
-       s32  (*led_off)(struct e1000_hw *);
-       void (*update_mc_addr_list)(struct e1000_hw *, u8 *, u32);
-       s32  (*reset_hw)(struct e1000_hw *);
-       s32  (*init_hw)(struct e1000_hw *);
-       void (*shutdown_serdes)(struct e1000_hw *);
-       s32  (*setup_link)(struct e1000_hw *);
-       s32  (*setup_physical_interface)(struct e1000_hw *);
-       s32  (*setup_led)(struct e1000_hw *);
-       void (*write_vfta)(struct e1000_hw *, u32, u32);
-       void (*mta_set)(struct e1000_hw *, u32);
-       void (*config_collision_dist)(struct e1000_hw *);
-       void (*rar_set)(struct e1000_hw *, u8*, u32);
-       s32  (*read_mac_addr)(struct e1000_hw *);
-       s32  (*validate_mdi_setting)(struct e1000_hw *);
-       s32  (*mng_host_if_write)(struct e1000_hw *, u8*, u16, u16, u8*);
-       s32  (*mng_write_cmd_header)(struct e1000_hw *hw,
-                      struct e1000_host_mng_command_header*);
-       s32  (*mng_enable_host_if)(struct e1000_hw *);
-       s32  (*wait_autoneg)(struct e1000_hw *);
-};
-
-struct e1000_phy_operations {
-       s32  (*init_params)(struct e1000_hw *);
-       s32  (*acquire)(struct e1000_hw *);
-       s32  (*check_polarity)(struct e1000_hw *);
-       s32  (*check_reset_block)(struct e1000_hw *);
-       s32  (*commit)(struct e1000_hw *);
-#if 0
-       s32  (*force_speed_duplex)(struct e1000_hw *);
-#endif
-       s32  (*get_cfg_done)(struct e1000_hw *hw);
-#if 0
-       s32  (*get_cable_length)(struct e1000_hw *);
-#endif
-       s32  (*get_info)(struct e1000_hw *);
-       s32  (*read_reg)(struct e1000_hw *, u32, u16 *);
-       s32  (*read_reg_locked)(struct e1000_hw *, u32, u16 *);
-       void (*release)(struct e1000_hw *);
-       s32  (*reset)(struct e1000_hw *);
-       s32  (*set_d0_lplu_state)(struct e1000_hw *, bool);
-       s32  (*set_d3_lplu_state)(struct e1000_hw *, bool);
-       s32  (*write_reg)(struct e1000_hw *, u32, u16);
-       s32  (*write_reg_locked)(struct e1000_hw *, u32, u16);
-       void (*power_up)(struct e1000_hw *);
-       void (*power_down)(struct e1000_hw *);
-};
-
-struct e1000_nvm_operations {
-       s32  (*init_params)(struct e1000_hw *);
-       s32  (*acquire)(struct e1000_hw *);
-       s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
-       void (*release)(struct e1000_hw *);
-       void (*reload)(struct e1000_hw *);
-       s32  (*update)(struct e1000_hw *);
-       s32  (*valid_led_default)(struct e1000_hw *, u16 *);
-       s32  (*validate)(struct e1000_hw *);
-       s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
-};
-
-struct e1000_mac_info {
-       struct e1000_mac_operations ops;
-       u8 addr[6];
-       u8 perm_addr[6];
-
-       enum e1000_mac_type type;
-
-       u32 collision_delta;
-       u32 ledctl_default;
-       u32 ledctl_mode1;
-       u32 ledctl_mode2;
-       u32 mc_filter_type;
-       u32 tx_packet_delta;
-       u32 txcw;
-
-       u16 current_ifs_val;
-       u16 ifs_max_val;
-       u16 ifs_min_val;
-       u16 ifs_ratio;
-       u16 ifs_step_size;
-       u16 mta_reg_count;
-       u16 uta_reg_count;
-
-       /* Maximum size of the MTA register table in all supported adapters */
-       #define MAX_MTA_REG 128
-       u32 mta_shadow[MAX_MTA_REG];
-       u16 rar_entry_count;
-
-       u8  forced_speed_duplex;
-
-       bool adaptive_ifs;
-       bool arc_subsystem_valid;
-       bool asf_firmware_present;
-       bool autoneg;
-       bool autoneg_failed;
-       bool get_link_status;
-       bool in_ifs_mode;
-       enum e1000_serdes_link_state serdes_link_state;
-       bool serdes_has_link;
-       bool tx_pkt_filtering;
-};
-
-struct e1000_phy_info {
-       struct e1000_phy_operations ops;
-       enum e1000_phy_type type;
-
-       enum e1000_1000t_rx_status local_rx;
-       enum e1000_1000t_rx_status remote_rx;
-       enum e1000_ms_type ms_type;
-       enum e1000_ms_type original_ms_type;
-       enum e1000_rev_polarity cable_polarity;
-       enum e1000_smart_speed smart_speed;
-
-       u32 addr;
-       u32 id;
-       u32 reset_delay_us; /* in usec */
-       u32 revision;
-
-       enum e1000_media_type media_type;
-
-       u16 autoneg_advertised;
-       u16 autoneg_mask;
-       u16 cable_length;
-       u16 max_cable_length;
-       u16 min_cable_length;
-
-       u8 mdix;
-
-       bool disable_polarity_correction;
-       bool is_mdix;
-       bool polarity_correction;
-       bool reset_disable;
-       bool speed_downgraded;
-       bool autoneg_wait_to_complete;
-};
-
-struct e1000_nvm_info {
-       struct e1000_nvm_operations ops;
-       enum e1000_nvm_type type;
-       enum e1000_nvm_override override;
-
-       u32 flash_bank_size;
-       u32 flash_base_addr;
-
-       u16 word_size;
-       u16 delay_usec;
-       u16 address_bits;
-       u16 opcode_bits;
-       u16 page_size;
-};
-
-struct e1000_bus_info {
-       enum e1000_bus_type type;
-       enum e1000_bus_speed speed;
-       enum e1000_bus_width width;
-
-       u16 func;
-       u16 pci_cmd_word;
-};
-
-struct e1000_fc_info {
-       u32 high_water;          /* Flow control high-water mark */
-       u32 low_water;           /* Flow control low-water mark */
-       u16 pause_time;          /* Flow control pause timer */
-       bool send_xon;           /* Flow control send XON */
-       bool strict_ieee;        /* Strict IEEE mode */
-       enum e1000_fc_mode current_mode; /* FC mode in effect */
-       enum e1000_fc_mode requested_mode; /* FC mode requested by caller */
-};
-
-struct e1000_mbx_operations {
-       s32 (*init_params)(struct e1000_hw *hw);
-       s32 (*read)(struct e1000_hw *, u32 *, u16,  u16);
-       s32 (*write)(struct e1000_hw *, u32 *, u16, u16);
-       s32 (*read_posted)(struct e1000_hw *, u32 *, u16,  u16);
-       s32 (*write_posted)(struct e1000_hw *, u32 *, u16, u16);
-       s32 (*check_for_msg)(struct e1000_hw *, u16);
-       s32 (*check_for_ack)(struct e1000_hw *, u16);
-       s32 (*check_for_rst)(struct e1000_hw *, u16);
-};
-
-struct e1000_mbx_stats {
-       u32 msgs_tx;
-       u32 msgs_rx;
-
-       u32 acks;
-       u32 reqs;
-       u32 rsts;
-};
-
-struct e1000_mbx_info {
-       struct e1000_mbx_operations ops;
-       struct e1000_mbx_stats stats;
-       u32 timeout;
-       u32 usec_delay;
-       u16 size;
-};
-
-struct e1000_dev_spec_82575 {
-       bool sgmii_active;
-       bool global_device_reset;
-};
-
-struct e1000_dev_spec_vf {
-       u32     vf_number;
-       u32     v2p_mailbox;
-};
-
-
-struct e1000_hw {
-       void *back;
-
-       u8 __iomem *hw_addr;
-       u8 __iomem *flash_address;
-       unsigned long io_base;
-
-       struct e1000_mac_info  mac;
-       struct e1000_fc_info   fc;
-       struct e1000_phy_info  phy;
-       struct e1000_nvm_info  nvm;
-       struct e1000_bus_info  bus;
-       struct e1000_mbx_info mbx;
-       struct e1000_host_mng_dhcp_cookie mng_cookie;
-
-       union {
-               struct e1000_dev_spec_82575     _82575;
-               struct e1000_dev_spec_vf        vf;
-       } dev_spec;
-
-       u16 device_id;
-       u16 subsystem_vendor_id;
-       u16 subsystem_device_id;
-       u16 vendor_id;
-
-       u8  revision_id;
-};
-
-#include "igb_82575.h"
-
-/* These functions must be implemented by drivers */
-s32  igb_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
-s32  igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
-
-#endif /* _IGB_HW_H_ */
diff --git a/src/drivers/net/igb/igb_mac.c b/src/drivers/net/igb/igb_mac.c
deleted file mode 100644 (file)
index 237c6c7..0000000
+++ /dev/null
@@ -1,1991 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#include "igb.h"
-
-static s32 igb_set_default_fc_generic(struct e1000_hw *hw);
-static s32 igb_commit_fc_settings_generic(struct e1000_hw *hw);
-static s32 igb_poll_fiber_serdes_link_generic(struct e1000_hw *hw);
-static s32 igb_validate_mdi_setting_generic(struct e1000_hw *hw);
-static void igb_set_lan_id_multi_port_pcie(struct e1000_hw *hw);
-
-/**
- *  igb_init_mac_ops_generic - Initialize MAC function pointers
- *  @hw: pointer to the HW structure
- *
- *  Setups up the function pointers to no-op functions
- **/
-void igb_init_mac_ops_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       DEBUGFUNC("igb_init_mac_ops_generic");
-
-       /* General Setup */
-       mac->ops.set_lan_id = igb_set_lan_id_multi_port_pcie;
-       mac->ops.read_mac_addr = igb_read_mac_addr_generic;
-       mac->ops.config_collision_dist = igb_config_collision_dist_generic;
-       /* LINK */
-       mac->ops.wait_autoneg = igb_wait_autoneg_generic;
-       /* Management */
-#if 0
-       mac->ops.mng_host_if_write = igb_mng_host_if_write_generic;
-       mac->ops.mng_write_cmd_header = igb_mng_write_cmd_header_generic;
-       mac->ops.mng_enable_host_if = igb_mng_enable_host_if_generic;
-#endif
-       /* VLAN, MC, etc. */
-       mac->ops.rar_set = igb_rar_set_generic;
-       mac->ops.validate_mdi_setting = igb_validate_mdi_setting_generic;
-}
-
-/**
- *  igb_get_bus_info_pcie_generic - Get PCIe bus information
- *  @hw: pointer to the HW structure
- *
- *  Determines and stores the system bus information for a particular
- *  network interface.  The following bus information is determined and stored:
- *  bus speed, bus width, type (PCIe), and PCIe function.
- **/
-s32 igb_get_bus_info_pcie_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_bus_info *bus = &hw->bus;
-
-       s32 ret_val;
-       u16 pcie_link_status;
-
-       DEBUGFUNC("igb_get_bus_info_pcie_generic");
-
-       bus->type = e1000_bus_type_pci_express;
-       bus->speed = e1000_bus_speed_2500;
-
-       ret_val = igb_read_pcie_cap_reg(hw,
-                                         PCIE_LINK_STATUS,
-                                         &pcie_link_status);
-       if (ret_val)
-               bus->width = e1000_bus_width_unknown;
-       else
-               bus->width = (enum e1000_bus_width)((pcie_link_status &
-                                               PCIE_LINK_WIDTH_MASK) >>
-                                              PCIE_LINK_WIDTH_SHIFT);
-
-       mac->ops.set_lan_id(hw);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_set_lan_id_multi_port_pcie - Set LAN id for PCIe multiple port devices
- *
- *  @hw: pointer to the HW structure
- *
- *  Determines the LAN function id by reading memory-mapped registers
- *  and swaps the port value if requested.
- **/
-static void igb_set_lan_id_multi_port_pcie(struct e1000_hw *hw)
-{
-       struct e1000_bus_info *bus = &hw->bus;
-       u32 reg;
-
-       /*
-        * The status register reports the correct function number
-        * for the device regardless of function swap state.
-        */
-       reg = E1000_READ_REG(hw, E1000_STATUS);
-       bus->func = (reg & E1000_STATUS_FUNC_MASK) >> E1000_STATUS_FUNC_SHIFT;
-}
-
-/**
- *  igb_set_lan_id_single_port - Set LAN id for a single port device
- *  @hw: pointer to the HW structure
- *
- *  Sets the LAN function id to zero for a single port device.
- **/
-void igb_set_lan_id_single_port(struct e1000_hw *hw)
-{
-       struct e1000_bus_info *bus = &hw->bus;
-
-       bus->func = 0;
-}
-
-/**
- *  igb_clear_vfta_generic - Clear VLAN filter table
- *  @hw: pointer to the HW structure
- *
- *  Clears the register array which contains the VLAN filter table by
- *  setting all the values to 0.
- **/
-void igb_clear_vfta_generic(struct e1000_hw *hw)
-{
-       u32 offset;
-
-       DEBUGFUNC("igb_clear_vfta_generic");
-
-       for (offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++) {
-                E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, offset, 0);
-               E1000_WRITE_FLUSH(hw);
-       }
-}
-
-/**
- *  igb_write_vfta_generic - Write value to VLAN filter table
- *  @hw: pointer to the HW structure
- *  @offset: register offset in VLAN filter table
- *  @value: register value written to VLAN filter table
- *
- *  Writes value at the given offset in the register array which stores
- *  the VLAN filter table.
- **/
-void igb_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value)
-{
-       DEBUGFUNC("igb_write_vfta_generic");
-
-       E1000_WRITE_REG_ARRAY(hw, E1000_VFTA, offset, value);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- *  igb_init_rx_addrs_generic - Initialize receive address's
- *  @hw: pointer to the HW structure
- *  @rar_count: receive address registers
- *
- *  Setups the receive address registers by setting the base receive address
- *  register to the devices MAC address and clearing all the other receive
- *  address registers to 0.
- **/
-void igb_init_rx_addrs_generic(struct e1000_hw *hw, u16 rar_count)
-{
-       u32 i;
-       u8 mac_addr[ETH_ADDR_LEN] = {0};
-
-       DEBUGFUNC("igb_init_rx_addrs_generic");
-
-       /* Setup the receive address */
-       DEBUGOUT("Programming MAC Address into RAR[0]\n");
-
-       hw->mac.ops.rar_set(hw, hw->mac.addr, 0);
-
-       /* Zero out the other (rar_entry_count - 1) receive addresses */
-       DEBUGOUT1("Clearing RAR[1-%u]\n", rar_count-1);
-       for (i = 1; i < rar_count; i++)
-               hw->mac.ops.rar_set(hw, mac_addr, i);
-}
-
-/**
- *  igb_check_alt_mac_addr_generic - Check for alternate MAC addr
- *  @hw: pointer to the HW structure
- *
- *  Checks the nvm for an alternate MAC address.  An alternate MAC address
- *  can be setup by pre-boot software and must be treated like a permanent
- *  address and must override the actual permanent MAC address. If an
- *  alternate MAC address is found it is programmed into RAR0, replacing
- *  the permanent address that was installed into RAR0 by the Si on reset.
- *  This function will return SUCCESS unless it encounters an error while
- *  reading the EEPROM.
- **/
-s32 igb_check_alt_mac_addr_generic(struct e1000_hw *hw)
-{
-       u32 i;
-       s32 ret_val = E1000_SUCCESS;
-       u16 offset, nvm_alt_mac_addr_offset, nvm_data;
-       u8 alt_mac_addr[ETH_ADDR_LEN];
-
-       DEBUGFUNC("igb_check_alt_mac_addr_generic");
-
-       ret_val = hw->nvm.ops.read(hw, NVM_ALT_MAC_ADDR_PTR, 1,
-                                &nvm_alt_mac_addr_offset);
-       if (ret_val) {
-               DEBUGOUT("NVM Read Error\n");
-               goto out;
-       }
-
-       if (nvm_alt_mac_addr_offset == 0xFFFF) {
-               /* There is no Alternate MAC Address */
-               goto out;
-       }
-
-       if (hw->bus.func == E1000_FUNC_1)
-               nvm_alt_mac_addr_offset += E1000_ALT_MAC_ADDRESS_OFFSET_LAN1;
-       for (i = 0; i < ETH_ADDR_LEN; i += 2) {
-               offset = nvm_alt_mac_addr_offset + (i >> 1);
-               ret_val = hw->nvm.ops.read(hw, offset, 1, &nvm_data);
-               if (ret_val) {
-                       DEBUGOUT("NVM Read Error\n");
-                       goto out;
-               }
-
-               alt_mac_addr[i] = (u8)(nvm_data & 0xFF);
-               alt_mac_addr[i + 1] = (u8)(nvm_data >> 8);
-       }
-
-       /* if multicast bit is set, the alternate address will not be used */
-       if (alt_mac_addr[0] & 0x01) {
-               DEBUGOUT("Ignoring Alternate Mac Address with MC bit set\n");
-               goto out;
-       }
-
-       /*
-        * We have a valid alternate MAC address, and we want to treat it the
-        * same as the normal permanent MAC address stored by the HW into the
-        * RAR. Do this by mapping this address into RAR0.
-        */
-       hw->mac.ops.rar_set(hw, alt_mac_addr, 0);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_rar_set_generic - Set receive address register
- *  @hw: pointer to the HW structure
- *  @addr: pointer to the receive address
- *  @index: receive address array register
- *
- *  Sets the receive address array register at index to the address passed
- *  in by addr.
- **/
-void igb_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index)
-{
-       u32 rar_low, rar_high;
-
-       DEBUGFUNC("igb_rar_set_generic");
-
-       /*
-        * HW expects these in little endian so we reverse the byte order
-        * from network order (big endian) to little endian
-        */
-       rar_low = ((u32) addr[0] |
-                  ((u32) addr[1] << 8) |
-                  ((u32) addr[2] << 16) | ((u32) addr[3] << 24));
-
-       rar_high = ((u32) addr[4] | ((u32) addr[5] << 8));
-
-       /* If MAC address zero, no need to set the AV bit */
-       if (rar_low || rar_high)
-               rar_high |= E1000_RAH_AV;
-
-       /*
-        * Some bridges will combine consecutive 32-bit writes into
-        * a single burst write, which will malfunction on some parts.
-        * The flushes avoid this.
-        */
-       E1000_WRITE_REG(hw, E1000_RAL(index), rar_low);
-       E1000_WRITE_FLUSH(hw);
-       E1000_WRITE_REG(hw, E1000_RAH(index), rar_high);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- *  igb_mta_set_generic - Set multicast filter table address
- *  @hw: pointer to the HW structure
- *  @hash_value: determines the MTA register and bit to set
- *
- *  The multicast table address is a register array of 32-bit registers.
- *  The hash_value is used to determine what register the bit is in, the
- *  current value is read, the new bit is OR'd in and the new value is
- *  written back into the register.
- **/
-void igb_mta_set_generic(struct e1000_hw *hw, u32 hash_value)
-{
-       u32 hash_bit, hash_reg, mta;
-
-       DEBUGFUNC("igb_mta_set_generic");
-       /*
-        * The MTA is a register array of 32-bit registers. It is
-        * treated like an array of (32*mta_reg_count) bits.  We want to
-        * set bit BitArray[hash_value]. So we figure out what register
-        * the bit is in, read it, OR in the new bit, then write
-        * back the new value.  The (hw->mac.mta_reg_count - 1) serves as a
-        * mask to bits 31:5 of the hash value which gives us the
-        * register we're modifying.  The hash bit within that register
-        * is determined by the lower 5 bits of the hash value.
-        */
-       hash_reg = (hash_value >> 5) & (hw->mac.mta_reg_count - 1);
-       hash_bit = hash_value & 0x1F;
-
-       mta = E1000_READ_REG_ARRAY(hw, E1000_MTA, hash_reg);
-
-       mta |= (1 << hash_bit);
-
-       E1000_WRITE_REG_ARRAY(hw, E1000_MTA, hash_reg, mta);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- *  igb_update_mc_addr_list_generic - Update Multicast addresses
- *  @hw: pointer to the HW structure
- *  @mc_addr_list: array of multicast addresses to program
- *  @mc_addr_count: number of multicast addresses to program
- *
- *  Updates entire Multicast Table Array.
- *  The caller must have a packed mc_addr_list of multicast addresses.
- **/
-void igb_update_mc_addr_list_generic(struct e1000_hw *hw,
-                                       u8 *mc_addr_list, u32 mc_addr_count)
-{
-       u32 hash_value, hash_bit, hash_reg;
-       int i;
-
-       DEBUGFUNC("igb_update_mc_addr_list_generic");
-
-       /* clear mta_shadow */
-       memset(&hw->mac.mta_shadow, 0, sizeof(hw->mac.mta_shadow));
-
-       /* update mta_shadow from mc_addr_list */
-       for (i = 0; (u32) i < mc_addr_count; i++) {
-               hash_value = igb_hash_mc_addr_generic(hw, mc_addr_list);
-
-               hash_reg = (hash_value >> 5) & (hw->mac.mta_reg_count - 1);
-               hash_bit = hash_value & 0x1F;
-
-               hw->mac.mta_shadow[hash_reg] |= (1 << hash_bit);
-               mc_addr_list += (ETH_ADDR_LEN);
-       }
-
-       /* replace the entire MTA table */
-       for (i = hw->mac.mta_reg_count - 1; i >= 0; i--)
-               E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, hw->mac.mta_shadow[i]);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- *  igb_hash_mc_addr_generic - Generate a multicast hash value
- *  @hw: pointer to the HW structure
- *  @mc_addr: pointer to a multicast address
- *
- *  Generates a multicast address hash value which is used to determine
- *  the multicast filter table array address and new table value.  See
- *  igb_mta_set_generic()
- **/
-u32 igb_hash_mc_addr_generic(struct e1000_hw *hw, u8 *mc_addr)
-{
-       u32 hash_value, hash_mask;
-       u8 bit_shift = 0;
-
-       DEBUGFUNC("igb_hash_mc_addr_generic");
-
-       /* Register count multiplied by bits per register */
-       hash_mask = (hw->mac.mta_reg_count * 32) - 1;
-
-       /*
-        * For a mc_filter_type of 0, bit_shift is the number of left-shifts
-        * where 0xFF would still fall within the hash mask.
-        */
-       while (hash_mask >> bit_shift != 0xFF)
-               bit_shift++;
-
-       /*
-        * The portion of the address that is used for the hash table
-        * is determined by the mc_filter_type setting.
-        * The algorithm is such that there is a total of 8 bits of shifting.
-        * The bit_shift for a mc_filter_type of 0 represents the number of
-        * left-shifts where the MSB of mc_addr[5] would still fall within
-        * the hash_mask.  Case 0 does this exactly.  Since there are a total
-        * of 8 bits of shifting, then mc_addr[4] will shift right the
-        * remaining number of bits. Thus 8 - bit_shift.  The rest of the
-        * cases are a variation of this algorithm...essentially raising the
-        * number of bits to shift mc_addr[5] left, while still keeping the
-        * 8-bit shifting total.
-        *
-        * For example, given the following Destination MAC Address and an
-        * mta register count of 128 (thus a 4096-bit vector and 0xFFF mask),
-        * we can see that the bit_shift for case 0 is 4.  These are the hash
-        * values resulting from each mc_filter_type...
-        * [0] [1] [2] [3] [4] [5]
-        * 01  AA  00  12  34  56
-        * LSB                 MSB
-        *
-        * case 0: hash_value = ((0x34 >> 4) | (0x56 << 4)) & 0xFFF = 0x563
-        * case 1: hash_value = ((0x34 >> 3) | (0x56 << 5)) & 0xFFF = 0xAC6
-        * case 2: hash_value = ((0x34 >> 2) | (0x56 << 6)) & 0xFFF = 0x163
-        * case 3: hash_value = ((0x34 >> 0) | (0x56 << 8)) & 0xFFF = 0x634
-        */
-       switch (hw->mac.mc_filter_type) {
-       default:
-       case 0:
-               break;
-       case 1:
-               bit_shift += 1;
-               break;
-       case 2:
-               bit_shift += 2;
-               break;
-       case 3:
-               bit_shift += 4;
-               break;
-       }
-
-       hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) |
-                                 (((u16) mc_addr[5]) << bit_shift)));
-
-       return hash_value;
-}
-
-/**
- *  igb_clear_hw_cntrs_base_generic - Clear base hardware counters
- *  @hw: pointer to the HW structure
- *
- *  Clears the base hardware counters by reading the counter registers.
- **/
-void igb_clear_hw_cntrs_base_generic(struct e1000_hw *hw)
-{
-       DEBUGFUNC("igb_clear_hw_cntrs_base_generic");
-
-       E1000_READ_REG(hw, E1000_CRCERRS);
-       E1000_READ_REG(hw, E1000_SYMERRS);
-       E1000_READ_REG(hw, E1000_MPC);
-       E1000_READ_REG(hw, E1000_SCC);
-       E1000_READ_REG(hw, E1000_ECOL);
-       E1000_READ_REG(hw, E1000_MCC);
-       E1000_READ_REG(hw, E1000_LATECOL);
-       E1000_READ_REG(hw, E1000_COLC);
-       E1000_READ_REG(hw, E1000_DC);
-       E1000_READ_REG(hw, E1000_SEC);
-       E1000_READ_REG(hw, E1000_RLEC);
-       E1000_READ_REG(hw, E1000_XONRXC);
-       E1000_READ_REG(hw, E1000_XONTXC);
-       E1000_READ_REG(hw, E1000_XOFFRXC);
-       E1000_READ_REG(hw, E1000_XOFFTXC);
-       E1000_READ_REG(hw, E1000_FCRUC);
-       E1000_READ_REG(hw, E1000_GPRC);
-       E1000_READ_REG(hw, E1000_BPRC);
-       E1000_READ_REG(hw, E1000_MPRC);
-       E1000_READ_REG(hw, E1000_GPTC);
-       E1000_READ_REG(hw, E1000_GORCL);
-       E1000_READ_REG(hw, E1000_GORCH);
-       E1000_READ_REG(hw, E1000_GOTCL);
-       E1000_READ_REG(hw, E1000_GOTCH);
-       E1000_READ_REG(hw, E1000_RNBC);
-       E1000_READ_REG(hw, E1000_RUC);
-       E1000_READ_REG(hw, E1000_RFC);
-       E1000_READ_REG(hw, E1000_ROC);
-       E1000_READ_REG(hw, E1000_RJC);
-       E1000_READ_REG(hw, E1000_TORL);
-       E1000_READ_REG(hw, E1000_TORH);
-       E1000_READ_REG(hw, E1000_TOTL);
-       E1000_READ_REG(hw, E1000_TOTH);
-       E1000_READ_REG(hw, E1000_TPR);
-       E1000_READ_REG(hw, E1000_TPT);
-       E1000_READ_REG(hw, E1000_MPTC);
-       E1000_READ_REG(hw, E1000_BPTC);
-}
-
-/**
- *  igb_check_for_copper_link_generic - Check for link (Copper)
- *  @hw: pointer to the HW structure
- *
- *  Checks to see of the link status of the hardware has changed.  If a
- *  change in link status has been detected, then we read the PHY registers
- *  to get the current speed/duplex if link exists.
- **/
-s32 igb_check_for_copper_link_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val;
-       bool link;
-
-       DEBUGFUNC("igb_check_for_copper_link");
-
-       /*
-        * We only want to go out to the PHY registers to see if Auto-Neg
-        * has completed and/or if our link status has changed.  The
-        * get_link_status flag is set upon receiving a Link Status
-        * Change or Rx Sequence Error interrupt.
-        */
-       if (!mac->get_link_status) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       /*
-        * First we want to see if the MII Status Register reports
-        * link.  If so, then we want to get the current speed/duplex
-        * of the PHY.
-        */
-       ret_val = igb_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link)
-               goto out; /* No link detected */
-
-       mac->get_link_status = false;
-
-       /*
-        * Check if there was DownShift, must be checked
-        * immediately after link-up
-        */
-       igb_check_downshift_generic(hw);
-
-       /*
-        * If we are forcing speed/duplex, then we simply return since
-        * we have already determined whether we have link or not.
-        */
-       if (!mac->autoneg) {
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       /*
-        * Auto-Neg is enabled.  Auto Speed Detection takes care
-        * of MAC speed/duplex configuration.  So we only need to
-        * configure Collision Distance in the MAC.
-        */
-       igb_config_collision_dist_generic(hw);
-
-       /*
-        * Configure Flow Control now that Auto-Neg has completed.
-        * First, we need to restore the desired flow control
-        * settings because we may have had to re-autoneg with a
-        * different link partner.
-        */
-       ret_val = igb_config_fc_after_link_up_generic(hw);
-       if (ret_val) {
-               DEBUGOUT("Error configuring flow control\n");
-        }
-out:
-       return ret_val;
-}
-
-/**
- *  igb_check_for_fiber_link_generic - Check for link (Fiber)
- *  @hw: pointer to the HW structure
- *
- *  Checks for link up on the hardware.  If link is not up and we have
- *  a signal, then we need to force link up.
- **/
-s32 igb_check_for_fiber_link_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 rxcw;
-       u32 ctrl;
-       u32 status;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_check_for_fiber_link_generic");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       status = E1000_READ_REG(hw, E1000_STATUS);
-       rxcw = E1000_READ_REG(hw, E1000_RXCW);
-
-       /*
-        * If we don't have link (auto-negotiation failed or link partner
-        * cannot auto-negotiate), the cable is plugged in (we have signal),
-        * and our link partner is not trying to auto-negotiate with us (we
-        * are receiving idles or data), we need to force link up. We also
-        * need to give auto-negotiation time to complete, in case the cable
-        * was just plugged in. The autoneg_failed flag does this.
-        */
-       /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
-       if ((ctrl & E1000_CTRL_SWDPIN1) && (!(status & E1000_STATUS_LU)) &&
-           (!(rxcw & E1000_RXCW_C))) {
-               if (mac->autoneg_failed == 0) {
-                       mac->autoneg_failed = 1;
-                       goto out;
-               }
-               DEBUGOUT("NOT RXing /C/, disable AutoNeg and force link.\n");
-
-               /* Disable auto-negotiation in the TXCW register */
-               E1000_WRITE_REG(hw, E1000_TXCW, (mac->txcw & ~E1000_TXCW_ANE));
-
-               /* Force link-up and also force full-duplex. */
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FD);
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-               /* Configure Flow Control after forcing link up. */
-               ret_val = igb_config_fc_after_link_up_generic(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error configuring flow control\n");
-                       goto out;
-               }
-       } else if ((ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
-               /*
-                * If we are forcing link and we are receiving /C/ ordered
-                * sets, re-enable auto-negotiation in the TXCW register
-                * and disable forced link in the Device Control register
-                * in an attempt to auto-negotiate with our link partner.
-                */
-               DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\n");
-               E1000_WRITE_REG(hw, E1000_TXCW, mac->txcw);
-               E1000_WRITE_REG(hw, E1000_CTRL, (ctrl & ~E1000_CTRL_SLU));
-
-               mac->serdes_has_link = true;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_check_for_serdes_link_generic - Check for link (Serdes)
- *  @hw: pointer to the HW structure
- *
- *  Checks for link up on the hardware.  If link is not up and we have
- *  a signal, then we need to force link up.
- **/
-s32 igb_check_for_serdes_link_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 rxcw;
-       u32 ctrl;
-       u32 status;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_check_for_serdes_link_generic");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       status = E1000_READ_REG(hw, E1000_STATUS);
-       rxcw = E1000_READ_REG(hw, E1000_RXCW);
-
-       /*
-        * If we don't have link (auto-negotiation failed or link partner
-        * cannot auto-negotiate), and our link partner is not trying to
-        * auto-negotiate with us (we are receiving idles or data),
-        * we need to force link up. We also need to give auto-negotiation
-        * time to complete.
-        */
-       /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
-       if ((!(status & E1000_STATUS_LU)) && (!(rxcw & E1000_RXCW_C))) {
-               if (mac->autoneg_failed == 0) {
-                       mac->autoneg_failed = 1;
-                       goto out;
-               }
-               DEBUGOUT("NOT RXing /C/, disable AutoNeg and force link.\n");
-
-               /* Disable auto-negotiation in the TXCW register */
-               E1000_WRITE_REG(hw, E1000_TXCW, (mac->txcw & ~E1000_TXCW_ANE));
-
-               /* Force link-up and also force full-duplex. */
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FD);
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-               /* Configure Flow Control after forcing link up. */
-               ret_val = igb_config_fc_after_link_up_generic(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error configuring flow control\n");
-                       goto out;
-               }
-       } else if ((ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) {
-               /*
-                * If we are forcing link and we are receiving /C/ ordered
-                * sets, re-enable auto-negotiation in the TXCW register
-                * and disable forced link in the Device Control register
-                * in an attempt to auto-negotiate with our link partner.
-                */
-               DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\n");
-               E1000_WRITE_REG(hw, E1000_TXCW, mac->txcw);
-               E1000_WRITE_REG(hw, E1000_CTRL, (ctrl & ~E1000_CTRL_SLU));
-
-               mac->serdes_has_link = true;
-       } else if (!(E1000_TXCW_ANE & E1000_READ_REG(hw, E1000_TXCW))) {
-               /*
-                * If we force link for non-auto-negotiation switch, check
-                * link status based on MAC synchronization for internal
-                * serdes media type.
-                */
-               /* SYNCH bit and IV bit are sticky. */
-               usec_delay(10);
-               rxcw = E1000_READ_REG(hw, E1000_RXCW);
-               if (rxcw & E1000_RXCW_SYNCH) {
-                       if (!(rxcw & E1000_RXCW_IV)) {
-                               mac->serdes_has_link = true;
-                               DEBUGOUT("SERDES: Link up - forced.\n");
-                       }
-               } else {
-                       mac->serdes_has_link = false;
-                       DEBUGOUT("SERDES: Link down - force failed.\n");
-               }
-       }
-
-       if (E1000_TXCW_ANE & E1000_READ_REG(hw, E1000_TXCW)) {
-               status = E1000_READ_REG(hw, E1000_STATUS);
-               if (status & E1000_STATUS_LU) {
-                       /* SYNCH bit and IV bit are sticky, so reread rxcw. */
-                       usec_delay(10);
-                       rxcw = E1000_READ_REG(hw, E1000_RXCW);
-                       if (rxcw & E1000_RXCW_SYNCH) {
-                               if (!(rxcw & E1000_RXCW_IV)) {
-                                       mac->serdes_has_link = true;
-                                       DEBUGOUT("SERDES: Link up - autoneg "
-                                          "completed sucessfully.\n");
-                               } else {
-                                       mac->serdes_has_link = false;
-                                       DEBUGOUT("SERDES: Link down - invalid"
-                                          "codewords detected in autoneg.\n");
-                               }
-                       } else {
-                               mac->serdes_has_link = false;
-                               DEBUGOUT("SERDES: Link down - no sync.\n");
-                       }
-               } else {
-                       mac->serdes_has_link = false;
-                       DEBUGOUT("SERDES: Link down - autoneg failed\n");
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_setup_link_generic - Setup flow control and link settings
- *  @hw: pointer to the HW structure
- *
- *  Determines which flow control settings to use, then configures flow
- *  control.  Calls the appropriate media-specific link configuration
- *  function.  Assuming the adapter has a valid link partner, a valid link
- *  should be established.  Assumes the hardware has previously been reset
- *  and the transmitter and receiver are not enabled.
- **/
-s32 igb_setup_link_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_setup_link_generic");
-
-       /*
-        * In the case of the phy reset being blocked, we already have a link.
-        * We do not need to set it up again.
-        */
-       if (hw->phy.ops.check_reset_block)
-               if (hw->phy.ops.check_reset_block(hw))
-                       goto out;
-
-       /*
-        * If requested flow control is set to default, set flow control
-        * based on the EEPROM flow control settings.
-        */
-       if (hw->fc.requested_mode == e1000_fc_default) {
-               ret_val = igb_set_default_fc_generic(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       /*
-        * Save off the requested flow control mode for use later.  Depending
-        * on the link partner's capabilities, we may or may not use this mode.
-        */
-       hw->fc.current_mode = hw->fc.requested_mode;
-
-       DEBUGOUT1("After fix-ups FlowControl is now = %x\n",
-               hw->fc.current_mode);
-
-       /* Call the necessary media_type subroutine to configure the link. */
-       ret_val = hw->mac.ops.setup_physical_interface(hw);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Initialize the flow control address, type, and PAUSE timer
-        * registers to their default values.  This is done even if flow
-        * control is disabled, because it does not hurt anything to
-        * initialize these registers.
-        */
-       DEBUGOUT("Initializing the Flow Control address, type and timer regs\n");
-       E1000_WRITE_REG(hw, E1000_FCT, FLOW_CONTROL_TYPE);
-       E1000_WRITE_REG(hw, E1000_FCAH, FLOW_CONTROL_ADDRESS_HIGH);
-       E1000_WRITE_REG(hw, E1000_FCAL, FLOW_CONTROL_ADDRESS_LOW);
-
-       E1000_WRITE_REG(hw, E1000_FCTTV, hw->fc.pause_time);
-
-       ret_val = igb_set_fc_watermarks_generic(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_setup_fiber_serdes_link_generic - Setup link for fiber/serdes
- *  @hw: pointer to the HW structure
- *
- *  Configures collision distance and flow control for fiber and serdes
- *  links.  Upon successful setup, poll for link.
- **/
-s32 igb_setup_fiber_serdes_link_generic(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_setup_fiber_serdes_link_generic");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       /* Take the link out of reset */
-       ctrl &= ~E1000_CTRL_LRST;
-
-       igb_config_collision_dist_generic(hw);
-
-       ret_val = igb_commit_fc_settings_generic(hw);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Since auto-negotiation is enabled, take the link out of reset (the
-        * link will be in reset, because we previously reset the chip). This
-        * will restart auto-negotiation.  If auto-negotiation is successful
-        * then the link-up status bit will be set and the flow control enable
-        * bits (RFCE and TFCE) will be set according to their negotiated value.
-        */
-       DEBUGOUT("Auto-negotiation enabled\n");
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-       E1000_WRITE_FLUSH(hw);
-       msec_delay(1);
-
-       /*
-        * For these adapters, the SW definable pin 1 is set when the optics
-        * detect a signal.  If we have a signal, then poll for a "Link-Up"
-        * indication.
-        */
-       if (hw->phy.media_type == e1000_media_type_internal_serdes ||
-           (E1000_READ_REG(hw, E1000_CTRL) & E1000_CTRL_SWDPIN1)) {
-               ret_val = igb_poll_fiber_serdes_link_generic(hw);
-       } else {
-               DEBUGOUT("No signal detected\n");
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_config_collision_dist_generic - Configure collision distance
- *  @hw: pointer to the HW structure
- *
- *  Configures the collision distance to the default value and is used
- *  during link setup. Currently no func pointer exists and all
- *  implementations are handled in the generic version of this function.
- **/
-void igb_config_collision_dist_generic(struct e1000_hw *hw)
-{
-       u32 tctl;
-
-       DEBUGFUNC("igb_config_collision_dist_generic");
-
-       tctl = E1000_READ_REG(hw, E1000_TCTL);
-
-       tctl &= ~E1000_TCTL_COLD;
-       tctl |= E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT;
-
-       E1000_WRITE_REG(hw, E1000_TCTL, tctl);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- *  igb_poll_fiber_serdes_link_generic - Poll for link up
- *  @hw: pointer to the HW structure
- *
- *  Polls for link up by reading the status register, if link fails to come
- *  up with auto-negotiation, then the link is forced if a signal is detected.
- **/
-static s32 igb_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 i, status;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_poll_fiber_serdes_link_generic");
-
-       /*
-        * If we have a signal (the cable is plugged in, or assumed true for
-        * serdes media) then poll for a "Link-Up" indication in the Device
-        * Status Register.  Time-out if a link isn't seen in 500 milliseconds
-        * seconds (Auto-negotiation should complete in less than 500
-        * milliseconds even if the other end is doing it in SW).
-        */
-       for (i = 0; i < FIBER_LINK_UP_LIMIT; i++) {
-               msec_delay(10);
-               status = E1000_READ_REG(hw, E1000_STATUS);
-               if (status & E1000_STATUS_LU)
-                       break;
-       }
-       if (i == FIBER_LINK_UP_LIMIT) {
-               DEBUGOUT("Never got a valid link from auto-neg!!!\n");
-               mac->autoneg_failed = 1;
-               /*
-                * AutoNeg failed to achieve a link, so we'll call
-                * mac->check_for_link. This routine will force the
-                * link up if we detect a signal. This will allow us to
-                * communicate with non-autonegotiating link partners.
-                */
-               ret_val = hw->mac.ops.check_for_link(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error while checking for link\n");
-                       goto out;
-               }
-               mac->autoneg_failed = 0;
-       } else {
-               mac->autoneg_failed = 0;
-               DEBUGOUT("Valid Link Found\n");
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_commit_fc_settings_generic - Configure flow control
- *  @hw: pointer to the HW structure
- *
- *  Write the flow control settings to the Transmit Config Word Register (TXCW)
- *  base on the flow control settings in e1000_mac_info.
- **/
-static s32 igb_commit_fc_settings_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 txcw;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_commit_fc_settings_generic");
-
-       /*
-        * Check for a software override of the flow control settings, and
-        * setup the device accordingly.  If auto-negotiation is enabled, then
-        * software will have to set the "PAUSE" bits to the correct value in
-        * the Transmit Config Word Register (TXCW) and re-start auto-
-        * negotiation.  However, if auto-negotiation is disabled, then
-        * software will have to manually configure the two flow control enable
-        * bits in the CTRL register.
-        *
-        * The possible values of the "fc" parameter are:
-        *      0:  Flow control is completely disabled
-        *      1:  Rx flow control is enabled (we can receive pause frames,
-        *          but not send pause frames).
-        *      2:  Tx flow control is enabled (we can send pause frames but we
-        *          do not support receiving pause frames).
-        *      3:  Both Rx and Tx flow control (symmetric) are enabled.
-        */
-       switch (hw->fc.current_mode) {
-       case e1000_fc_none:
-               /* Flow control completely disabled by a software over-ride. */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD);
-               break;
-       case e1000_fc_rx_pause:
-               /*
-                * Rx Flow control is enabled and Tx Flow control is disabled
-                * by a software over-ride. Since there really isn't a way to
-                * advertise that we are capable of Rx Pause ONLY, we will
-                * advertise that we support both symmetric and asymmetric RX
-                * PAUSE.  Later, we will disable the adapter's ability to send
-                * PAUSE frames.
-                */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
-               break;
-       case e1000_fc_tx_pause:
-               /*
-                * Tx Flow control is enabled, and Rx Flow control is disabled,
-                * by a software over-ride.
-                */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_ASM_DIR);
-               break;
-       case e1000_fc_full:
-               /*
-                * Flow control (both Rx and Tx) is enabled by a software
-                * over-ride.
-                */
-               txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
-               break;
-       default:
-               DEBUGOUT("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-               break;
-       }
-
-       E1000_WRITE_REG(hw, E1000_TXCW, txcw);
-       mac->txcw = txcw;
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_set_fc_watermarks_generic - Set flow control high/low watermarks
- *  @hw: pointer to the HW structure
- *
- *  Sets the flow control high/low threshold (watermark) registers.  If
- *  flow control XON frame transmission is enabled, then set XON frame
- *  transmission as well.
- **/
-s32 igb_set_fc_watermarks_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u32 fcrtl = 0, fcrth = 0;
-
-       DEBUGFUNC("igb_set_fc_watermarks_generic");
-
-       /*
-        * Set the flow control receive threshold registers.  Normally,
-        * these registers will be set to a default threshold that may be
-        * adjusted later by the driver's runtime code.  However, if the
-        * ability to transmit pause frames is not enabled, then these
-        * registers will be set to 0.
-        */
-       if (hw->fc.current_mode & e1000_fc_tx_pause) {
-               /*
-                * We need to set up the Receive Threshold high and low water
-                * marks as well as (optionally) enabling the transmission of
-                * XON frames.
-                */
-               fcrtl = hw->fc.low_water;
-               if (hw->fc.send_xon)
-                       fcrtl |= E1000_FCRTL_XONE;
-
-               fcrth = hw->fc.high_water;
-       }
-       E1000_WRITE_REG(hw, E1000_FCRTL, fcrtl);
-       E1000_WRITE_REG(hw, E1000_FCRTH, fcrth);
-
-       return ret_val;
-}
-
-/**
- *  igb_set_default_fc_generic - Set flow control default values
- *  @hw: pointer to the HW structure
- *
- *  Read the EEPROM for the default values for flow control and store the
- *  values.
- **/
-static s32 igb_set_default_fc_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 nvm_data;
-
-       DEBUGFUNC("igb_set_default_fc_generic");
-
-       /*
-        * Read and store word 0x0F of the EEPROM. This word contains bits
-        * that determine the hardware's default PAUSE (flow control) mode,
-        * a bit that determines whether the HW defaults to enabling or
-        * disabling auto-negotiation, and the direction of the
-        * SW defined pins. If there is no SW over-ride of the flow
-        * control setting, then the variable hw->fc will
-        * be initialized based on a value in the EEPROM.
-        */
-       ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, 1, &nvm_data);
-
-       if (ret_val) {
-               DEBUGOUT("NVM Read Error\n");
-               goto out;
-       }
-
-       if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0)
-               hw->fc.requested_mode = e1000_fc_none;
-       else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) ==
-                NVM_WORD0F_ASM_DIR)
-               hw->fc.requested_mode = e1000_fc_tx_pause;
-       else
-               hw->fc.requested_mode = e1000_fc_full;
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_force_mac_fc_generic - Force the MAC's flow control settings
- *  @hw: pointer to the HW structure
- *
- *  Force the MAC's flow control settings.  Sets the TFCE and RFCE bits in the
- *  device control register to reflect the adapter settings.  TFCE and RFCE
- *  need to be explicitly set by software when a copper PHY is used because
- *  autonegotiation is managed by the PHY rather than the MAC.  Software must
- *  also configure these bits when link is forced on a fiber connection.
- **/
-s32 igb_force_mac_fc_generic(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_force_mac_fc_generic");
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-
-       /*
-        * Because we didn't get link via the internal auto-negotiation
-        * mechanism (we either forced link or we got link via PHY
-        * auto-neg), we have to manually enable/disable transmit an
-        * receive flow control.
-        *
-        * The "Case" statement below enables/disable flow control
-        * according to the "hw->fc.current_mode" parameter.
-        *
-        * The possible values of the "fc" parameter are:
-        *      0:  Flow control is completely disabled
-        *      1:  Rx flow control is enabled (we can receive pause
-        *          frames but not send pause frames).
-        *      2:  Tx flow control is enabled (we can send pause frames
-        *          frames but we do not receive pause frames).
-        *      3:  Both Rx and Tx flow control (symmetric) is enabled.
-        *  other:  No other values should be possible at this point.
-        */
-       DEBUGOUT1("hw->fc.current_mode = %u\n", hw->fc.current_mode);
-
-       switch (hw->fc.current_mode) {
-       case e1000_fc_none:
-               ctrl &= (~(E1000_CTRL_TFCE | E1000_CTRL_RFCE));
-               break;
-       case e1000_fc_rx_pause:
-               ctrl &= (~E1000_CTRL_TFCE);
-               ctrl |= E1000_CTRL_RFCE;
-               break;
-       case e1000_fc_tx_pause:
-               ctrl &= (~E1000_CTRL_RFCE);
-               ctrl |= E1000_CTRL_TFCE;
-               break;
-       case e1000_fc_full:
-               ctrl |= (E1000_CTRL_TFCE | E1000_CTRL_RFCE);
-               break;
-       default:
-               DEBUGOUT("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_config_fc_after_link_up_generic - Configures flow control after link
- *  @hw: pointer to the HW structure
- *
- *  Checks the status of auto-negotiation after link up to ensure that the
- *  speed and duplex were not forced.  If the link needed to be forced, then
- *  flow control needs to be forced also.  If auto-negotiation is enabled
- *  and did not fail, then we configure flow control based on our link
- *  partner.
- **/
-s32 igb_config_fc_after_link_up_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val = E1000_SUCCESS;
-       u16 mii_status_reg, mii_nway_adv_reg, mii_nway_lp_ability_reg;
-       u16 speed, duplex;
-
-       DEBUGFUNC("igb_config_fc_after_link_up_generic");
-
-       /*
-        * Check for the case where we have fiber media and auto-neg failed
-        * so we had to force link.  In this case, we need to force the
-        * configuration of the MAC to match the "fc" parameter.
-        */
-       if (mac->autoneg_failed) {
-               if (hw->phy.media_type == e1000_media_type_fiber ||
-                   hw->phy.media_type == e1000_media_type_internal_serdes)
-                       ret_val = igb_force_mac_fc_generic(hw);
-       } else {
-               if (hw->phy.media_type == e1000_media_type_copper)
-                       ret_val = igb_force_mac_fc_generic(hw);
-       }
-
-       if (ret_val) {
-               DEBUGOUT("Error forcing flow control settings\n");
-               goto out;
-       }
-
-       /*
-        * Check for the case where we have copper media and auto-neg is
-        * enabled.  In this case, we need to check and see if Auto-Neg
-        * has completed, and if so, how the PHY and link partner has
-        * flow control configured.
-        */
-       if ((hw->phy.media_type == e1000_media_type_copper) && mac->autoneg) {
-               /*
-                * Read the MII Status Register and check to see if AutoNeg
-                * has completed.  We read this twice because this reg has
-                * some "sticky" (latched) bits.
-                */
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       goto out;
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &mii_status_reg);
-               if (ret_val)
-                       goto out;
-
-               if (!(mii_status_reg & MII_SR_AUTONEG_COMPLETE)) {
-                       DEBUGOUT("Copper PHY and Auto Neg "
-                                "has not completed.\n");
-                       goto out;
-               }
-
-               /*
-                * The AutoNeg process has completed, so we now need to
-                * read both the Auto Negotiation Advertisement
-                * Register (Address 4) and the Auto_Negotiation Base
-                * Page Ability Register (Address 5) to determine how
-                * flow control was negotiated.
-                */
-               ret_val = hw->phy.ops.read_reg(hw, PHY_AUTONEG_ADV,
-                                            &mii_nway_adv_reg);
-               if (ret_val)
-                       goto out;
-               ret_val = hw->phy.ops.read_reg(hw, PHY_LP_ABILITY,
-                                            &mii_nway_lp_ability_reg);
-               if (ret_val)
-                       goto out;
-
-               /*
-                * Two bits in the Auto Negotiation Advertisement Register
-                * (Address 4) and two bits in the Auto Negotiation Base
-                * Page Ability Register (Address 5) determine flow control
-                * for both the PHY and the link partner.  The following
-                * table, taken out of the IEEE 802.3ab/D6.0 dated March 25,
-                * 1999, describes these PAUSE resolution bits and how flow
-                * control is determined based upon these settings.
-                * NOTE:  DC = Don't Care
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | NIC Resolution
-                *-------|---------|-------|---------|--------------------
-                *   0   |    0    |  DC   |   DC    | e1000_fc_none
-                *   0   |    1    |   0   |   DC    | e1000_fc_none
-                *   0   |    1    |   1   |    0    | e1000_fc_none
-                *   0   |    1    |   1   |    1    | e1000_fc_tx_pause
-                *   1   |    0    |   0   |   DC    | e1000_fc_none
-                *   1   |   DC    |   1   |   DC    | e1000_fc_full
-                *   1   |    1    |   0   |    0    | e1000_fc_none
-                *   1   |    1    |   0   |    1    | e1000_fc_rx_pause
-                *
-                * Are both PAUSE bits set to 1?  If so, this implies
-                * Symmetric Flow Control is enabled at both ends.  The
-                * ASM_DIR bits are irrelevant per the spec.
-                *
-                * For Symmetric Flow Control:
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-                *-------|---------|-------|---------|--------------------
-                *   1   |   DC    |   1   |   DC    | E1000_fc_full
-                *
-                */
-               if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                   (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE)) {
-                       /*
-                        * Now we need to check if the user selected Rx ONLY
-                        * of pause frames.  In this case, we had to advertise
-                        * FULL flow control because we could not advertise RX
-                        * ONLY. Hence, we must now check to see if we need to
-                        * turn OFF  the TRANSMISSION of PAUSE frames.
-                        */
-                       if (hw->fc.requested_mode == e1000_fc_full) {
-                               hw->fc.current_mode = e1000_fc_full;
-                               DEBUGOUT("Flow Control = FULL.\r\n");
-                       } else {
-                               hw->fc.current_mode = e1000_fc_rx_pause;
-                               DEBUGOUT("Flow Control = "
-                                        "RX PAUSE frames only.\r\n");
-                       }
-               }
-               /*
-                * For receiving PAUSE frames ONLY.
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-                *-------|---------|-------|---------|--------------------
-                *   0   |    1    |   1   |    1    | e1000_fc_tx_pause
-                */
-               else if (!(mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                         (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
-                         (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
-                         (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-                       hw->fc.current_mode = e1000_fc_tx_pause;
-                       DEBUGOUT("Flow Control = TX PAUSE frames only.\r\n");
-               }
-               /*
-                * For transmitting PAUSE frames ONLY.
-                *
-                *   LOCAL DEVICE  |   LINK PARTNER
-                * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-                *-------|---------|-------|---------|--------------------
-                *   1   |    1    |   0   |    1    | e1000_fc_rx_pause
-                */
-               else if ((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-                        (mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
-                        !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
-                        (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-                       hw->fc.current_mode = e1000_fc_rx_pause;
-                       DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n");
-               } else {
-                       /*
-                        * Per the IEEE spec, at this point flow control
-                        * should be disabled.
-                        */
-                       hw->fc.current_mode = e1000_fc_none;
-                       DEBUGOUT("Flow Control = NONE.\r\n");
-               }
-
-               /*
-                * Now we need to do one last check...  If we auto-
-                * negotiated to HALF DUPLEX, flow control should not be
-                * enabled per IEEE 802.3 spec.
-                */
-               ret_val = mac->ops.get_link_up_info(hw, &speed, &duplex);
-               if (ret_val) {
-                       DEBUGOUT("Error getting link speed and duplex\n");
-                       goto out;
-               }
-
-               if (duplex == HALF_DUPLEX)
-                       hw->fc.current_mode = e1000_fc_none;
-
-               /*
-                * Now we call a subroutine to actually force the MAC
-                * controller to use the correct flow control settings.
-                */
-               ret_val = igb_force_mac_fc_generic(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error forcing flow control settings\n");
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_get_speed_and_duplex_copper_generic - Retrieve current speed/duplex
- *  @hw: pointer to the HW structure
- *  @speed: stores the current speed
- *  @duplex: stores the current duplex
- *
- *  Read the status register for the current speed/duplex and store the current
- *  speed and duplex for copper connections.
- **/
-s32 igb_get_speed_and_duplex_copper_generic(struct e1000_hw *hw, u16 *speed,
-                                              u16 *duplex)
-{
-       u32 status;
-
-       DEBUGFUNC("igb_get_speed_and_duplex_copper_generic");
-
-       status = E1000_READ_REG(hw, E1000_STATUS);
-       if (status & E1000_STATUS_SPEED_1000) {
-               *speed = SPEED_1000;
-               DEBUGOUT("1000 Mbs, ");
-       } else if (status & E1000_STATUS_SPEED_100) {
-               *speed = SPEED_100;
-               DEBUGOUT("100 Mbs, ");
-       } else {
-               *speed = SPEED_10;
-               DEBUGOUT("10 Mbs, ");
-       }
-
-       if (status & E1000_STATUS_FD) {
-               *duplex = FULL_DUPLEX;
-               DEBUGOUT("Full Duplex\n");
-       } else {
-               *duplex = HALF_DUPLEX;
-               DEBUGOUT("Half Duplex\n");
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_get_speed_and_duplex_fiber_generic - Retrieve current speed/duplex
- *  @hw: pointer to the HW structure
- *  @speed: stores the current speed
- *  @duplex: stores the current duplex
- *
- *  Sets the speed and duplex to gigabit full duplex (the only possible option)
- *  for fiber/serdes links.
- **/
-s32 igb_get_speed_and_duplex_fiber_serdes_generic(struct e1000_hw *hw __unused,
-                                                  u16 *speed, u16 *duplex)
-{
-       DEBUGFUNC("igb_get_speed_and_duplex_fiber_serdes_generic");
-
-       *speed = SPEED_1000;
-       *duplex = FULL_DUPLEX;
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_get_hw_semaphore_generic - Acquire hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Acquire the HW semaphore to access the PHY or NVM
- **/
-s32 igb_get_hw_semaphore_generic(struct e1000_hw *hw)
-{
-       u32 swsm;
-       s32 ret_val = E1000_SUCCESS;
-       s32 timeout = hw->nvm.word_size + 1;
-       s32 i = 0;
-
-       DEBUGFUNC("igb_get_hw_semaphore_generic");
-
-       /* Get the SW semaphore */
-       while (i < timeout) {
-               swsm = E1000_READ_REG(hw, E1000_SWSM);
-               if (!(swsm & E1000_SWSM_SMBI))
-                       break;
-
-               usec_delay(50);
-               i++;
-       }
-
-       if (i == timeout) {
-               DEBUGOUT("Driver can't access device - SMBI bit is set.\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       /* Get the FW semaphore. */
-       for (i = 0; i < timeout; i++) {
-               swsm = E1000_READ_REG(hw, E1000_SWSM);
-               E1000_WRITE_REG(hw, E1000_SWSM, swsm | E1000_SWSM_SWESMBI);
-
-               /* Semaphore acquired if bit latched */
-               if (E1000_READ_REG(hw, E1000_SWSM) & E1000_SWSM_SWESMBI)
-                       break;
-
-               usec_delay(50);
-       }
-
-       if (i == timeout) {
-               /* Release semaphores */
-               igb_put_hw_semaphore_generic(hw);
-               DEBUGOUT("Driver can't access the NVM\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_put_hw_semaphore_generic - Release hardware semaphore
- *  @hw: pointer to the HW structure
- *
- *  Release hardware semaphore used to access the PHY or NVM
- **/
-void igb_put_hw_semaphore_generic(struct e1000_hw *hw)
-{
-       u32 swsm;
-
-       DEBUGFUNC("igb_put_hw_semaphore_generic");
-
-       swsm = E1000_READ_REG(hw, E1000_SWSM);
-
-       swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
-
-       E1000_WRITE_REG(hw, E1000_SWSM, swsm);
-}
-
-/**
- *  igb_get_auto_rd_done_generic - Check for auto read completion
- *  @hw: pointer to the HW structure
- *
- *  Check EEPROM for Auto Read done bit.
- **/
-s32 igb_get_auto_rd_done_generic(struct e1000_hw *hw)
-{
-       s32 i = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_get_auto_rd_done_generic");
-
-       while (i < AUTO_READ_DONE_TIMEOUT) {
-               if (E1000_READ_REG(hw, E1000_EECD) & E1000_EECD_AUTO_RD)
-                       break;
-               msec_delay(1);
-               i++;
-       }
-
-       if (i == AUTO_READ_DONE_TIMEOUT) {
-               DEBUGOUT("Auto read by HW from NVM has not completed.\n");
-               ret_val = -E1000_ERR_RESET;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_valid_led_default_generic - Verify a valid default LED config
- *  @hw: pointer to the HW structure
- *  @data: pointer to the NVM (EEPROM)
- *
- *  Read the EEPROM for the current default LED configuration.  If the
- *  LED configuration is not valid, set to a valid LED configuration.
- **/
-s32 igb_valid_led_default_generic(struct e1000_hw *hw, u16 *data)
-{
-       s32 ret_val;
-
-       DEBUGFUNC("igb_valid_led_default_generic");
-
-       ret_val = hw->nvm.ops.read(hw, NVM_ID_LED_SETTINGS, 1, data);
-       if (ret_val) {
-               DEBUGOUT("NVM Read Error\n");
-               goto out;
-       }
-
-       if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF)
-               *data = ID_LED_DEFAULT;
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_id_led_init_generic -
- *  @hw: pointer to the HW structure
- *
- **/
-s32 igb_id_led_init_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       s32 ret_val;
-       const u32 ledctl_mask = 0x000000FF;
-       const u32 ledctl_on = E1000_LEDCTL_MODE_LED_ON;
-       const u32 ledctl_off = E1000_LEDCTL_MODE_LED_OFF;
-       u16 data, i, temp;
-       const u16 led_mask = 0x0F;
-
-       DEBUGFUNC("igb_id_led_init_generic");
-
-       ret_val = hw->nvm.ops.valid_led_default(hw, &data);
-       if (ret_val)
-               goto out;
-
-       mac->ledctl_default = E1000_READ_REG(hw, E1000_LEDCTL);
-       mac->ledctl_mode1 = mac->ledctl_default;
-       mac->ledctl_mode2 = mac->ledctl_default;
-
-       for (i = 0; i < 4; i++) {
-               temp = (data >> (i << 2)) & led_mask;
-               switch (temp) {
-               case ID_LED_ON1_DEF2:
-               case ID_LED_ON1_ON2:
-               case ID_LED_ON1_OFF2:
-                       mac->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode1 |= ledctl_on << (i << 3);
-                       break;
-               case ID_LED_OFF1_DEF2:
-               case ID_LED_OFF1_ON2:
-               case ID_LED_OFF1_OFF2:
-                       mac->ledctl_mode1 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode1 |= ledctl_off << (i << 3);
-                       break;
-               default:
-                       /* Do nothing */
-                       break;
-               }
-               switch (temp) {
-               case ID_LED_DEF1_ON2:
-               case ID_LED_ON1_ON2:
-               case ID_LED_OFF1_ON2:
-                       mac->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode2 |= ledctl_on << (i << 3);
-                       break;
-               case ID_LED_DEF1_OFF2:
-               case ID_LED_ON1_OFF2:
-               case ID_LED_OFF1_OFF2:
-                       mac->ledctl_mode2 &= ~(ledctl_mask << (i << 3));
-                       mac->ledctl_mode2 |= ledctl_off << (i << 3);
-                       break;
-               default:
-                       /* Do nothing */
-                       break;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-#if 0
-/**
- *  igb_setup_led_generic - Configures SW controllable LED
- *  @hw: pointer to the HW structure
- *
- *  This prepares the SW controllable LED for use and saves the current state
- *  of the LED so it can be later restored.
- **/
-s32 igb_setup_led_generic(struct e1000_hw *hw)
-{
-       u32 ledctl;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_setup_led_generic");
-
-       if (hw->mac.ops.setup_led != e1000_setup_led_generic) {
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       if (hw->phy.media_type == e1000_media_type_fiber) {
-               ledctl = E1000_READ_REG(hw, E1000_LEDCTL);
-               hw->mac.ledctl_default = ledctl;
-               /* Turn off LED0 */
-               ledctl &= ~(E1000_LEDCTL_LED0_IVRT |
-                           E1000_LEDCTL_LED0_BLINK |
-                           E1000_LEDCTL_LED0_MODE_MASK);
-               ledctl |= (E1000_LEDCTL_MODE_LED_OFF <<
-                          E1000_LEDCTL_LED0_MODE_SHIFT);
-               E1000_WRITE_REG(hw, E1000_LEDCTL, ledctl);
-       } else if (hw->phy.media_type == e1000_media_type_copper) {
-               E1000_WRITE_REG(hw, E1000_LEDCTL, hw->mac.ledctl_mode1);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_cleanup_led_generic - Set LED config to default operation
- *  @hw: pointer to the HW structure
- *
- *  Remove the current LED configuration and set the LED configuration
- *  to the default value, saved from the EEPROM.
- **/
-s32 igb_cleanup_led_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_cleanup_led_generic");
-
-       if (hw->mac.ops.cleanup_led != e1000_cleanup_led_generic) {
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       E1000_WRITE_REG(hw, E1000_LEDCTL, hw->mac.ledctl_default);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_blink_led_generic - Blink LED
- *  @hw: pointer to the HW structure
- *
- *  Blink the LEDs which are set to be on.
- **/
-s32 igb_blink_led_generic(struct e1000_hw *hw)
-{
-       u32 ledctl_blink = 0;
-       u32 i;
-
-       DEBUGFUNC("igb_blink_led_generic");
-
-       if (hw->phy.media_type == e1000_media_type_fiber) {
-               /* always blink LED0 for PCI-E fiber */
-               ledctl_blink = E1000_LEDCTL_LED0_BLINK |
-                    (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED0_MODE_SHIFT);
-       } else {
-               /*
-                * set the blink bit for each LED that's "on" (0x0E)
-                * in ledctl_mode2
-                */
-               ledctl_blink = hw->mac.ledctl_mode2;
-               for (i = 0; i < 4; i++)
-                       if (((hw->mac.ledctl_mode2 >> (i * 8)) & 0xFF) ==
-                           E1000_LEDCTL_MODE_LED_ON)
-                               ledctl_blink |= (E1000_LEDCTL_LED0_BLINK <<
-                                                (i * 8));
-       }
-
-       E1000_WRITE_REG(hw, E1000_LEDCTL, ledctl_blink);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_led_on_generic - Turn LED on
- *  @hw: pointer to the HW structure
- *
- *  Turn LED on.
- **/
-s32 igb_led_on_generic(struct e1000_hw *hw)
-{
-       u32 ctrl;
-
-       DEBUGFUNC("igb_led_on_generic");
-
-       switch (hw->phy.media_type) {
-       case e1000_media_type_fiber:
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               ctrl &= ~E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-               break;
-       case e1000_media_type_copper:
-               E1000_WRITE_REG(hw, E1000_LEDCTL, hw->mac.ledctl_mode2);
-               break;
-       default:
-               break;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_led_off_generic - Turn LED off
- *  @hw: pointer to the HW structure
- *
- *  Turn LED off.
- **/
-s32 igb_led_off_generic(struct e1000_hw *hw)
-{
-       u32 ctrl;
-
-       DEBUGFUNC("igb_led_off_generic");
-
-       switch (hw->phy.media_type) {
-       case e1000_media_type_fiber:
-               ctrl = E1000_READ_REG(hw, E1000_CTRL);
-               ctrl |= E1000_CTRL_SWDPIN0;
-               ctrl |= E1000_CTRL_SWDPIO0;
-               E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-               break;
-       case e1000_media_type_copper:
-               E1000_WRITE_REG(hw, E1000_LEDCTL, hw->mac.ledctl_mode1);
-               break;
-       default:
-               break;
-       }
-
-       return E1000_SUCCESS;
-}
-#endif
-
-/**
- *  igb_set_pcie_no_snoop_generic - Set PCI-express capabilities
- *  @hw: pointer to the HW structure
- *  @no_snoop: bitmap of snoop events
- *
- *  Set the PCI-express register to snoop for events enabled in 'no_snoop'.
- **/
-void igb_set_pcie_no_snoop_generic(struct e1000_hw *hw, u32 no_snoop)
-{
-       u32 gcr;
-
-       DEBUGFUNC("igb_set_pcie_no_snoop_generic");
-
-       if (hw->bus.type != e1000_bus_type_pci_express)
-               goto out;
-
-       if (no_snoop) {
-               gcr = E1000_READ_REG(hw, E1000_GCR);
-               gcr &= ~(PCIE_NO_SNOOP_ALL);
-               gcr |= no_snoop;
-               E1000_WRITE_REG(hw, E1000_GCR, gcr);
-       }
-out:
-       return;
-}
-
-/**
- *  igb_disable_pcie_master_generic - Disables PCI-express master access
- *  @hw: pointer to the HW structure
- *
- *  Returns 0 (E1000_SUCCESS) if successful, else returns -10
- *  (-E1000_ERR_MASTER_REQUESTS_PENDING) if master disable bit has not caused
- *  the master requests to be disabled.
- *
- *  Disables PCI-Express master access and verifies there are no pending
- *  requests.
- **/
-s32 igb_disable_pcie_master_generic(struct e1000_hw *hw)
-{
-       u32 ctrl;
-       s32 timeout = MASTER_DISABLE_TIMEOUT;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_disable_pcie_master_generic");
-
-       if (hw->bus.type != e1000_bus_type_pci_express)
-               goto out;
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       ctrl |= E1000_CTRL_GIO_MASTER_DISABLE;
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-
-       while (timeout) {
-               if (!(E1000_READ_REG(hw, E1000_STATUS) &
-                     E1000_STATUS_GIO_MASTER_ENABLE))
-                       break;
-               usec_delay(100);
-               timeout--;
-       }
-
-       if (!timeout) {
-               DEBUGOUT("Master requests are pending.\n");
-               ret_val = -E1000_ERR_MASTER_REQUESTS_PENDING;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_reset_adaptive_generic - Reset Adaptive Interframe Spacing
- *  @hw: pointer to the HW structure
- *
- *  Reset the Adaptive Interframe Spacing throttle to default values.
- **/
-void igb_reset_adaptive_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-
-       DEBUGFUNC("igb_reset_adaptive_generic");
-
-       if (!mac->adaptive_ifs) {
-               DEBUGOUT("Not in Adaptive IFS mode!\n");
-               goto out;
-       }
-
-       mac->current_ifs_val = 0;
-       mac->ifs_min_val = IFS_MIN;
-       mac->ifs_max_val = IFS_MAX;
-       mac->ifs_step_size = IFS_STEP;
-       mac->ifs_ratio = IFS_RATIO;
-
-       mac->in_ifs_mode = false;
-       E1000_WRITE_REG(hw, E1000_AIT, 0);
-out:
-       return;
-}
-
-/**
- *  igb_update_adaptive_generic - Update Adaptive Interframe Spacing
- *  @hw: pointer to the HW structure
- *
- *  Update the Adaptive Interframe Spacing Throttle value based on the
- *  time between transmitted packets and time between collisions.
- **/
-void igb_update_adaptive_generic(struct e1000_hw *hw)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-
-       DEBUGFUNC("igb_update_adaptive_generic");
-
-       if (!mac->adaptive_ifs) {
-               DEBUGOUT("Not in Adaptive IFS mode!\n");
-               goto out;
-       }
-
-       if ((mac->collision_delta * mac->ifs_ratio) > mac->tx_packet_delta) {
-               if (mac->tx_packet_delta > MIN_NUM_XMITS) {
-                       mac->in_ifs_mode = true;
-                       if (mac->current_ifs_val < mac->ifs_max_val) {
-                               if (!mac->current_ifs_val)
-                                       mac->current_ifs_val = mac->ifs_min_val;
-                               else
-                                       mac->current_ifs_val +=
-                                               mac->ifs_step_size;
-                               E1000_WRITE_REG(hw, E1000_AIT, mac->current_ifs_val);
-                       }
-               }
-       } else {
-               if (mac->in_ifs_mode &&
-                   (mac->tx_packet_delta <= MIN_NUM_XMITS)) {
-                       mac->current_ifs_val = 0;
-                       mac->in_ifs_mode = false;
-                       E1000_WRITE_REG(hw, E1000_AIT, 0);
-               }
-       }
-out:
-       return;
-}
-
-/**
- *  igb_validate_mdi_setting_generic - Verify MDI/MDIx settings
- *  @hw: pointer to the HW structure
- *
- *  Verify that when not using auto-negotiation that MDI/MDIx is correctly
- *  set, which is forced to MDI mode only.
- **/
-static s32 igb_validate_mdi_setting_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_validate_mdi_setting_generic");
-
-       if (!hw->mac.autoneg && (hw->phy.mdix == 0 || hw->phy.mdix == 3)) {
-               DEBUGOUT("Invalid MDI setting detected\n");
-               hw->phy.mdix = 1;
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_write_8bit_ctrl_reg_generic - Write a 8bit CTRL register
- *  @hw: pointer to the HW structure
- *  @reg: 32bit register offset such as E1000_SCTL
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Writes an address/data control type register.  There are several of these
- *  and they all have the format address << 8 | data and bit 31 is polled for
- *  completion.
- **/
-s32 igb_write_8bit_ctrl_reg_generic(struct e1000_hw *hw, u32 reg,
-                                      u32 offset, u8 data)
-{
-       u32 i, regvalue = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_write_8bit_ctrl_reg_generic");
-
-       /* Set up the address and data */
-       regvalue = ((u32)data) | (offset << E1000_GEN_CTL_ADDRESS_SHIFT);
-       E1000_WRITE_REG(hw, reg, regvalue);
-
-       /* Poll the ready bit to see if the MDI read completed */
-       for (i = 0; i < E1000_GEN_POLL_TIMEOUT; i++) {
-               usec_delay(5);
-               regvalue = E1000_READ_REG(hw, reg);
-               if (regvalue & E1000_GEN_CTL_READY)
-                       break;
-       }
-       if (!(regvalue & E1000_GEN_CTL_READY)) {
-               DEBUGOUT1("Reg %08x did not indicate ready\n", reg);
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
diff --git a/src/drivers/net/igb/igb_mac.h b/src/drivers/net/igb/igb_mac.h
deleted file mode 100644 (file)
index 7639e24..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#ifndef _IGB_MAC_H_
-#define _IGB_MAC_H_
-
-/*
- * Functions that should not be called directly from drivers but can be used
- * by other files in this 'shared code'
- */
-void igb_init_mac_ops_generic(struct e1000_hw *hw);
-s32  igb_blink_led_generic(struct e1000_hw *hw);
-s32  igb_check_for_copper_link_generic(struct e1000_hw *hw);
-s32  igb_check_for_fiber_link_generic(struct e1000_hw *hw);
-s32  igb_check_for_serdes_link_generic(struct e1000_hw *hw);
-s32  igb_cleanup_led_generic(struct e1000_hw *hw);
-s32  igb_config_fc_after_link_up_generic(struct e1000_hw *hw);
-s32  igb_disable_pcie_master_generic(struct e1000_hw *hw);
-s32  igb_force_mac_fc_generic(struct e1000_hw *hw);
-s32  igb_get_auto_rd_done_generic(struct e1000_hw *hw);
-s32  igb_get_bus_info_pcie_generic(struct e1000_hw *hw);
-void igb_set_lan_id_single_port(struct e1000_hw *hw);
-s32  igb_get_hw_semaphore_generic(struct e1000_hw *hw);
-s32  igb_get_speed_and_duplex_copper_generic(struct e1000_hw *hw, u16 *speed,
-                                               u16 *duplex);
-s32  igb_get_speed_and_duplex_fiber_serdes_generic(struct e1000_hw *hw,
-                                                     u16 *speed, u16 *duplex);
-s32  igb_id_led_init_generic(struct e1000_hw *hw);
-s32  igb_led_on_generic(struct e1000_hw *hw);
-s32  igb_led_off_generic(struct e1000_hw *hw);
-void igb_update_mc_addr_list_generic(struct e1000_hw *hw,
-                                      u8 *mc_addr_list, u32 mc_addr_count);
-s32  igb_set_fc_watermarks_generic(struct e1000_hw *hw);
-s32  igb_setup_fiber_serdes_link_generic(struct e1000_hw *hw);
-s32  igb_setup_led_generic(struct e1000_hw *hw);
-s32  igb_setup_link_generic(struct e1000_hw *hw);
-s32  igb_write_8bit_ctrl_reg_generic(struct e1000_hw *hw, u32 reg,
-                                       u32 offset, u8 data);
-
-u32  igb_hash_mc_addr_generic(struct e1000_hw *hw, u8 *mc_addr);
-
-void igb_clear_hw_cntrs_base_generic(struct e1000_hw *hw);
-void igb_clear_vfta_generic(struct e1000_hw *hw);
-void igb_config_collision_dist_generic(struct e1000_hw *hw);
-void igb_init_rx_addrs_generic(struct e1000_hw *hw, u16 rar_count);
-void igb_mta_set_generic(struct e1000_hw *hw, u32 hash_value);
-void igb_pcix_mmrbc_workaround_generic(struct e1000_hw *hw);
-void igb_put_hw_semaphore_generic(struct e1000_hw *hw);
-void igb_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index);
-s32  igb_check_alt_mac_addr_generic(struct e1000_hw *hw);
-void igb_reset_adaptive_generic(struct e1000_hw *hw);
-void igb_set_pcie_no_snoop_generic(struct e1000_hw *hw, u32 no_snoop);
-void igb_update_adaptive_generic(struct e1000_hw *hw);
-void igb_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value);
-
-#endif /* _IGB_MAC_H_ */
diff --git a/src/drivers/net/igb/igb_main.c b/src/drivers/net/igb/igb_main.c
deleted file mode 100644 (file)
index 9295c2c..0000000
+++ /dev/null
@@ -1,1010 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  Portions Copyright(c) 2010 Marty Connor <mdc@etherboot.org>
-  Portions Copyright(c) 2010 Entity Cyber, Inc.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#include "igb.h"
-
-/* Low-level support routines */
-
-/**
- * igb_read_pcie_cap_reg - retrieve PCIe capability register contents
- * @hw: address of board private structure
- * @reg: PCIe capability register requested
- * @value: where to store requested value
- **/
-int32_t igb_read_pcie_cap_reg(struct e1000_hw *hw, uint32_t reg, uint16_t *value)
-{
-    struct igb_adapter *adapter = hw->back;
-    uint16_t cap_offset;
-
-#define         PCI_CAP_ID_EXP        0x10    /* PCI Express */
-    cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
-    if (!cap_offset)
-       return -E1000_ERR_CONFIG;
-
-    pci_read_config_word(adapter->pdev, cap_offset + reg, value);
-
-    return E1000_SUCCESS;
-}
-
-/**
- * igb_write_pcie_cap_reg - write value to PCIe capability register
- * @hw: address of board private structure
- * @reg: PCIe capability register to write to
- * @value: value to store in given register
- **/
-int32_t igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
-{
-       struct igb_adapter *adapter = hw->back;
-       u16 cap_offset;
-
-       cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
-       if (!cap_offset)
-               return -E1000_ERR_CONFIG;
-
-       pci_write_config_word(adapter->pdev, cap_offset + reg, *value);
-
-       return E1000_SUCCESS;
-}
-
-/**
- * igb_irq_disable - Mask off interrupt generation on the NIC
- * @adapter: board private structure
- **/
-static void igb_irq_disable(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       E1000_WRITE_REG(hw, E1000_IAM, 0);
-       E1000_WRITE_REG(hw, E1000_IMC, ~0);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- * igb_irq_enable - Enable default interrupt generation settings
- * @adapter: board private structure
- **/
-static void igb_irq_enable(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       E1000_WRITE_REG(hw, E1000_IMS, IMS_ENABLE_MASK);
-       E1000_WRITE_REG(hw, E1000_IAM, IMS_ENABLE_MASK);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/**
- * igb_get_hw_control - get control of the h/w from f/w
- * @adapter: address of board private structure
- *
- * igb_get_hw_control sets CTRL_EXT:DRV_LOAD bit.
- * For ASF and Pass Through versions of f/w this means that
- * the driver is loaded.
- *
- **/
-void igb_get_hw_control(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 ctrl_ext;
-
-       /* Let firmware know the driver has taken over */
-       ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
-       E1000_WRITE_REG(hw, E1000_CTRL_EXT,
-                       ctrl_ext | E1000_CTRL_EXT_DRV_LOAD);
-}
-
-/**
- * igb_reset - put adapter in known initial state
- * @adapter: board private structure
- **/
-void igb_reset(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-
-       struct e1000_mac_info *mac = &hw->mac;
-       struct e1000_fc_info *fc = &hw->fc;
-       u32 pba = 0;
-       u16 hwm;
-
-       /* Repartition Pba for greater than 9k mtu
-        * To take effect CTRL.RST is required.
-        */
-       switch (mac->type) {
-       case e1000_82576:
-               pba = E1000_READ_REG(hw, E1000_RXPBS);
-               pba &= E1000_RXPBS_SIZE_MASK_82576;
-               break;
-       case e1000_82575:
-       default:
-               pba = E1000_PBA_34K;
-               break;
-       }
-
-       /* flow control settings */
-       /* The high water mark must be low enough to fit one full frame
-        * (or the size used for early receive) above it in the Rx FIFO.
-        * Set it to the lower of:
-        * - 90% of the Rx FIFO size, or
-        * - the full Rx FIFO size minus one full frame */
-#define min(a,b) (((a)<(b))?(a):(b))
-       hwm = min(((pba << 10) * 9 / 10),
-                       ((pba << 10) - 2 * adapter->max_frame_size));
-
-       if (mac->type < e1000_82576) {
-               fc->high_water = hwm & 0xFFF8;  /* 8-byte granularity */
-               fc->low_water = fc->high_water - 8;
-       } else {
-               fc->high_water = hwm & 0xFFF0;  /* 16-byte granularity */
-               fc->low_water = fc->high_water - 16;
-       }
-       fc->pause_time = 0xFFFF;
-       fc->send_xon = 1;
-       fc->current_mode = fc->requested_mode;
-
-       /* Allow time for pending master requests to run */
-       igb_reset_hw(hw);
-       E1000_WRITE_REG(hw, E1000_WUC, 0);
-
-       if (igb_init_hw(hw)) {
-               DBG ("Hardware Error\n");
-        }
-
-       igb_get_phy_info(hw);
-}
-
-/**
- * igb_sw_init - Initialize general software structures (struct igb_adapter)
- * @adapter: board private structure to initialize
- **/
-int igb_sw_init(struct igb_adapter *adapter)
-{
-       struct e1000_hw *hw = &adapter->hw;
-       struct pci_device *pdev = adapter->pdev;
-
-       /* PCI config space info */
-
-       hw->vendor_id = pdev->vendor;
-       hw->device_id = pdev->device;
-
-       pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
-
-       pci_read_config_word(pdev, PCI_COMMAND, &hw->bus.pci_cmd_word);
-
-       adapter->max_frame_size = MAXIMUM_ETHERNET_VLAN_SIZE + ETH_HLEN + ETH_FCS_LEN;
-       adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
-
-       /* Initialize the hardware-specific values */
-       if (igb_setup_init_funcs(hw, TRUE)) {
-               DBG ("Hardware Initialization Failure\n");
-               return -EIO;
-       }
-
-       /* Explicitly disable IRQ since the NIC can be in any state. */
-       igb_irq_disable(adapter);
-
-       return 0;
-}
-
-/* TX support routines */
-
-/**
- * igb_setup_tx_resources - allocate Tx resources (Descriptors)
- *
- * @v adapter  e1000 private structure
- *
- * @ret rc      Returns 0 on success, negative on failure
- **/
-static int igb_setup_tx_resources ( struct igb_adapter *adapter )
-{
-       DBG ( "igb_setup_tx_resources\n" );
-
-       /* Allocate transmit descriptor ring memory.
-          It must not cross a 64K boundary because of hardware errata #23
-          so we use malloc_dma() requesting a 128 byte block that is
-          128 byte aligned. This should guarantee that the memory
-          allocated will not cross a 64K boundary, because 128 is an
-          even multiple of 65536 ( 65536 / 128 == 512 ), so all possible
-          allocations of 128 bytes on a 128 byte boundary will not
-          cross 64K bytes.
-        */
-
-       adapter->tx_base =
-               malloc_dma ( adapter->tx_ring_size, adapter->tx_ring_size );
-
-       if ( ! adapter->tx_base ) {
-               return -ENOMEM;
-       }
-
-       memset ( adapter->tx_base, 0, adapter->tx_ring_size );
-
-       DBG ( "adapter->tx_base = %#08lx\n", virt_to_bus ( adapter->tx_base ) );
-
-       return 0;
-}
-
-/**
- * igb_process_tx_packets - process transmitted packets
- *
- * @v netdev   network interface device structure
- **/
-static void igb_process_tx_packets ( struct net_device *netdev )
-{
-       struct igb_adapter *adapter = netdev_priv ( netdev );
-       uint32_t i;
-       uint32_t tx_status;
-       struct e1000_tx_desc *tx_curr_desc;
-
-       /* Check status of transmitted packets
-        */
-       DBG ( "process_tx_packets: tx_head = %d, tx_tail = %d\n", adapter->tx_head,
-             adapter->tx_tail );
-
-       while ( ( i = adapter->tx_head ) != adapter->tx_tail ) {
-
-               tx_curr_desc = ( void * )  ( adapter->tx_base ) +
-                                          ( i * sizeof ( *adapter->tx_base ) );
-
-               tx_status = tx_curr_desc->upper.data;
-
-               DBG ( "  tx_curr_desc = %#08lx\n", virt_to_bus ( tx_curr_desc ) );
-               DBG ( "  tx_status = %#08x\n", tx_status );
-
-               /* if the packet at tx_head is not owned by hardware it is for us */
-               if ( ! ( tx_status & E1000_TXD_STAT_DD ) )
-                       break;
-
-               DBG ( "Sent packet. tx_head: %d tx_tail: %d tx_status: %#08x\n",
-                     adapter->tx_head, adapter->tx_tail, tx_status );
-
-               if ( tx_status & ( E1000_TXD_STAT_EC | E1000_TXD_STAT_LC |
-                                  E1000_TXD_STAT_TU ) ) {
-                       netdev_tx_complete_err ( netdev, adapter->tx_iobuf[i], -EINVAL );
-                       DBG ( "Error transmitting packet, tx_status: %#08x\n",
-                             tx_status );
-               } else {
-                       netdev_tx_complete ( netdev, adapter->tx_iobuf[i] );
-                       DBG ( "Success transmitting packet, tx_status: %#08x\n",
-                             tx_status );
-               }
-
-               /* Decrement count of used descriptors, clear this descriptor
-                */
-               adapter->tx_fill_ctr--;
-               memset ( tx_curr_desc, 0, sizeof ( *tx_curr_desc ) );
-
-               adapter->tx_head = ( adapter->tx_head + 1 ) % NUM_TX_DESC;
-       }
-}
-
-static void igb_free_tx_resources ( struct igb_adapter *adapter )
-{
-       DBG ( "igb_free_tx_resources\n" );
-
-       free_dma ( adapter->tx_base, adapter->tx_ring_size );
-}
-
-/**
- * igb_configure_tx - Configure 8254x Transmit Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Tx unit of the MAC after a reset.
- **/
-static void igb_configure_tx ( struct igb_adapter *adapter )
-{
-       struct e1000_hw *hw = &adapter->hw;
-       u32 tctl, txdctl;
-
-       DBG ( "igb_configure_tx\n" );
-
-       /* disable transmits while setting up the descriptors */
-       tctl = E1000_READ_REG ( hw, E1000_TCTL );
-       E1000_WRITE_REG ( hw, E1000_TCTL, tctl & ~E1000_TCTL_EN );
-       E1000_WRITE_FLUSH(hw);
-       mdelay(10);
-
-       E1000_WRITE_REG ( hw, E1000_TDBAH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_TDBAL(0), virt_to_bus ( adapter->tx_base ) );
-       E1000_WRITE_REG ( hw, E1000_TDLEN(0), adapter->tx_ring_size );
-
-       DBG ( "E1000_TDBAL(0): %#08x\n",  E1000_READ_REG ( hw, E1000_TDBAL(0) ) );
-       DBG ( "E1000_TDLEN(0): %d\n",     E1000_READ_REG ( hw, E1000_TDLEN(0) ) );
-
-       /* Setup the HW Tx Head and Tail descriptor pointers */
-       E1000_WRITE_REG ( hw, E1000_TDH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_TDT(0), 0 );
-
-       adapter->tx_head = 0;
-       adapter->tx_tail = 0;
-       adapter->tx_fill_ctr = 0;
-
-       txdctl = E1000_READ_REG ( hw, E1000_TXDCTL(0) );
-       txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
-       E1000_WRITE_REG ( hw, E1000_TXDCTL(0), txdctl );
-
-       /* Setup Transmit Descriptor Settings for eop descriptor */
-       adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS;
-
-       /* enable Report Status bit */
-       adapter->txd_cmd |= E1000_TXD_CMD_RS;
-
-       /* Program the Transmit Control Register */
-       tctl &= ~E1000_TCTL_CT;
-       tctl |= E1000_TCTL_PSP | E1000_TCTL_RTLC |
-               (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT);
-
-       igb_config_collision_dist(hw);
-
-       /* Enable transmits */
-       tctl |= E1000_TCTL_EN;
-       E1000_WRITE_REG(hw, E1000_TCTL, tctl);
-       E1000_WRITE_FLUSH(hw);
-}
-
-/* RX support routines */
-
-static void igb_free_rx_resources ( struct igb_adapter *adapter )
-{
-       int i;
-
-       DBG ( "igb_free_rx_resources\n" );
-
-       free_dma ( adapter->rx_base, adapter->rx_ring_size );
-
-       for ( i = 0; i < NUM_RX_DESC; i++ ) {
-               free_iob ( adapter->rx_iobuf[i] );
-       }
-}
-
-/**
- * igb_refill_rx_ring - allocate Rx io_buffers
- *
- * @v adapter  e1000 private structure
- *
- * @ret rc      Returns 0 on success, negative on failure
- **/
-static int igb_refill_rx_ring ( struct igb_adapter *adapter )
-{
-       int i, rx_curr;
-       int rc = 0;
-       struct e1000_rx_desc *rx_curr_desc;
-       struct e1000_hw *hw = &adapter->hw;
-       struct io_buffer *iob;
-
-       DBGP ("igb_refill_rx_ring\n");
-
-       for ( i = 0; i < NUM_RX_DESC; i++ ) {
-               rx_curr = ( ( adapter->rx_curr + i ) % NUM_RX_DESC );
-               rx_curr_desc = adapter->rx_base + rx_curr;
-
-               if ( rx_curr_desc->status & E1000_RXD_STAT_DD )
-                       continue;
-
-               if ( adapter->rx_iobuf[rx_curr] != NULL )
-                       continue;
-
-               DBG2 ( "Refilling rx desc %d\n", rx_curr );
-
-               iob = alloc_iob ( MAXIMUM_ETHERNET_VLAN_SIZE );
-               adapter->rx_iobuf[rx_curr] = iob;
-
-               if ( ! iob ) {
-                       DBG ( "alloc_iob failed\n" );
-                       rc = -ENOMEM;
-                       break;
-               } else {
-                       rx_curr_desc->buffer_addr = virt_to_bus ( iob->data );
-
-                       E1000_WRITE_REG ( hw, E1000_RDT(0), rx_curr );
-               }
-       }
-       return rc;
-}
-
-/**
- * igb_setup_rx_resources - allocate Rx resources (Descriptors)
- *
- * @v adapter  e1000 private structure
- *
- * @ret rc      Returns 0 on success, negative on failure
- **/
-static int igb_setup_rx_resources ( struct igb_adapter *adapter )
-{
-       int i, rc = 0;
-
-       DBGP ( "igb_setup_rx_resources\n" );
-
-       /* Allocate receive descriptor ring memory.
-          It must not cross a 64K boundary because of hardware errata
-        */
-
-       adapter->rx_base =
-               malloc_dma ( adapter->rx_ring_size, adapter->rx_ring_size );
-
-       if ( ! adapter->rx_base ) {
-               return -ENOMEM;
-       }
-       memset ( adapter->rx_base, 0, adapter->rx_ring_size );
-
-       for ( i = 0; i < NUM_RX_DESC; i++ ) {
-               /* let igb_refill_rx_ring() io_buffer allocations */
-               adapter->rx_iobuf[i] = NULL;
-       }
-
-       /* allocate io_buffers */
-       rc = igb_refill_rx_ring ( adapter );
-       if ( rc < 0 )
-               igb_free_rx_resources ( adapter );
-
-       return rc;
-}
-
-/**
- * igb_configure_rx - Configure 8254x Receive Unit after Reset
- * @adapter: board private structure
- *
- * Configure the Rx unit of the MAC after a reset.
- **/
-static void igb_configure_rx ( struct igb_adapter *adapter )
-{
-       struct e1000_hw *hw = &adapter->hw;
-       uint32_t rctl, rxdctl, rxcsum, mrqc;
-
-       DBGP ( "igb_configure_rx\n" );
-
-       /* disable receives while setting up the descriptors */
-       rctl = E1000_READ_REG ( hw, E1000_RCTL );
-       E1000_WRITE_REG ( hw, E1000_RCTL, rctl & ~E1000_RCTL_EN );
-       E1000_WRITE_FLUSH(hw);
-       mdelay(10);
-
-       adapter->rx_curr = 0;
-
-       /* Setup the HW Rx Head and Tail Descriptor Pointers and
-        * the Base and Length of the Rx Descriptor Ring */
-
-       E1000_WRITE_REG ( hw, E1000_RDBAL(0), virt_to_bus ( adapter->rx_base ) );
-       E1000_WRITE_REG ( hw, E1000_RDBAH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_RDLEN(0), adapter->rx_ring_size );
-
-       E1000_WRITE_REG ( hw, E1000_RDH(0), 0 );
-       E1000_WRITE_REG ( hw, E1000_RDT(0), 0 );
-
-       DBG ( "E1000_RDBAL(0): %#08x\n",  E1000_READ_REG ( hw, E1000_RDBAL(0) ) );
-       DBG ( "E1000_RDLEN(0): %d\n",     E1000_READ_REG ( hw, E1000_RDLEN(0) ) );
-       DBG ( "E1000_RCTL:  %#08x\n",     E1000_READ_REG ( hw, E1000_RCTL ) );
-
-       rxdctl = E1000_READ_REG ( hw, E1000_RXDCTL(0) );
-       rxdctl |= E1000_RXDCTL_QUEUE_ENABLE;
-       rxdctl &= 0xFFF00000;
-       rxdctl |= IGB_RX_PTHRESH;
-       rxdctl |= IGB_RX_HTHRESH << 8;
-       rxdctl |= IGB_RX_WTHRESH << 16;
-       E1000_WRITE_REG ( hw, E1000_RXDCTL(0), rxdctl );
-       E1000_WRITE_FLUSH ( hw );
-
-       rxcsum = E1000_READ_REG(hw, E1000_RXCSUM);
-       rxcsum &= ~( E1000_RXCSUM_TUOFL | E1000_RXCSUM_IPPCSE );
-       E1000_WRITE_REG ( hw, E1000_RXCSUM, 0 );
-
-       /* The initial value for MRQC disables multiple receive
-        * queues, however this setting is not recommended.
-        * - Intel® 82576 Gigabit Ethernet Controller Datasheet r2.41
-        *   Section 8.10.9 Multiple Queues Command Register - MRQC
-        */
-       mrqc = E1000_MRQC_ENABLE_VMDQ;
-       E1000_WRITE_REG ( hw, E1000_MRQC, mrqc );
-
-       /* Turn off loopback modes */
-       rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
-
-       /* set maximum packet size */
-       rctl |=  E1000_RCTL_SZ_2048;
-
-       /* Broadcast enable, multicast promisc, unicast promisc */
-       rctl |=  E1000_RCTL_BAM | E1000_RCTL_MPE | E1000_RCTL_UPE;
-
-       /* Store bad packets */
-       rctl |=  E1000_RCTL_SBP;
-
-       /* enable LPE to prevent packets larger than max_frame_size */
-       rctl |= E1000_RCTL_LPE;
-
-       /* enable stripping of CRC. */
-       rctl |= E1000_RCTL_SECRC;
-
-       /* enable receive control register */
-       rctl |= E1000_RCTL_EN;
-       E1000_WRITE_REG(hw, E1000_RCTL, rctl);
-       E1000_WRITE_FLUSH(hw);
-
-       /* On the 82576, RDT([0]) must not be "bumped" before
-        * the enable bit of RXDCTL([0]) is set.
-        * - Intel® 82576 Gigabit Ethernet Controller Datasheet r2.41
-        *   Section 4.5.9 receive Initialization
-        *
-        * By observation I have found this to occur when the enable bit of
-        * RCTL is set. The datasheet recommends polling for this bit,
-        * however as I see no evidence of this in the Linux igb driver
-        * I have omitted that step.
-        * - Simon Horman, May 2009
-        */
-       E1000_WRITE_REG ( hw, E1000_RDT(0), NUM_RX_DESC - 1 );
-
-       DBG ( "RDBAH: %#08x\n",  E1000_READ_REG ( hw, E1000_RDBAH(0) ) );
-       DBG ( "RDBAL: %#08x\n",  E1000_READ_REG ( hw, E1000_RDBAL(0) ) );
-       DBG ( "RDLEN: %d\n",     E1000_READ_REG ( hw, E1000_RDLEN(0) ) );
-       DBG ( "RCTL:  %#08x\n",  E1000_READ_REG ( hw, E1000_RCTL ) );
-}
-
-/**
- * igb_process_rx_packets - process received packets
- *
- * @v netdev   network interface device structure
- **/
-static void igb_process_rx_packets ( struct net_device *netdev )
-{
-       struct igb_adapter *adapter = netdev_priv ( netdev );
-       uint32_t i;
-       uint32_t rx_status;
-       uint32_t rx_len;
-       uint32_t rx_err;
-       struct e1000_rx_desc *rx_curr_desc;
-
-       DBGP ( "igb_process_rx_packets\n" );
-
-       /* Process received packets
-        */
-       while ( 1 ) {
-
-               i = adapter->rx_curr;
-
-               rx_curr_desc = ( void * )  ( adapter->rx_base ) +
-                                 ( i * sizeof ( *adapter->rx_base ) );
-               rx_status = rx_curr_desc->status;
-
-               DBG2 ( "Before DD Check RX_status: %#08x\n", rx_status );
-
-               if ( ! ( rx_status & E1000_RXD_STAT_DD ) )
-                       break;
-
-               if ( adapter->rx_iobuf[i] == NULL )
-                       break;
-
-               DBG ( "E1000_RCTL = %#08x\n", E1000_READ_REG ( &adapter->hw, E1000_RCTL ) );
-
-               rx_len = rx_curr_desc->length;
-
-               DBG ( "Received packet, rx_curr: %d  rx_status: %#08x  rx_len: %d\n",
-                     i, rx_status, rx_len );
-
-               rx_err = rx_curr_desc->errors;
-
-               iob_put ( adapter->rx_iobuf[i], rx_len );
-
-               if ( rx_err & E1000_RXD_ERR_FRAME_ERR_MASK ) {
-
-                       netdev_rx_err ( netdev, adapter->rx_iobuf[i], -EINVAL );
-                       DBG ( "igb_process_rx_packets: Corrupted packet received!"
-                             " rx_err: %#08x\n", rx_err );
-               } else  {
-                       /* Add this packet to the receive queue. */
-                       netdev_rx ( netdev, adapter->rx_iobuf[i] );
-               }
-               adapter->rx_iobuf[i] = NULL;
-
-               memset ( rx_curr_desc, 0, sizeof ( *rx_curr_desc ) );
-
-               adapter->rx_curr = ( adapter->rx_curr + 1 ) % NUM_RX_DESC;
-       }
-}
-
-/** Functions that implement the iPXE driver API **/
-
-/**
- * igb_close - Disables a network interface
- *
- * @v netdev   network interface device structure
- *
- **/
-static void igb_close ( struct net_device *netdev )
-{
-       struct igb_adapter *adapter = netdev_priv ( netdev );
-       struct e1000_hw *hw = &adapter->hw;
-       uint32_t rctl;
-
-       DBGP ( "igb_close\n" );
-
-       /* Disable and acknowledge interrupts */
-       igb_irq_disable ( adapter );
-       E1000_READ_REG ( hw, E1000_ICR );
-
-       /* disable receives */
-       rctl = E1000_READ_REG ( hw, E1000_RCTL );
-       E1000_WRITE_REG ( hw, E1000_RCTL, rctl & ~E1000_RCTL_EN );
-       E1000_WRITE_FLUSH(hw);
-
-       igb_reset ( adapter );
-
-       igb_free_tx_resources ( adapter );
-       igb_free_rx_resources ( adapter );
-}
-
-/**
- * igb_transmit - Transmit a packet
- *
- * @v netdev   Network device
- * @v iobuf    I/O buffer
- *
- * @ret rc      Returns 0 on success, negative on failure
- */
-static int igb_transmit ( struct net_device *netdev, struct io_buffer *iobuf )
-{
-       struct igb_adapter *adapter = netdev_priv( netdev );
-       struct e1000_hw *hw = &adapter->hw;
-       uint32_t tx_curr = adapter->tx_tail;
-       struct e1000_tx_desc *tx_curr_desc;
-
-       DBGP ("igb_transmit\n");
-
-       if ( adapter->tx_fill_ctr == NUM_TX_DESC ) {
-               DBG ("TX overflow\n");
-               return -ENOBUFS;
-       }
-
-       /* Save pointer to iobuf we have been given to transmit,
-          netdev_tx_complete() will need it later
-        */
-       adapter->tx_iobuf[tx_curr] = iobuf;
-
-       tx_curr_desc = ( void * ) ( adapter->tx_base ) +
-                      ( tx_curr * sizeof ( *adapter->tx_base ) );
-
-       DBG ( "tx_curr_desc = %#08lx\n", virt_to_bus ( tx_curr_desc ) );
-       DBG ( "tx_curr_desc + 16 = %#08lx\n", virt_to_bus ( tx_curr_desc ) + 16 );
-       DBG ( "iobuf->data = %#08lx\n", virt_to_bus ( iobuf->data ) );
-
-       /* Add the packet to TX ring
-        */
-       tx_curr_desc->buffer_addr = virt_to_bus ( iobuf->data );
-       tx_curr_desc->upper.data = 0;
-       tx_curr_desc->lower.data = adapter->txd_cmd | iob_len ( iobuf );
-
-       DBG ( "TX fill: %d tx_curr: %d addr: %#08lx len: %zd\n", adapter->tx_fill_ctr,
-             tx_curr, virt_to_bus ( iobuf->data ), iob_len ( iobuf ) );
-
-       /* Point to next free descriptor */
-       adapter->tx_tail = ( adapter->tx_tail + 1 ) % NUM_TX_DESC;
-       adapter->tx_fill_ctr++;
-
-       /* Write new tail to NIC, making packet available for transmit
-        */
-       E1000_WRITE_REG ( hw, E1000_TDT(0), adapter->tx_tail );
-       E1000_WRITE_FLUSH(hw);
-
-       return 0;
-}
-
-/**
- * igb_poll - Poll for received packets
- *
- * @v netdev   Network device
- */
-static void igb_poll ( struct net_device *netdev )
-{
-       struct igb_adapter *adapter = netdev_priv( netdev );
-       struct e1000_hw *hw = &adapter->hw;
-
-       uint32_t icr;
-
-       DBGP ( "igb_poll\n" );
-
-       /* Acknowledge interrupts */
-       icr = E1000_READ_REG ( hw, E1000_ICR );
-       if ( ! icr )
-               return;
-
-       DBG ( "igb_poll: intr_status = %#08x\n", icr );
-
-       igb_process_tx_packets ( netdev );
-
-       igb_process_rx_packets ( netdev );
-
-       igb_refill_rx_ring(adapter);
-}
-
-/**
- * igb_irq - enable or Disable interrupts
- *
- * @v adapter  e1000 adapter
- * @v action   requested interrupt action
- **/
-static void igb_irq ( struct net_device *netdev, int enable )
-{
-       struct igb_adapter *adapter = netdev_priv ( netdev );
-
-       DBGP ( "igb_irq\n" );
-
-       if ( enable ) {
-               igb_irq_enable ( adapter );
-       } else {
-               igb_irq_disable ( adapter );
-       }
-}
-
-static struct net_device_operations igb_operations;
-
-/**
- * igb_probe - Initial configuration of NIC
- *
- * @v pci      PCI device
- * @v id       PCI IDs
- *
- * @ret rc     Return status code
- **/
-int igb_probe ( struct pci_device *pdev )
-{
-       int i, err;
-       struct net_device *netdev;
-       struct igb_adapter *adapter;
-       unsigned long mmio_start, mmio_len;
-       struct e1000_hw *hw;
-
-       DBGP ( "igb_probe\n" );
-
-       err = -ENOMEM;
-
-       /* Allocate net device ( also allocates memory for netdev->priv
-          and makes netdev-priv point to it ) */
-       netdev = alloc_etherdev ( sizeof ( struct igb_adapter ) );
-       if ( ! netdev ) {
-               DBG ( "err_alloc_etherdev\n" );
-               goto err_alloc_etherdev;
-       }
-
-       /* Associate igb-specific network operations operations with
-        * generic network device layer */
-       netdev_init ( netdev, &igb_operations );
-
-       /* Associate this network device with given PCI device */
-       pci_set_drvdata ( pdev, netdev );
-       netdev->dev = &pdev->dev;
-
-       /* Initialize driver private storage */
-       adapter = netdev_priv ( netdev );
-       memset ( adapter, 0, ( sizeof ( *adapter ) ) );
-
-       adapter->pdev       = pdev;
-
-       adapter->ioaddr     = pdev->ioaddr;
-       adapter->hw.io_base = pdev->ioaddr;
-
-       hw                  = &adapter->hw;
-       hw->vendor_id       = pdev->vendor;
-       hw->device_id       = pdev->device;
-
-       adapter->irqno      = pdev->irq;
-       adapter->netdev     = netdev;
-       adapter->hw.back    = adapter;
-
-       adapter->min_frame_size    = ETH_ZLEN + ETH_FCS_LEN;
-       adapter->max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN;
-
-       adapter->tx_ring_size = sizeof ( *adapter->tx_base ) * NUM_TX_DESC;
-       adapter->rx_ring_size = sizeof ( *adapter->rx_base ) * NUM_RX_DESC;
-
-       /* Fix up PCI device */
-       adjust_pci_device ( pdev );
-
-       err = -EIO;
-
-       mmio_start = pci_bar_start ( pdev, PCI_BASE_ADDRESS_0 );
-       mmio_len   = pci_bar_size  ( pdev, PCI_BASE_ADDRESS_0 );
-
-       DBG ( "mmio_start: %#08lx\n", mmio_start );
-       DBG ( "mmio_len: %#08lx\n", mmio_len );
-
-       adapter->hw.hw_addr = ioremap ( mmio_start, mmio_len );
-       DBG ( "adapter->hw.hw_addr: %p\n", adapter->hw.hw_addr );
-
-       if ( ! adapter->hw.hw_addr ) {
-               DBG ( "err_ioremap\n" );
-               goto err_ioremap;
-       }
-
-       /* setup adapter struct */
-       err = igb_sw_init ( adapter );
-       if (err) {
-               DBG ( "err_sw_init\n" );
-               goto err_sw_init;
-       }
-
-       igb_get_bus_info(hw);
-
-       /* Copper options */
-       if (adapter->hw.phy.media_type == e1000_media_type_copper) {
-               adapter->hw.phy.mdix = AUTO_ALL_MODES;
-               adapter->hw.phy.disable_polarity_correction = 0;
-               adapter->hw.phy.ms_type = e1000_ms_hw_default;
-       }
-
-       DBG ( "adapter->hw.mac.type: %#08x\n", adapter->hw.mac.type );
-
-       /* Force auto-negotiation */
-       adapter->hw.mac.autoneg = 1;
-       adapter->fc_autoneg = 1;
-       adapter->hw.phy.autoneg_wait_to_complete = true;
-       adapter->hw.mac.adaptive_ifs = true;
-       adapter->hw.fc.requested_mode = e1000_fc_default;
-       adapter->hw.fc.current_mode = e1000_fc_default;
-
-       igb_validate_mdi_setting(hw);
-
-       /*
-        * before reading the NVM, reset the controller to
-        * put the device in a known good starting state
-        */
-       igb_reset_hw(hw);
-
-       /*
-        * systems with ASPM and others may see the checksum fail on the first
-        * attempt. Let's give it a few tries
-        */
-       for (i = 0;; i++) {
-               if (igb_validate_nvm_checksum(&adapter->hw) >= 0)
-                       break;
-               if (i == 2) {
-                       err = -EIO;
-                       DBG ( "The NVM Checksum Is Not Valid\n" );
-                       DBG ( "err_eeprom\n" );
-                       goto err_eeprom;
-               }
-       }
-
-       /* copy the MAC address out of the EEPROM */
-       if ( igb_read_mac_addr ( &adapter->hw ) ) {
-               DBG ( "EEPROM Read Error\n" );
-       }
-
-       memcpy ( netdev->hw_addr, adapter->hw.mac.perm_addr, ETH_ALEN );
-
-       /* reset the hardware with the new settings */
-       igb_reset ( adapter );
-
-       /* let the f/w know that the h/w is now under the control of the
-        * driver. */
-       igb_get_hw_control(adapter);
-
-       if ( ( err = register_netdev ( netdev ) ) != 0) {
-               DBG ( "err_register\n" );
-               goto err_register;
-       }
-
-       /* Mark as link up; we don't yet handle link state */
-       netdev_link_up ( netdev );
-
-       for (i = 0; i < 6; i++) {
-               DBG ("%02x%s", netdev->ll_addr[i], i == 5 ? "\n" : ":");
-        }
-
-       DBG ( "igb_probe succeeded!\n" );
-
-       /* No errors, return success */
-       return 0;
-
-/* Error return paths */
-err_register:
-err_eeprom:
-err_sw_init:
-       iounmap ( adapter->hw.hw_addr );
-err_ioremap:
-       netdev_put ( netdev );
-err_alloc_etherdev:
-       return err;
-}
-
-/**
- * igb_remove - Device Removal Routine
- *
- * @v pdev PCI device information struct
- *
- **/
-void igb_remove ( struct pci_device *pdev )
-{
-       struct net_device *netdev = pci_get_drvdata ( pdev );
-       struct igb_adapter *adapter = netdev_priv ( netdev );
-
-       DBGP ( "igb_remove\n" );
-
-       if ( adapter->hw.flash_address )
-               iounmap ( adapter->hw.flash_address );
-       if  ( adapter->hw.hw_addr )
-               iounmap ( adapter->hw.hw_addr );
-
-       unregister_netdev ( netdev );
-       igb_reset  ( adapter );
-       netdev_nullify ( netdev );
-       netdev_put ( netdev );
-}
-
-/**
- * igb_open - Called when a network interface is made active
- *
- * @v netdev   network interface device structure
- * @ret rc     Return status code, 0 on success, negative value on failure
- *
- **/
-static int igb_open ( struct net_device *netdev )
-{
-       struct igb_adapter *adapter = netdev_priv(netdev);
-       int err;
-
-       DBGP ( "igb_open\n" );
-
-       /* allocate transmit descriptors */
-       err = igb_setup_tx_resources ( adapter );
-       if ( err ) {
-               DBG ( "Error setting up TX resources!\n" );
-               goto err_setup_tx;
-       }
-
-       /* allocate receive descriptors */
-       err = igb_setup_rx_resources ( adapter );
-       if ( err ) {
-               DBG ( "Error setting up RX resources!\n" );
-               goto err_setup_rx;
-       }
-
-       igb_configure_tx ( adapter );
-
-       igb_configure_rx ( adapter );
-
-       DBG ( "E1000_RXDCTL(0): %#08x\n",  E1000_READ_REG ( &adapter->hw, E1000_RXDCTL(0) ) );
-
-       return 0;
-
-err_setup_rx:
-       DBG ( "err_setup_rx\n" );
-       igb_free_tx_resources ( adapter );
-err_setup_tx:
-       DBG ( "err_setup_tx\n" );
-       igb_reset ( adapter );
-
-       return err;
-}
-
-/** igb net device operations */
-static struct net_device_operations igb_operations = {
-       .open           = igb_open,
-       .close          = igb_close,
-       .transmit       = igb_transmit,
-       .poll           = igb_poll,
-       .irq            = igb_irq,
-};
diff --git a/src/drivers/net/igb/igb_manage.c b/src/drivers/net/igb/igb_manage.c
deleted file mode 100644 (file)
index b29d4c4..0000000
+++ /dev/null
@@ -1,388 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#include "igb.h"
-
-#if 0
-
-static u8 e1000_calculate_checksum(u8 *buffer, u32 length);
-
-/**
- *  e1000_calculate_checksum - Calculate checksum for buffer
- *  @buffer: pointer to EEPROM
- *  @length: size of EEPROM to calculate a checksum for
- *
- *  Calculates the checksum for some buffer on a specified length.  The
- *  checksum calculated is returned.
- **/
-static u8 e1000_calculate_checksum(u8 *buffer, u32 length)
-{
-       u32 i;
-       u8  sum = 0;
-
-       DEBUGFUNC("igb_calculate_checksum");
-
-       if (!buffer)
-               return 0;
-
-       for (i = 0; i < length; i++)
-               sum += buffer[i];
-
-       return (u8) (0 - sum);
-}
-
-/**
- *  e1000_mng_enable_host_if_generic - Checks host interface is enabled
- *  @hw: pointer to the HW structure
- *
- *  Returns E1000_success upon success, else E1000_ERR_HOST_INTERFACE_COMMAND
- *
- *  This function checks whether the HOST IF is enabled for command operation
- *  and also checks whether the previous command is completed.  It busy waits
- *  in case of previous command is not completed.
- **/
-s32 e1000_mng_enable_host_if_generic(struct e1000_hw *hw)
-{
-       u32 hicr;
-       s32 ret_val = E1000_SUCCESS;
-       u8  i;
-
-       DEBUGFUNC("igb_mng_enable_host_if_generic");
-
-       /* Check that the host interface is enabled. */
-       hicr = E1000_READ_REG(hw, E1000_HICR);
-       if ((hicr & E1000_HICR_EN) == 0) {
-               DEBUGOUT("E1000_HOST_EN bit disabled.\n");
-               ret_val = -E1000_ERR_HOST_INTERFACE_COMMAND;
-               goto out;
-       }
-       /* check the previous command is completed */
-       for (i = 0; i < E1000_MNG_DHCP_COMMAND_TIMEOUT; i++) {
-               hicr = E1000_READ_REG(hw, E1000_HICR);
-               if (!(hicr & E1000_HICR_C))
-                       break;
-               msec_delay_irq(1);
-       }
-
-       if (i == E1000_MNG_DHCP_COMMAND_TIMEOUT) {
-               DEBUGOUT("Previous command timeout failed .\n");
-               ret_val = -E1000_ERR_HOST_INTERFACE_COMMAND;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_check_mng_mode_generic - Generic check management mode
- *  @hw: pointer to the HW structure
- *
- *  Reads the firmware semaphore register and returns true (>0) if
- *  manageability is enabled, else false (0).
- **/
-bool e1000_check_mng_mode_generic(struct e1000_hw *hw)
-{
-       u32 fwsm;
-
-       DEBUGFUNC("igb_check_mng_mode_generic");
-
-       fwsm = E1000_READ_REG(hw, E1000_FWSM);
-
-       return (fwsm & E1000_FWSM_MODE_MASK) ==
-               (E1000_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT);
-}
-
-/**
- *  e1000_enable_tx_pkt_filtering_generic - Enable packet filtering on TX
- *  @hw: pointer to the HW structure
- *
- *  Enables packet filtering on transmit packets if manageability is enabled
- *  and host interface is enabled.
- **/
-bool e1000_enable_tx_pkt_filtering_generic(struct e1000_hw *hw)
-{
-       struct e1000_host_mng_dhcp_cookie *hdr = &hw->mng_cookie;
-       u32 *buffer = (u32 *)&hw->mng_cookie;
-       u32 offset;
-       s32 ret_val, hdr_csum, csum;
-       u8 i, len;
-       bool tx_filter = true;
-
-       DEBUGFUNC("igb_enable_tx_pkt_filtering_generic");
-
-       /* No manageability, no filtering */
-       if (!hw->mac.ops.check_mng_mode(hw)) {
-               tx_filter = false;
-               goto out;
-       }
-
-       /*
-        * If we can't read from the host interface for whatever
-        * reason, disable filtering.
-        */
-       ret_val = hw->mac.ops.mng_enable_host_if(hw);
-       if (ret_val != E1000_SUCCESS) {
-               tx_filter = false;
-               goto out;
-       }
-
-       /* Read in the header.  Length and offset are in dwords. */
-       len    = E1000_MNG_DHCP_COOKIE_LENGTH >> 2;
-       offset = E1000_MNG_DHCP_COOKIE_OFFSET >> 2;
-       for (i = 0; i < len; i++) {
-               *(buffer + i) = E1000_READ_REG_ARRAY_DWORD(hw,
-                                                          E1000_HOST_IF,
-                                                          offset + i);
-       }
-       hdr_csum = hdr->checksum;
-       hdr->checksum = 0;
-       csum = e1000_calculate_checksum((u8 *)hdr,
-                                       E1000_MNG_DHCP_COOKIE_LENGTH);
-       /*
-        * If either the checksums or signature don't match, then
-        * the cookie area isn't considered valid, in which case we
-        * take the safe route of assuming Tx filtering is enabled.
-        */
-       if (hdr_csum != csum)
-               goto out;
-       if (hdr->signature != E1000_IAMT_SIGNATURE)
-               goto out;
-
-       /* Cookie area is valid, make the final check for filtering. */
-       if (!(hdr->status & E1000_MNG_DHCP_COOKIE_STATUS_PARSING))
-               tx_filter = false;
-
-out:
-       hw->mac.tx_pkt_filtering = tx_filter;
-       return tx_filter;
-}
-
-/**
- *  e1000_mng_write_dhcp_info_generic - Writes DHCP info to host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface
- *  @length: size of the buffer
- *
- *  Writes the DHCP information to the host interface.
- **/
-s32 e1000_mng_write_dhcp_info_generic(struct e1000_hw *hw, u8 *buffer,
-                                      u16 length)
-{
-       struct e1000_host_mng_command_header hdr;
-       s32 ret_val;
-       u32 hicr;
-
-       DEBUGFUNC("igb_mng_write_dhcp_info_generic");
-
-       hdr.command_id = E1000_MNG_DHCP_TX_PAYLOAD_CMD;
-       hdr.command_length = length;
-       hdr.reserved1 = 0;
-       hdr.reserved2 = 0;
-       hdr.checksum = 0;
-
-       /* Enable the host interface */
-       ret_val = hw->mac.ops.mng_enable_host_if(hw);
-       if (ret_val)
-               goto out;
-
-       /* Populate the host interface with the contents of "buffer". */
-       ret_val = hw->mac.ops.mng_host_if_write(hw, buffer, length,
-                                         sizeof(hdr), &(hdr.checksum));
-       if (ret_val)
-               goto out;
-
-       /* Write the manageability command header */
-       ret_val = hw->mac.ops.mng_write_cmd_header(hw, &hdr);
-       if (ret_val)
-               goto out;
-
-       /* Tell the ARC a new command is pending. */
-       hicr = E1000_READ_REG(hw, E1000_HICR);
-       E1000_WRITE_REG(hw, E1000_HICR, hicr | E1000_HICR_C);
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_mng_write_cmd_header_generic - Writes manageability command header
- *  @hw: pointer to the HW structure
- *  @hdr: pointer to the host interface command header
- *
- *  Writes the command header after does the checksum calculation.
- **/
-s32 e1000_mng_write_cmd_header_generic(struct e1000_hw *hw,
-                                    struct e1000_host_mng_command_header *hdr)
-{
-       u16 i, length = sizeof(struct e1000_host_mng_command_header);
-
-       DEBUGFUNC("igb_mng_write_cmd_header_generic");
-
-       /* Write the whole command header structure with new checksum. */
-
-       hdr->checksum = e1000_calculate_checksum((u8 *)hdr, length);
-
-       length >>= 2;
-       /* Write the relevant command block into the ram area. */
-       for (i = 0; i < length; i++) {
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, i,
-                                           *((u32 *) hdr + i));
-               E1000_WRITE_FLUSH(hw);
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  e1000_mng_host_if_write_generic - Write to the manageability host interface
- *  @hw: pointer to the HW structure
- *  @buffer: pointer to the host interface buffer
- *  @length: size of the buffer
- *  @offset: location in the buffer to write to
- *  @sum: sum of the data (not checksum)
- *
- *  This function writes the buffer content at the offset given on the host if.
- *  It also does alignment considerations to do the writes in most efficient
- *  way.  Also fills up the sum of the buffer in *buffer parameter.
- **/
-s32 e1000_mng_host_if_write_generic(struct e1000_hw *hw, u8 *buffer,
-                                    u16 length, u16 offset, u8 *sum)
-{
-       u8 *tmp;
-       u8 *bufptr = buffer;
-       u32 data = 0;
-       s32 ret_val = E1000_SUCCESS;
-       u16 remaining, i, j, prev_bytes;
-
-       DEBUGFUNC("igb_mng_host_if_write_generic");
-
-       /* sum = only sum of the data and it is not checksum */
-
-       if (length == 0 || offset + length > E1000_HI_MAX_MNG_DATA_LENGTH) {
-               ret_val = -E1000_ERR_PARAM;
-               goto out;
-       }
-
-       tmp = (u8 *)&data;
-       prev_bytes = offset & 0x3;
-       offset >>= 2;
-
-       if (prev_bytes) {
-               data = E1000_READ_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset);
-               for (j = prev_bytes; j < sizeof(u32); j++) {
-                       *(tmp + j) = *bufptr++;
-                       *sum += *(tmp + j);
-               }
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset, data);
-               length -= j - prev_bytes;
-               offset++;
-       }
-
-       remaining = length & 0x3;
-       length -= remaining;
-
-       /* Calculate length in DWORDs */
-       length >>= 2;
-
-       /*
-        * The device driver writes the relevant command block into the
-        * ram area.
-        */
-       for (i = 0; i < length; i++) {
-               for (j = 0; j < sizeof(u32); j++) {
-                       *(tmp + j) = *bufptr++;
-                       *sum += *(tmp + j);
-               }
-
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset + i,
-                                           data);
-       }
-       if (remaining) {
-               for (j = 0; j < sizeof(u32); j++) {
-                       if (j < remaining)
-                               *(tmp + j) = *bufptr++;
-                       else
-                               *(tmp + j) = 0;
-
-                       *sum += *(tmp + j);
-               }
-               E1000_WRITE_REG_ARRAY_DWORD(hw, E1000_HOST_IF, offset + i, data);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  e1000_enable_mng_pass_thru - Enable processing of ARP's
- *  @hw: pointer to the HW structure
- *
- *  Verifies the hardware needs to allow ARPs to be processed by the host.
- **/
-bool e1000_enable_mng_pass_thru(struct e1000_hw *hw)
-{
-       u32 manc;
-       u32 fwsm, factps;
-       bool ret_val = false;
-
-       DEBUGFUNC("igb_enable_mng_pass_thru");
-
-       if (!hw->mac.asf_firmware_present)
-               goto out;
-
-       manc = E1000_READ_REG(hw, E1000_MANC);
-
-       if (!(manc & E1000_MANC_RCV_TCO_EN) ||
-           !(manc & E1000_MANC_EN_MAC_ADDR_FILTER))
-               goto out;
-
-       if (hw->mac.arc_subsystem_valid) {
-               fwsm = E1000_READ_REG(hw, E1000_FWSM);
-               factps = E1000_READ_REG(hw, E1000_FACTPS);
-
-               if (!(factps & E1000_FACTPS_MNGCG) &&
-                   ((fwsm & E1000_FWSM_MODE_MASK) ==
-                    (e1000_mng_mode_pt << E1000_FWSM_MODE_SHIFT))) {
-                       ret_val = true;
-                       goto out;
-               }
-       } else {
-               if ((manc & E1000_MANC_SMBUS_EN) &&
-                   !(manc & E1000_MANC_ASF_EN)) {
-                       ret_val = true;
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-#endif
diff --git a/src/drivers/net/igb/igb_manage.h b/src/drivers/net/igb/igb_manage.h
deleted file mode 100644 (file)
index ff70d8c..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#ifndef _IGB_MANAGE_H_
-#define _IGB_MANAGE_H_
-
-bool e1000_check_mng_mode_generic(struct e1000_hw *hw);
-bool e1000_enable_tx_pkt_filtering_generic(struct e1000_hw *hw);
-s32  e1000_mng_enable_host_if_generic(struct e1000_hw *hw);
-s32  e1000_mng_host_if_write_generic(struct e1000_hw *hw, u8 *buffer,
-                                     u16 length, u16 offset, u8 *sum);
-s32  e1000_mng_write_cmd_header_generic(struct e1000_hw *hw,
-                                    struct e1000_host_mng_command_header *hdr);
-s32  e1000_mng_write_dhcp_info_generic(struct e1000_hw *hw,
-                                       u8 *buffer, u16 length);
-bool e1000_enable_mng_pass_thru(struct e1000_hw *hw);
-
-enum e1000_mng_mode {
-       e1000_mng_mode_none = 0,
-       e1000_mng_mode_asf,
-       e1000_mng_mode_pt,
-       e1000_mng_mode_ipmi,
-       e1000_mng_mode_host_if_only
-};
-
-#define E1000_FACTPS_MNGCG    0x20000000
-
-#define E1000_FWSM_MODE_MASK  0xE
-#define E1000_FWSM_MODE_SHIFT 1
-
-#define E1000_MNG_IAMT_MODE                  0x3
-#define E1000_MNG_DHCP_COOKIE_LENGTH         0x10
-#define E1000_MNG_DHCP_COOKIE_OFFSET         0x6F0
-#define E1000_MNG_DHCP_COMMAND_TIMEOUT       10
-#define E1000_MNG_DHCP_TX_PAYLOAD_CMD        64
-#define E1000_MNG_DHCP_COOKIE_STATUS_PARSING 0x1
-#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN    0x2
-
-#define E1000_VFTA_ENTRY_SHIFT               5
-#define E1000_VFTA_ENTRY_MASK                0x7F
-#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK      0x1F
-
-#define E1000_HI_MAX_BLOCK_BYTE_LENGTH       1792 /* Num of bytes in range */
-#define E1000_HI_MAX_BLOCK_DWORD_LENGTH      448 /* Num of dwords in range */
-#define E1000_HI_COMMAND_TIMEOUT             500 /* Process HI command limit */
-
-#define E1000_HICR_EN              0x01  /* Enable bit - RO */
-/* Driver sets this bit when done to put command in RAM */
-#define E1000_HICR_C               0x02
-#define E1000_HICR_SV              0x04  /* Status Validity */
-#define E1000_HICR_FW_RESET_ENABLE 0x40
-#define E1000_HICR_FW_RESET        0x80
-
-/* Intel(R) Active Management Technology signature */
-#define E1000_IAMT_SIGNATURE  0x544D4149
-
-#endif /* _IGB_MANAGE_H_ */
diff --git a/src/drivers/net/igb/igb_nvm.c b/src/drivers/net/igb/igb_nvm.c
deleted file mode 100644 (file)
index 1bad567..0000000
+++ /dev/null
@@ -1,627 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#include "igb.h"
-
-static void igb_stop_nvm(struct e1000_hw *hw);
-static void igb_reload_nvm_generic(struct e1000_hw *hw);
-
-/**
- *  igb_init_nvm_ops_generic - Initialize NVM function pointers
- *  @hw: pointer to the HW structure
- *
- *  Setups up the function pointers to no-op functions
- **/
-void igb_init_nvm_ops_generic(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       DEBUGFUNC("igb_init_nvm_ops_generic");
-
-       /* Initialize function pointers */
-       nvm->ops.reload = igb_reload_nvm_generic;
-}
-
-/**
- *  igb_raise_eec_clk - Raise EEPROM clock
- *  @hw: pointer to the HW structure
- *  @eecd: pointer to the EEPROM
- *
- *  Enable/Raise the EEPROM clock bit.
- **/
-static void igb_raise_eec_clk(struct e1000_hw *hw, u32 *eecd)
-{
-       *eecd = *eecd | E1000_EECD_SK;
-       E1000_WRITE_REG(hw, E1000_EECD, *eecd);
-       E1000_WRITE_FLUSH(hw);
-       usec_delay(hw->nvm.delay_usec);
-}
-
-/**
- *  igb_lower_eec_clk - Lower EEPROM clock
- *  @hw: pointer to the HW structure
- *  @eecd: pointer to the EEPROM
- *
- *  Clear/Lower the EEPROM clock bit.
- **/
-static void igb_lower_eec_clk(struct e1000_hw *hw, u32 *eecd)
-{
-       *eecd = *eecd & ~E1000_EECD_SK;
-       E1000_WRITE_REG(hw, E1000_EECD, *eecd);
-       E1000_WRITE_FLUSH(hw);
-       usec_delay(hw->nvm.delay_usec);
-}
-
-/**
- *  igb_shift_out_eec_bits - Shift data bits our to the EEPROM
- *  @hw: pointer to the HW structure
- *  @data: data to send to the EEPROM
- *  @count: number of bits to shift out
- *
- *  We need to shift 'count' bits out to the EEPROM.  So, the value in the
- *  "data" parameter will be shifted out to the EEPROM one bit at a time.
- *  In order to do this, "data" must be broken down into bits.
- **/
-static void igb_shift_out_eec_bits(struct e1000_hw *hw, u16 data, u16 count)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = E1000_READ_REG(hw, E1000_EECD);
-       u32 mask;
-
-       DEBUGFUNC("igb_shift_out_eec_bits");
-
-       mask = 0x01 << (count - 1);
-       if (nvm->type == e1000_nvm_eeprom_spi)
-               eecd |= E1000_EECD_DO;
-
-       do {
-               eecd &= ~E1000_EECD_DI;
-
-               if (data & mask)
-                       eecd |= E1000_EECD_DI;
-
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               E1000_WRITE_FLUSH(hw);
-
-               usec_delay(nvm->delay_usec);
-
-               igb_raise_eec_clk(hw, &eecd);
-               igb_lower_eec_clk(hw, &eecd);
-
-               mask >>= 1;
-       } while (mask);
-
-       eecd &= ~E1000_EECD_DI;
-       E1000_WRITE_REG(hw, E1000_EECD, eecd);
-}
-
-/**
- *  igb_shift_in_eec_bits - Shift data bits in from the EEPROM
- *  @hw: pointer to the HW structure
- *  @count: number of bits to shift in
- *
- *  In order to read a register from the EEPROM, we need to shift 'count' bits
- *  in from the EEPROM.  Bits are "shifted in" by raising the clock input to
- *  the EEPROM (setting the SK bit), and then reading the value of the data out
- *  "DO" bit.  During this "shifting in" process the data in "DI" bit should
- *  always be clear.
- **/
-static u16 igb_shift_in_eec_bits(struct e1000_hw *hw, u16 count)
-{
-       u32 eecd;
-       u32 i;
-       u16 data;
-
-       DEBUGFUNC("igb_shift_in_eec_bits");
-
-       eecd = E1000_READ_REG(hw, E1000_EECD);
-
-       eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);
-       data = 0;
-
-       for (i = 0; i < count; i++) {
-               data <<= 1;
-               igb_raise_eec_clk(hw, &eecd);
-
-               eecd = E1000_READ_REG(hw, E1000_EECD);
-
-               eecd &= ~E1000_EECD_DI;
-               if (eecd & E1000_EECD_DO)
-                       data |= 1;
-
-               igb_lower_eec_clk(hw, &eecd);
-       }
-
-       return data;
-}
-
-/**
- *  igb_poll_eerd_eewr_done - Poll for EEPROM read/write completion
- *  @hw: pointer to the HW structure
- *  @ee_reg: EEPROM flag for polling
- *
- *  Polls the EEPROM status bit for either read or write completion based
- *  upon the value of 'ee_reg'.
- **/
-s32 igb_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg)
-{
-       u32 attempts = 100000;
-       u32 i, reg = 0;
-       s32 ret_val = -E1000_ERR_NVM;
-
-       DEBUGFUNC("igb_poll_eerd_eewr_done");
-
-       for (i = 0; i < attempts; i++) {
-               if (ee_reg == E1000_NVM_POLL_READ)
-                       reg = E1000_READ_REG(hw, E1000_EERD);
-               else
-                       reg = E1000_READ_REG(hw, E1000_EEWR);
-
-               if (reg & E1000_NVM_RW_REG_DONE) {
-                       ret_val = E1000_SUCCESS;
-                       break;
-               }
-
-               usec_delay(5);
-       }
-
-       return ret_val;
-}
-
-/**
- *  igb_acquire_nvm_generic - Generic request for access to EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Set the EEPROM access request bit and wait for EEPROM access grant bit.
- *  Return successful if access grant bit set, else clear the request for
- *  EEPROM access and return -E1000_ERR_NVM (-1).
- **/
-s32 igb_acquire_nvm_generic(struct e1000_hw *hw)
-{
-       u32 eecd = E1000_READ_REG(hw, E1000_EECD);
-       s32 timeout = E1000_NVM_GRANT_ATTEMPTS;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_acquire_nvm_generic");
-
-       E1000_WRITE_REG(hw, E1000_EECD, eecd | E1000_EECD_REQ);
-       eecd = E1000_READ_REG(hw, E1000_EECD);
-
-       while (timeout) {
-               if (eecd & E1000_EECD_GNT)
-                       break;
-               usec_delay(5);
-               eecd = E1000_READ_REG(hw, E1000_EECD);
-               timeout--;
-       }
-
-       if (!timeout) {
-               eecd &= ~E1000_EECD_REQ;
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               DEBUGOUT("Could not acquire NVM grant\n");
-               ret_val = -E1000_ERR_NVM;
-       }
-
-       return ret_val;
-}
-
-/**
- *  igb_standby_nvm - Return EEPROM to standby state
- *  @hw: pointer to the HW structure
- *
- *  Return the EEPROM to a standby state.
- **/
-static void igb_standby_nvm(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = E1000_READ_REG(hw, E1000_EECD);
-
-       DEBUGFUNC("igb_standby_nvm");
-
-       if (nvm->type == e1000_nvm_eeprom_spi) {
-               /* Toggle CS to flush commands */
-               eecd |= E1000_EECD_CS;
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               E1000_WRITE_FLUSH(hw);
-               usec_delay(nvm->delay_usec);
-               eecd &= ~E1000_EECD_CS;
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               E1000_WRITE_FLUSH(hw);
-               usec_delay(nvm->delay_usec);
-       }
-}
-
-/**
- *  igb_stop_nvm - Terminate EEPROM command
- *  @hw: pointer to the HW structure
- *
- *  Terminates the current command by inverting the EEPROM's chip select pin.
- **/
-static void igb_stop_nvm(struct e1000_hw *hw)
-{
-       u32 eecd;
-
-       DEBUGFUNC("igb_stop_nvm");
-
-       eecd = E1000_READ_REG(hw, E1000_EECD);
-       if (hw->nvm.type == e1000_nvm_eeprom_spi) {
-               /* Pull CS high */
-               eecd |= E1000_EECD_CS;
-               igb_lower_eec_clk(hw, &eecd);
-       }
-}
-
-/**
- *  igb_release_nvm_generic - Release exclusive access to EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Stop any current commands to the EEPROM and clear the EEPROM request bit.
- **/
-void igb_release_nvm_generic(struct e1000_hw *hw)
-{
-       u32 eecd;
-
-       DEBUGFUNC("igb_release_nvm_generic");
-
-       igb_stop_nvm(hw);
-
-       eecd = E1000_READ_REG(hw, E1000_EECD);
-       eecd &= ~E1000_EECD_REQ;
-       E1000_WRITE_REG(hw, E1000_EECD, eecd);
-}
-
-/**
- *  igb_ready_nvm_eeprom - Prepares EEPROM for read/write
- *  @hw: pointer to the HW structure
- *
- *  Setups the EEPROM for reading and writing.
- **/
-static s32 igb_ready_nvm_eeprom(struct e1000_hw *hw)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 eecd = E1000_READ_REG(hw, E1000_EECD);
-       s32 ret_val = E1000_SUCCESS;
-       u16 timeout = 0;
-       u8 spi_stat_reg;
-
-       DEBUGFUNC("igb_ready_nvm_eeprom");
-
-       if (nvm->type == e1000_nvm_eeprom_spi) {
-               /* Clear SK and CS */
-               eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-               E1000_WRITE_REG(hw, E1000_EECD, eecd);
-               usec_delay(1);
-               timeout = NVM_MAX_RETRY_SPI;
-
-               /*
-                * Read "Status Register" repeatedly until the LSB is cleared.
-                * The EEPROM will signal that the command has been completed
-                * by clearing bit 0 of the internal status register.  If it's
-                * not cleared within 'timeout', then error out.
-                */
-               while (timeout) {
-                       igb_shift_out_eec_bits(hw, NVM_RDSR_OPCODE_SPI,
-                                                hw->nvm.opcode_bits);
-                       spi_stat_reg = (u8)igb_shift_in_eec_bits(hw, 8);
-                       if (!(spi_stat_reg & NVM_STATUS_RDY_SPI))
-                               break;
-
-                       usec_delay(5);
-                       igb_standby_nvm(hw);
-                       timeout--;
-               }
-
-               if (!timeout) {
-                       DEBUGOUT("SPI NVM Status error\n");
-                       ret_val = -E1000_ERR_NVM;
-                       goto out;
-               }
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_read_nvm_eerd - Reads EEPROM using EERD register
- *  @hw: pointer to the HW structure
- *  @offset: offset of word in the EEPROM to read
- *  @words: number of words to read
- *  @data: word read from the EEPROM
- *
- *  Reads a 16 bit word from the EEPROM using the EERD register.
- **/
-s32 igb_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       u32 i, eerd = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_read_nvm_eerd");
-
-       /*
-        * A check for invalid values:  offset too large, too many words,
-        * too many words for the offset, and not enough words.
-        */
-       if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-           (words == 0)) {
-               DEBUGOUT("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       for (i = 0; i < words; i++) {
-               eerd = ((offset+i) << E1000_NVM_RW_ADDR_SHIFT) +
-                      E1000_NVM_RW_REG_START;
-
-               E1000_WRITE_REG(hw, E1000_EERD, eerd);
-               ret_val = igb_poll_eerd_eewr_done(hw, E1000_NVM_POLL_READ);
-               if (ret_val)
-                       break;
-
-               data[i] = (E1000_READ_REG(hw, E1000_EERD) >>
-                          E1000_NVM_RW_REG_DATA);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_write_nvm_spi - Write to EEPROM using SPI
- *  @hw: pointer to the HW structure
- *  @offset: offset within the EEPROM to be written to
- *  @words: number of words to write
- *  @data: 16 bit word(s) to be written to the EEPROM
- *
- *  Writes data to EEPROM at offset using SPI interface.
- *
- *  If e1000_update_nvm_checksum is not called after this function , the
- *  EEPROM will most likely contain an invalid checksum.
- **/
-s32 igb_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
-{
-       struct e1000_nvm_info *nvm = &hw->nvm;
-       s32 ret_val;
-       u16 widx = 0;
-
-       DEBUGFUNC("igb_write_nvm_spi");
-
-       /*
-        * A check for invalid values:  offset too large, too many words,
-        * and not enough words.
-        */
-       if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
-           (words == 0)) {
-               DEBUGOUT("nvm parameter(s) out of bounds\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-       ret_val = nvm->ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       while (widx < words) {
-               u8 write_opcode = NVM_WRITE_OPCODE_SPI;
-
-               ret_val = igb_ready_nvm_eeprom(hw);
-               if (ret_val)
-                       goto release;
-
-               igb_standby_nvm(hw);
-
-               /* Send the WRITE ENABLE command (8 bit opcode) */
-               igb_shift_out_eec_bits(hw, NVM_WREN_OPCODE_SPI,
-                                        nvm->opcode_bits);
-
-               igb_standby_nvm(hw);
-
-               /*
-                * Some SPI eeproms use the 8th address bit embedded in the
-                * opcode
-                */
-               if ((nvm->address_bits == 8) && (offset >= 128))
-                       write_opcode |= NVM_A8_OPCODE_SPI;
-
-               /* Send the Write command (8-bit opcode + addr) */
-               igb_shift_out_eec_bits(hw, write_opcode, nvm->opcode_bits);
-               igb_shift_out_eec_bits(hw, (u16)((offset + widx) * 2),
-                                        nvm->address_bits);
-
-               /* Loop to allow for up to whole page write of eeprom */
-               while (widx < words) {
-                       u16 word_out = data[widx];
-                       word_out = (word_out >> 8) | (word_out << 8);
-                       igb_shift_out_eec_bits(hw, word_out, 16);
-                       widx++;
-
-                       if ((((offset + widx) * 2) % nvm->page_size) == 0) {
-                               igb_standby_nvm(hw);
-                               break;
-                       }
-               }
-       }
-
-       msec_delay(10);
-release:
-       nvm->ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_read_pba_num_generic - Read device part number
- *  @hw: pointer to the HW structure
- *  @pba_num: pointer to device part number
- *
- *  Reads the product board assembly (PBA) number from the EEPROM and stores
- *  the value in pba_num.
- **/
-s32 igb_read_pba_num_generic(struct e1000_hw *hw, u32 *pba_num)
-{
-       s32  ret_val;
-       u16 nvm_data;
-
-       DEBUGFUNC("igb_read_pba_num_generic");
-
-       ret_val = hw->nvm.ops.read(hw, NVM_PBA_OFFSET_0, 1, &nvm_data);
-       if (ret_val) {
-               DEBUGOUT("NVM Read Error\n");
-               goto out;
-       }
-       *pba_num = (u32)(nvm_data << 16);
-
-       ret_val = hw->nvm.ops.read(hw, NVM_PBA_OFFSET_1, 1, &nvm_data);
-       if (ret_val) {
-               DEBUGOUT("NVM Read Error\n");
-               goto out;
-       }
-       *pba_num |= nvm_data;
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_read_mac_addr_generic - Read device MAC address
- *  @hw: pointer to the HW structure
- *
- *  Reads the device MAC address from the EEPROM and stores the value.
- *  Since devices with two ports use the same EEPROM, we increment the
- *  last bit in the MAC address for the second port.
- **/
-s32 igb_read_mac_addr_generic(struct e1000_hw *hw)
-{
-       u32 rar_high;
-       u32 rar_low;
-       u16 i;
-
-       rar_high = E1000_READ_REG(hw, E1000_RAH(0));
-       rar_low = E1000_READ_REG(hw, E1000_RAL(0));
-
-       for (i = 0; i < E1000_RAL_MAC_ADDR_LEN; i++)
-               hw->mac.perm_addr[i] = (u8)(rar_low >> (i*8));
-
-       for (i = 0; i < E1000_RAH_MAC_ADDR_LEN; i++)
-               hw->mac.perm_addr[i+4] = (u8)(rar_high >> (i*8));
-
-       for (i = 0; i < ETH_ADDR_LEN; i++)
-               hw->mac.addr[i] = hw->mac.perm_addr[i];
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_validate_nvm_checksum_generic - Validate EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Calculates the EEPROM checksum by reading/adding each word of the EEPROM
- *  and then verifies that the sum of the EEPROM is equal to 0xBABA.
- **/
-s32 igb_validate_nvm_checksum_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 checksum = 0;
-       u16 i, nvm_data;
-
-       DEBUGFUNC("igb_validate_nvm_checksum_generic");
-
-       for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) {
-               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       DEBUGOUT("NVM Read Error\n");
-                       goto out;
-               }
-               checksum += nvm_data;
-       }
-
-       if (checksum != (u16) NVM_SUM) {
-               DEBUGOUT("NVM Checksum Invalid\n");
-               ret_val = -E1000_ERR_NVM;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_update_nvm_checksum_generic - Update EEPROM checksum
- *  @hw: pointer to the HW structure
- *
- *  Updates the EEPROM checksum by reading/adding each word of the EEPROM
- *  up to the checksum.  Then calculates the EEPROM checksum and writes the
- *  value to the EEPROM.
- **/
-s32 igb_update_nvm_checksum_generic(struct e1000_hw *hw)
-{
-       s32  ret_val;
-       u16 checksum = 0;
-       u16 i, nvm_data;
-
-       DEBUGFUNC("igb_update_nvm_checksum");
-
-       for (i = 0; i < NVM_CHECKSUM_REG; i++) {
-               ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
-               if (ret_val) {
-                       DEBUGOUT("NVM Read Error while updating checksum.\n");
-                       goto out;
-               }
-               checksum += nvm_data;
-       }
-       checksum = (u16) NVM_SUM - checksum;
-       ret_val = hw->nvm.ops.write(hw, NVM_CHECKSUM_REG, 1, &checksum);
-       if (ret_val) {
-               DEBUGOUT("NVM Write Error while updating checksum.\n");
-        }
-out:
-       return ret_val;
-}
-
-/**
- *  igb_reload_nvm_generic - Reloads EEPROM
- *  @hw: pointer to the HW structure
- *
- *  Reloads the EEPROM by setting the "Reinitialize from EEPROM" bit in the
- *  extended control register.
- **/
-static void igb_reload_nvm_generic(struct e1000_hw *hw)
-{
-       u32 ctrl_ext;
-
-       DEBUGFUNC("igb_reload_nvm_generic");
-
-       usec_delay(10);
-       ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
-       ctrl_ext |= E1000_CTRL_EXT_EE_RST;
-       E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
-       E1000_WRITE_FLUSH(hw);
-}
-
diff --git a/src/drivers/net/igb/igb_nvm.h b/src/drivers/net/igb/igb_nvm.h
deleted file mode 100644 (file)
index 6b54d44..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#ifndef _IGB_NVM_H_
-#define _IGB_NVM_H_
-
-void igb_init_nvm_ops_generic(struct e1000_hw *hw);
-s32  igb_acquire_nvm_generic(struct e1000_hw *hw);
-
-s32  igb_poll_eerd_eewr_done(struct e1000_hw *hw, int ee_reg);
-s32  igb_read_mac_addr_generic(struct e1000_hw *hw);
-s32  igb_read_pba_num_generic(struct e1000_hw *hw, u32 *pba_num);
-s32  igb_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words,
-                         u16 *data);
-s32  igb_valid_led_default_generic(struct e1000_hw *hw, u16 *data);
-s32  igb_validate_nvm_checksum_generic(struct e1000_hw *hw);
-s32  igb_write_nvm_eewr(struct e1000_hw *hw, u16 offset,
-                          u16 words, u16 *data);
-s32  igb_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words,
-                         u16 *data);
-s32  igb_update_nvm_checksum_generic(struct e1000_hw *hw);
-void igb_release_nvm_generic(struct e1000_hw *hw);
-
-#define E1000_STM_OPCODE  0xDB00
-
-#endif /* _IGB_NVM_H_ */
diff --git a/src/drivers/net/igb/igb_osdep.h b/src/drivers/net/igb/igb_osdep.h
deleted file mode 100644 (file)
index 84f490f..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-/* glue for the OS independent part of e1000
- * includes register access macros
- */
-
-#ifndef _IGB_OSDEP_H_
-#define _IGB_OSDEP_H_
-
-/* Begin OS Dependencies */
-
-#define u8         unsigned char
-#define bool       boolean_t
-#define dma_addr_t unsigned long
-#define __le16     uint16_t
-#define __le32     uint32_t
-#define __le64     uint64_t
-
-#define __iomem
-#define __devinit
-
-#define msleep(x) mdelay(x)
-
-#define ETH_FCS_LEN 4
-
-typedef int spinlock_t;
-typedef enum {
-    false = 0,
-    true = 1
-} boolean_t;
-
-#define TRUE  1
-#define FALSE 0
-
-#define usec_delay(x) udelay(x)
-#define msec_delay(x) mdelay(x)
-#define msec_delay_irq(x) mdelay(x)
-
-/* End OS Dependencies */
-
-#define PCI_COMMAND_REGISTER   PCI_COMMAND
-#define CMD_MEM_WRT_INVALIDATE PCI_COMMAND_INVALIDATE
-#define ETH_ADDR_LEN           ETH_ALEN
-
-#define DEBUGOUT(S) if (0) { printf(S); }
-#define DEBUGOUT1(S, A...) if (0) { printf(S, A); }
-
-#define DEBUGFUNC(F) DEBUGOUT(F "\n")
-#define DEBUGOUT2 DEBUGOUT1
-#define DEBUGOUT3 DEBUGOUT2
-#define DEBUGOUT7 DEBUGOUT3
-
-#define E1000_REGISTER(a, reg) (reg)
-
-#define E1000_WRITE_REG(a, reg, value) do {  \
-                writel((value), ((a)->hw_addr + E1000_REGISTER(a, reg))); } while (0)
-
-#define E1000_READ_REG(a, reg) (readl((a)->hw_addr + E1000_REGISTER(a, reg)))
-
-#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) do { \
-          writel((value), ((a)->hw_addr + E1000_REGISTER(a, reg) + ((offset) << 2))); } while (0);
-
-#define E1000_READ_REG_ARRAY(a, reg, offset) ( \
-    readl((a)->hw_addr + E1000_REGISTER(a, reg) + ((offset) << 2)))
-
-#define E1000_READ_REG_ARRAY_DWORD E1000_READ_REG_ARRAY
-#define E1000_WRITE_REG_ARRAY_DWORD E1000_WRITE_REG_ARRAY
-
-#define E1000_WRITE_REG_ARRAY_WORD(a, reg, offset, value) ( \
-    writew((value), ((a)->hw_addr + E1000_REGISTER(a, reg) + ((offset) << 1))))
-
-#define E1000_READ_REG_ARRAY_WORD(a, reg, offset) ( \
-    readw((a)->hw_addr + E1000_REGISTER(a, reg) + ((offset) << 1)))
-
-#define E1000_WRITE_REG_ARRAY_BYTE(a, reg, offset, value) ( \
-    writeb((value), ((a)->hw_addr + E1000_REGISTER(a, reg) + (offset))))
-
-#define E1000_READ_REG_ARRAY_BYTE(a, reg, offset) ( \
-    readb((a)->hw_addr + E1000_REGISTER(a, reg) + (offset)))
-
-#define E1000_WRITE_REG_IO(a, reg, offset) do { \
-    outl(reg, ((a)->io_base));                  \
-    outl(offset, ((a)->io_base + 4));      } while (0)
-
-#define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, E1000_STATUS)
-
-#define E1000_WRITE_FLASH_REG(a, reg, value) ( \
-    writel((value), ((a)->flash_address + reg)))
-
-#define E1000_WRITE_FLASH_REG16(a, reg, value) ( \
-    writew((value), ((a)->flash_address + reg)))
-
-#define E1000_READ_FLASH_REG(a, reg) (readl((a)->flash_address + reg))
-
-#define E1000_READ_FLASH_REG16(a, reg) (readw((a)->flash_address + reg))
-
-#endif /* _IGB_OSDEP_H_ */
diff --git a/src/drivers/net/igb/igb_phy.c b/src/drivers/net/igb/igb_phy.c
deleted file mode 100644 (file)
index 16664fd..0000000
+++ /dev/null
@@ -1,2470 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#include "igb.h"
-
-static s32 igb_phy_setup_autoneg(struct e1000_hw *hw);
-
-#if 0
-/* Cable length tables */
-static const u16 e1000_m88_cable_length_table[] =
-       { 0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };
-#define M88E1000_CABLE_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_m88_cable_length_table) / \
-                 sizeof(e1000_m88_cable_length_table[0]))
-
-static const u16 e1000_igp_2_cable_length_table[] =
-    { 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21,
-      0, 0, 0, 3, 6, 10, 13, 16, 19, 23, 26, 29, 32, 35, 38, 41,
-      6, 10, 14, 18, 22, 26, 30, 33, 37, 41, 44, 48, 51, 54, 58, 61,
-      21, 26, 31, 35, 40, 44, 49, 53, 57, 61, 65, 68, 72, 75, 79, 82,
-      40, 45, 51, 56, 61, 66, 70, 75, 79, 83, 87, 91, 94, 98, 101, 104,
-      60, 66, 72, 77, 82, 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121,
-      83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,
-      104, 109, 114, 118, 121, 124};
-#define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \
-                (sizeof(e1000_igp_2_cable_length_table) / \
-                 sizeof(e1000_igp_2_cable_length_table[0]))
-#endif
-
-/**
- *  igb_check_reset_block_generic - Check if PHY reset is blocked
- *  @hw: pointer to the HW structure
- *
- *  Read the PHY management control register and check whether a PHY reset
- *  is blocked.  If a reset is not blocked return E1000_SUCCESS, otherwise
- *  return E1000_BLK_PHY_RESET (12).
- **/
-s32 igb_check_reset_block_generic(struct e1000_hw *hw)
-{
-       u32 manc;
-
-       DEBUGFUNC("igb_check_reset_block");
-
-       manc = E1000_READ_REG(hw, E1000_MANC);
-
-       return (manc & E1000_MANC_BLK_PHY_RST_ON_IDE) ?
-              E1000_BLK_PHY_RESET : E1000_SUCCESS;
-}
-
-/**
- *  igb_get_phy_id - Retrieve the PHY ID and revision
- *  @hw: pointer to the HW structure
- *
- *  Reads the PHY registers and stores the PHY ID and possibly the PHY
- *  revision in the hardware structure.
- **/
-s32 igb_get_phy_id(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_id;
-
-       DEBUGFUNC("igb_get_phy_id");
-
-       if (!(phy->ops.read_reg))
-               goto out;
-
-               ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
-               if (ret_val)
-                       goto out;
-
-               phy->id = (u32)(phy_id << 16);
-               usec_delay(20);
-               ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id);
-               if (ret_val)
-                       goto out;
-
-               phy->id |= (u32)(phy_id & PHY_REVISION_MASK);
-               phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_phy_reset_dsp_generic - Reset PHY DSP
- *  @hw: pointer to the HW structure
- *
- *  Reset the digital signal processor.
- **/
-s32 igb_phy_reset_dsp_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_phy_reset_dsp_generic");
-
-       if (!(hw->phy.ops.write_reg))
-               goto out;
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0xC1);
-       if (ret_val)
-               goto out;
-
-       ret_val = hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_read_phy_reg_mdic - Read MDI control register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Reads the MDI control register in the PHY at offset and stores the
- *  information read to data.
- **/
-s32 igb_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 i, mdic = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_read_phy_reg_mdic");
-
-       /*
-        * Set up Op-code, Phy Address, and register offset in the MDI
-        * Control register.  The MAC will take care of interfacing with the
-        * PHY to retrieve the desired data.
-        */
-       mdic = ((offset << E1000_MDIC_REG_SHIFT) |
-               (phy->addr << E1000_MDIC_PHY_SHIFT) |
-               (E1000_MDIC_OP_READ));
-
-       E1000_WRITE_REG(hw, E1000_MDIC, mdic);
-
-       /*
-        * Poll the ready bit to see if the MDI read completed
-        * Increasing the time out as testing showed failures with
-        * the lower time out
-        */
-       for (i = 0; i < (E1000_GEN_POLL_TIMEOUT * 3); i++) {
-               usec_delay(50);
-               mdic = E1000_READ_REG(hw, E1000_MDIC);
-               if (mdic & E1000_MDIC_READY)
-                       break;
-       }
-       if (!(mdic & E1000_MDIC_READY)) {
-               DEBUGOUT("MDI Read did not complete\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-       if (mdic & E1000_MDIC_ERROR) {
-               DEBUGOUT("MDI Error\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-       *data = (u16) mdic;
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_write_phy_reg_mdic - Write MDI control register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write to register at offset
- *
- *  Writes data to MDI control register in the PHY at offset.
- **/
-s32 igb_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 i, mdic = 0;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_write_phy_reg_mdic");
-
-       /*
-        * Set up Op-code, Phy Address, and register offset in the MDI
-        * Control register.  The MAC will take care of interfacing with the
-        * PHY to retrieve the desired data.
-        */
-       mdic = (((u32)data) |
-               (offset << E1000_MDIC_REG_SHIFT) |
-               (phy->addr << E1000_MDIC_PHY_SHIFT) |
-               (E1000_MDIC_OP_WRITE));
-
-       E1000_WRITE_REG(hw, E1000_MDIC, mdic);
-
-       /*
-        * Poll the ready bit to see if the MDI read completed
-        * Increasing the time out as testing showed failures with
-        * the lower time out
-        */
-       for (i = 0; i < (E1000_GEN_POLL_TIMEOUT * 3); i++) {
-               usec_delay(50);
-               mdic = E1000_READ_REG(hw, E1000_MDIC);
-               if (mdic & E1000_MDIC_READY)
-                       break;
-       }
-       if (!(mdic & E1000_MDIC_READY)) {
-               DEBUGOUT("MDI Write did not complete\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-       if (mdic & E1000_MDIC_ERROR) {
-               DEBUGOUT("MDI Error\n");
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_read_phy_reg_i2c - Read PHY register using i2c
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Reads the PHY register at offset using the i2c interface and stores the
- *  retrieved information in data.
- **/
-s32 igb_read_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 i, i2ccmd = 0;
-
-       DEBUGFUNC("igb_read_phy_reg_i2c");
-
-       /*
-        * Set up Op-code, Phy Address, and register address in the I2CCMD
-        * register.  The MAC will take care of interfacing with the
-        * PHY to retrieve the desired data.
-        */
-       i2ccmd = ((offset << E1000_I2CCMD_REG_ADDR_SHIFT) |
-                 (phy->addr << E1000_I2CCMD_PHY_ADDR_SHIFT) |
-                 (E1000_I2CCMD_OPCODE_READ));
-
-       E1000_WRITE_REG(hw, E1000_I2CCMD, i2ccmd);
-
-       /* Poll the ready bit to see if the I2C read completed */
-       for (i = 0; i < E1000_I2CCMD_PHY_TIMEOUT; i++) {
-               usec_delay(50);
-               i2ccmd = E1000_READ_REG(hw, E1000_I2CCMD);
-               if (i2ccmd & E1000_I2CCMD_READY)
-                       break;
-       }
-       if (!(i2ccmd & E1000_I2CCMD_READY)) {
-               DEBUGOUT("I2CCMD Read did not complete\n");
-               return -E1000_ERR_PHY;
-       }
-       if (i2ccmd & E1000_I2CCMD_ERROR) {
-               DEBUGOUT("I2CCMD Error bit set\n");
-               return -E1000_ERR_PHY;
-       }
-
-       /* Need to byte-swap the 16-bit value. */
-       *data = ((i2ccmd >> 8) & 0x00FF) | ((i2ccmd << 8) & 0xFF00);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_write_phy_reg_i2c - Write PHY register using i2c
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Writes the data to PHY register at the offset using the i2c interface.
- **/
-s32 igb_write_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       u32 i, i2ccmd = 0;
-       u16 phy_data_swapped;
-
-       DEBUGFUNC("igb_write_phy_reg_i2c");
-
-       /* Swap the data bytes for the I2C interface */
-       phy_data_swapped = ((data >> 8) & 0x00FF) | ((data << 8) & 0xFF00);
-
-       /*
-        * Set up Op-code, Phy Address, and register address in the I2CCMD
-        * register.  The MAC will take care of interfacing with the
-        * PHY to retrieve the desired data.
-        */
-       i2ccmd = ((offset << E1000_I2CCMD_REG_ADDR_SHIFT) |
-                 (phy->addr << E1000_I2CCMD_PHY_ADDR_SHIFT) |
-                 E1000_I2CCMD_OPCODE_WRITE |
-                 phy_data_swapped);
-
-       E1000_WRITE_REG(hw, E1000_I2CCMD, i2ccmd);
-
-       /* Poll the ready bit to see if the I2C read completed */
-       for (i = 0; i < E1000_I2CCMD_PHY_TIMEOUT; i++) {
-               usec_delay(50);
-               i2ccmd = E1000_READ_REG(hw, E1000_I2CCMD);
-               if (i2ccmd & E1000_I2CCMD_READY)
-                       break;
-       }
-       if (!(i2ccmd & E1000_I2CCMD_READY)) {
-               DEBUGOUT("I2CCMD Write did not complete\n");
-               return -E1000_ERR_PHY;
-       }
-       if (i2ccmd & E1000_I2CCMD_ERROR) {
-               DEBUGOUT("I2CCMD Error bit set\n");
-               return -E1000_ERR_PHY;
-       }
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_read_phy_reg_m88 - Read m88 PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore, if necessary, then reads the PHY register at offset
- *  and storing the retrieved information in data.  Release any acquired
- *  semaphores before exiting.
- **/
-s32 igb_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_read_phy_reg_m88");
-
-       if (!(hw->phy.ops.acquire))
-               goto out;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                         data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_write_phy_reg_m88 - Write m88 PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore, if necessary, then writes the data to PHY register
- *  at the offset.  Release any acquired semaphores before exiting.
- **/
-s32 igb_write_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_write_phy_reg_m88");
-
-       if (!(hw->phy.ops.acquire))
-               goto out;
-
-       ret_val = hw->phy.ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = igb_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
-
-       hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  __igb_read_phy_reg_igp - Read igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *  @locked: semaphore has already been acquired or not
- *
- *  Acquires semaphore, if necessary, then reads the PHY register at offset
- *  and stores the retrieved information in data.  Release any acquired
- *  semaphores before exiting.
- **/
-static s32 __igb_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data,
-                                    bool locked)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("__igb_read_phy_reg_igp");
-
-       if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
-
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-               ret_val = igb_write_phy_reg_mdic(hw,
-                                                  IGP01E1000_PHY_PAGE_SELECT,
-                                                  (u16)offset);
-               if (ret_val)
-                       goto release;
-       }
-
-       ret_val = igb_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                         data);
-
-release:
-       if (!locked)
-               hw->phy.ops.release(hw);
-out:
-       return ret_val;
-}
-/**
- *  igb_read_phy_reg_igp - Read igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore then reads the PHY register at offset and stores the
- *  retrieved information in data.
- *  Release the acquired semaphore before exiting.
- **/
-s32 igb_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __igb_read_phy_reg_igp(hw, offset, data, false);
-}
-
-/**
- *  igb_read_phy_reg_igp_locked - Read igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Reads the PHY register at offset and stores the retrieved information
- *  in data.  Assumes semaphore already acquired.
- **/
-s32 igb_read_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __igb_read_phy_reg_igp(hw, offset, data, true);
-}
-
-/**
- *  igb_write_phy_reg_igp - Write igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *  @locked: semaphore has already been acquired or not
- *
- *  Acquires semaphore, if necessary, then writes the data to PHY register
- *  at the offset.  Release any acquired semaphores before exiting.
- **/
-static s32 __igb_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data,
-                                     bool locked)
-{
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_write_phy_reg_igp");
-
-       if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
-
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       if (offset > MAX_PHY_MULTI_PAGE_REG) {
-               ret_val = igb_write_phy_reg_mdic(hw,
-                                                  IGP01E1000_PHY_PAGE_SELECT,
-                                                  (u16)offset);
-               if (ret_val)
-                       goto release;
-       }
-
-       ret_val = igb_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset,
-                                          data);
-
-release:
-       if (!locked)
-               hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_write_phy_reg_igp - Write igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore then writes the data to PHY register
- *  at the offset.  Release any acquired semaphores before exiting.
- **/
-s32 igb_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __igb_write_phy_reg_igp(hw, offset, data, false);
-}
-
-/**
- *  igb_write_phy_reg_igp_locked - Write igp PHY register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Writes the data to PHY register at the offset.
- *  Assumes semaphore already acquired.
- **/
-s32 igb_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __igb_write_phy_reg_igp(hw, offset, data, true);
-}
-
-/**
- *  __igb_read_kmrn_reg - Read kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *  @locked: semaphore has already been acquired or not
- *
- *  Acquires semaphore, if necessary.  Then reads the PHY register at offset
- *  using the kumeran interface.  The information retrieved is stored in data.
- *  Release any acquired semaphores before exiting.
- **/
-static s32 __igb_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data,
-                                 bool locked)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("__igb_read_kmrn_reg");
-
-       if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
-
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
-       E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta);
-
-       usec_delay(2);
-
-       kmrnctrlsta = E1000_READ_REG(hw, E1000_KMRNCTRLSTA);
-       *data = (u16)kmrnctrlsta;
-
-       if (!locked)
-               hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_read_kmrn_reg_generic -  Read kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Acquires semaphore then reads the PHY register at offset using the
- *  kumeran interface.  The information retrieved is stored in data.
- *  Release the acquired semaphore before exiting.
- **/
-s32 igb_read_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __igb_read_kmrn_reg(hw, offset, data, false);
-}
-
-/**
- *  igb_read_kmrn_reg_locked -  Read kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to be read
- *  @data: pointer to the read data
- *
- *  Reads the PHY register at offset using the kumeran interface.  The
- *  information retrieved is stored in data.
- *  Assumes semaphore already acquired.
- **/
-s32 igb_read_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 *data)
-{
-       return __igb_read_kmrn_reg(hw, offset, data, true);
-}
-
-/**
- *  __igb_write_kmrn_reg - Write kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *  @locked: semaphore has already been acquired or not
- *
- *  Acquires semaphore, if necessary.  Then write the data to PHY register
- *  at the offset using the kumeran interface.  Release any acquired semaphores
- *  before exiting.
- **/
-static s32 __igb_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data,
-                                  bool locked)
-{
-       u32 kmrnctrlsta;
-       s32 ret_val = E1000_SUCCESS;
-
-       DEBUGFUNC("igb_write_kmrn_reg_generic");
-
-       if (!locked) {
-               if (!(hw->phy.ops.acquire))
-                       goto out;
-
-               ret_val = hw->phy.ops.acquire(hw);
-               if (ret_val)
-                       goto out;
-       }
-
-       kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
-                      E1000_KMRNCTRLSTA_OFFSET) | data;
-       E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta);
-
-       usec_delay(2);
-
-       if (!locked)
-               hw->phy.ops.release(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_write_kmrn_reg_generic -  Write kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Acquires semaphore then writes the data to the PHY register at the offset
- *  using the kumeran interface.  Release the acquired semaphore before exiting.
- **/
-s32 igb_write_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __igb_write_kmrn_reg(hw, offset, data, false);
-}
-
-/**
- *  igb_write_kmrn_reg_locked -  Write kumeran register
- *  @hw: pointer to the HW structure
- *  @offset: register offset to write to
- *  @data: data to write at register offset
- *
- *  Write the data to PHY register at the offset using the kumeran interface.
- *  Assumes semaphore already acquired.
- **/
-s32 igb_write_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 data)
-{
-       return __igb_write_kmrn_reg(hw, offset, data, true);
-}
-
-/**
- *  igb_copper_link_setup_m88 - Setup m88 PHY's for copper link
- *  @hw: pointer to the HW structure
- *
- *  Sets up MDI/MDI-X and polarity for m88 PHY's.  If necessary, transmit clock
- *  and downshift values are set also.
- **/
-s32 igb_copper_link_setup_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-
-       DEBUGFUNC("igb_copper_link_setup_m88");
-
-       if (phy->reset_disable) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       /* Enable CRS on TX. This must be set for half-duplex operation. */
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-
-       /*
-        * Options:
-        *   MDI/MDI-X = 0 (default)
-        *   0 - Auto for all speeds
-        *   1 - MDI mode
-        *   2 - MDI-X mode
-        *   3 - Auto for 1000Base-T only (MDI-X for 10/100Base-T modes)
-        */
-       phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-
-       switch (phy->mdix) {
-       case 1:
-               phy_data |= M88E1000_PSCR_MDI_MANUAL_MODE;
-               break;
-       case 2:
-               phy_data |= M88E1000_PSCR_MDIX_MANUAL_MODE;
-               break;
-       case 3:
-               phy_data |= M88E1000_PSCR_AUTO_X_1000T;
-               break;
-       case 0:
-       default:
-               phy_data |= M88E1000_PSCR_AUTO_X_MODE;
-               break;
-       }
-
-       /*
-        * Options:
-        *   disable_polarity_correction = 0 (default)
-        *       Automatic Correction for Reversed Cable Polarity
-        *   0 - Disabled
-        *   1 - Enabled
-        */
-       phy_data &= ~M88E1000_PSCR_POLARITY_REVERSAL;
-       if (phy->disable_polarity_correction == 1)
-               phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
-
-       ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       if (phy->revision < E1000_REVISION_4) {
-               /*
-                * Force TX_CLK in the Extended PHY Specific Control Register
-                * to 25MHz clock.
-                */
-               ret_val = phy->ops.read_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                            &phy_data);
-               if (ret_val)
-                       goto out;
-
-               phy_data |= M88E1000_EPSCR_TX_CLK_25;
-
-               if ((phy->revision == E1000_REVISION_2) &&
-                   (phy->id == M88E1111_I_PHY_ID)) {
-                       /* 82573L PHY - set the downshift counter to 5x. */
-                       phy_data &= ~M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK;
-                       phy_data |= M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X;
-               } else {
-                       /* Configure Master and Slave downshift values */
-                       phy_data &= ~(M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK |
-                                    M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK);
-                       phy_data |= (M88E1000_EPSCR_MASTER_DOWNSHIFT_1X |
-                                    M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X);
-               }
-               ret_val = phy->ops.write_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-                                            phy_data);
-               if (ret_val)
-                       goto out;
-       }
-
-       /* Commit the changes. */
-       ret_val = phy->ops.commit(hw);
-       if (ret_val) {
-               DEBUGOUT("Error committing the PHY changes\n");
-               goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_copper_link_setup_igp - Setup igp PHY's for copper link
- *  @hw: pointer to the HW structure
- *
- *  Sets up LPLU, MDI/MDI-X, polarity, Smartspeed and Master/Slave config for
- *  igp PHY's.
- **/
-s32 igb_copper_link_setup_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-       DEBUGFUNC("igb_copper_link_setup_igp");
-
-       if (phy->reset_disable) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       ret_val = hw->phy.ops.reset(hw);
-       if (ret_val) {
-               DEBUGOUT("Error resetting the PHY.\n");
-               goto out;
-       }
-
-       /*
-        * Wait 100ms for MAC to configure PHY from NVM settings, to avoid
-        * timeout issues when LFS is enabled.
-        */
-       msec_delay(100);
-
-       /*
-        * The NVM settings will configure LPLU in D3 for
-        * non-IGP1 PHYs.
-        */
-       if (phy->type == e1000_phy_igp) {
-               /* disable lplu d3 during driver init */
-               ret_val = hw->phy.ops.set_d3_lplu_state(hw, false);
-               if (ret_val) {
-                       DEBUGOUT("Error Disabling LPLU D3\n");
-                       goto out;
-               }
-       }
-
-       /* disable lplu d0 during driver init */
-       if (hw->phy.ops.set_d0_lplu_state) {
-               ret_val = hw->phy.ops.set_d0_lplu_state(hw, false);
-               if (ret_val) {
-                       DEBUGOUT("Error Disabling LPLU D0\n");
-                       goto out;
-               }
-       }
-       /* Configure mdi-mdix settings */
-       ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CTRL, &data);
-       if (ret_val)
-               goto out;
-
-       data &= ~IGP01E1000_PSCR_AUTO_MDIX;
-
-       switch (phy->mdix) {
-       case 1:
-               data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
-               break;
-       case 2:
-               data |= IGP01E1000_PSCR_FORCE_MDI_MDIX;
-               break;
-       case 0:
-       default:
-               data |= IGP01E1000_PSCR_AUTO_MDIX;
-               break;
-       }
-       ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CTRL, data);
-       if (ret_val)
-               goto out;
-
-       /* set auto-master slave resolution settings */
-       if (hw->mac.autoneg) {
-               /*
-                * when autonegotiation advertisement is only 1000Mbps then we
-                * should disable SmartSpeed and enable Auto MasterSlave
-                * resolution as hardware default.
-                */
-               if (phy->autoneg_advertised == ADVERTISE_1000_FULL) {
-                       /* Disable SmartSpeed */
-                       ret_val = phy->ops.read_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-
-                       /* Set auto Master/Slave resolution process */
-                       ret_val = phy->ops.read_reg(hw, PHY_1000T_CTRL, &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~CR_1000T_MS_ENABLE;
-                       ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL, data);
-                       if (ret_val)
-                               goto out;
-               }
-
-               ret_val = phy->ops.read_reg(hw, PHY_1000T_CTRL, &data);
-               if (ret_val)
-                       goto out;
-
-               /* load defaults for future use */
-               phy->original_ms_type = (data & CR_1000T_MS_ENABLE) ?
-                       ((data & CR_1000T_MS_VALUE) ?
-                       e1000_ms_force_master :
-                       e1000_ms_force_slave) :
-                       e1000_ms_auto;
-
-               switch (phy->ms_type) {
-               case e1000_ms_force_master:
-                       data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
-                       break;
-               case e1000_ms_force_slave:
-                       data |= CR_1000T_MS_ENABLE;
-                       data &= ~(CR_1000T_MS_VALUE);
-                       break;
-               case e1000_ms_auto:
-                       data &= ~CR_1000T_MS_ENABLE;
-               default:
-                       break;
-               }
-               ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL, data);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_copper_link_autoneg - Setup/Enable autoneg for copper link
- *  @hw: pointer to the HW structure
- *
- *  Performs initial bounds checking on autoneg advertisement parameter, then
- *  configure to advertise the full capability.  Setup the PHY to autoneg
- *  and restart the negotiation process between the link partner.  If
- *  autoneg_wait_to_complete, then wait for autoneg to complete before exiting.
- **/
-s32 igb_copper_link_autoneg(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_ctrl;
-
-       DEBUGFUNC("igb_copper_link_autoneg");
-
-       /*
-        * Perform some bounds checking on the autoneg advertisement
-        * parameter.
-        */
-       phy->autoneg_advertised &= phy->autoneg_mask;
-
-       /*
-        * If autoneg_advertised is zero, we assume it was not defaulted
-        * by the calling code so we set to advertise full capability.
-        */
-       if (phy->autoneg_advertised == 0)
-               phy->autoneg_advertised = phy->autoneg_mask;
-
-       DEBUGOUT("Reconfiguring auto-neg advertisement params\n");
-       ret_val = igb_phy_setup_autoneg(hw);
-       if (ret_val) {
-               DEBUGOUT("Error Setting up Auto-Negotiation\n");
-               goto out;
-       }
-       DEBUGOUT("Restarting Auto-Neg\n");
-
-       /*
-        * Restart auto-negotiation by setting the Auto Neg Enable bit and
-        * the Auto Neg Restart bit in the PHY control register.
-        */
-       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       phy_ctrl |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
-       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Does the user want to wait for Auto-Neg to complete here, or
-        * check at a later time (for example, callback routine).
-        */
-       if (phy->autoneg_wait_to_complete) {
-               ret_val = hw->mac.ops.wait_autoneg(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error while waiting for "
-                                "autoneg to complete\n");
-                       goto out;
-               }
-       }
-
-       hw->mac.get_link_status = true;
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_phy_setup_autoneg - Configure PHY for auto-negotiation
- *  @hw: pointer to the HW structure
- *
- *  Reads the MII auto-neg advertisement register and/or the 1000T control
- *  register and if the PHY is already setup for auto-negotiation, then
- *  return successful.  Otherwise, setup advertisement and flow control to
- *  the appropriate values for the wanted auto-negotiation.
- **/
-static s32 igb_phy_setup_autoneg(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 mii_autoneg_adv_reg;
-       u16 mii_1000t_ctrl_reg = 0;
-
-       DEBUGFUNC("igb_phy_setup_autoneg");
-
-       phy->autoneg_advertised &= phy->autoneg_mask;
-
-       /* Read the MII Auto-Neg Advertisement Register (Address 4). */
-       ret_val = phy->ops.read_reg(hw, PHY_AUTONEG_ADV, &mii_autoneg_adv_reg);
-       if (ret_val)
-               goto out;
-
-       if (phy->autoneg_mask & ADVERTISE_1000_FULL) {
-               /* Read the MII 1000Base-T Control Register (Address 9). */
-               ret_val = phy->ops.read_reg(hw, PHY_1000T_CTRL,
-                                           &mii_1000t_ctrl_reg);
-               if (ret_val)
-                       goto out;
-       }
-
-       /*
-        * Need to parse both autoneg_advertised and fc and set up
-        * the appropriate PHY registers.  First we will parse for
-        * autoneg_advertised software override.  Since we can advertise
-        * a plethora of combinations, we need to check each bit
-        * individually.
-        */
-
-       /*
-        * First we clear all the 10/100 mb speed bits in the Auto-Neg
-        * Advertisement Register (Address 4) and the 1000 mb speed bits in
-        * the  1000Base-T Control Register (Address 9).
-        */
-       mii_autoneg_adv_reg &= ~(NWAY_AR_100TX_FD_CAPS |
-                                NWAY_AR_100TX_HD_CAPS |
-                                NWAY_AR_10T_FD_CAPS   |
-                                NWAY_AR_10T_HD_CAPS);
-       mii_1000t_ctrl_reg &= ~(CR_1000T_HD_CAPS | CR_1000T_FD_CAPS);
-
-       DEBUGOUT1("autoneg_advertised %x\n", phy->autoneg_advertised);
-
-       /* Do we want to advertise 10 Mb Half Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_10_HALF) {
-               DEBUGOUT("Advertise 10mb Half duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_10T_HD_CAPS;
-       }
-
-       /* Do we want to advertise 10 Mb Full Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_10_FULL) {
-               DEBUGOUT("Advertise 10mb Full duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_10T_FD_CAPS;
-       }
-
-       /* Do we want to advertise 100 Mb Half Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_100_HALF) {
-               DEBUGOUT("Advertise 100mb Half duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_100TX_HD_CAPS;
-       }
-
-       /* Do we want to advertise 100 Mb Full Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_100_FULL) {
-               DEBUGOUT("Advertise 100mb Full duplex\n");
-               mii_autoneg_adv_reg |= NWAY_AR_100TX_FD_CAPS;
-       }
-
-       /* We do not allow the Phy to advertise 1000 Mb Half Duplex */
-       if (phy->autoneg_advertised & ADVERTISE_1000_HALF) {
-               DEBUGOUT("Advertise 1000mb Half duplex request denied!\n");
-        }
-       /* Do we want to advertise 1000 Mb Full Duplex? */
-       if (phy->autoneg_advertised & ADVERTISE_1000_FULL) {
-               DEBUGOUT("Advertise 1000mb Full duplex\n");
-               mii_1000t_ctrl_reg |= CR_1000T_FD_CAPS;
-       }
-
-       /*
-        * Check for a software override of the flow control settings, and
-        * setup the PHY advertisement registers accordingly.  If
-        * auto-negotiation is enabled, then software will have to set the
-        * "PAUSE" bits to the correct value in the Auto-Negotiation
-        * Advertisement Register (PHY_AUTONEG_ADV) and re-start auto-
-        * negotiation.
-        *
-        * The possible values of the "fc" parameter are:
-        *      0:  Flow control is completely disabled
-        *      1:  Rx flow control is enabled (we can receive pause frames
-        *          but not send pause frames).
-        *      2:  Tx flow control is enabled (we can send pause frames
-        *          but we do not support receiving pause frames).
-        *      3:  Both Rx and Tx flow control (symmetric) are enabled.
-        *  other:  No software override.  The flow control configuration
-        *          in the EEPROM is used.
-        */
-       switch (hw->fc.current_mode) {
-       case e1000_fc_none:
-               /*
-                * Flow control (Rx & Tx) is completely disabled by a
-                * software over-ride.
-                */
-               mii_autoneg_adv_reg &= ~(NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-               break;
-       case e1000_fc_rx_pause:
-               /*
-                * Rx Flow control is enabled, and Tx Flow control is
-                * disabled, by a software over-ride.
-                *
-                * Since there really isn't a way to advertise that we are
-                * capable of Rx Pause ONLY, we will advertise that we
-                * support both symmetric and asymmetric Rx PAUSE.  Later
-                * (in e1000_config_fc_after_link_up) we will disable the
-                * hw's ability to send PAUSE frames.
-                */
-               mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-               break;
-       case e1000_fc_tx_pause:
-               /*
-                * Tx Flow control is enabled, and Rx Flow control is
-                * disabled, by a software over-ride.
-                */
-               mii_autoneg_adv_reg |= NWAY_AR_ASM_DIR;
-               mii_autoneg_adv_reg &= ~NWAY_AR_PAUSE;
-               break;
-       case e1000_fc_full:
-               /*
-                * Flow control (both Rx and Tx) is enabled by a software
-                * over-ride.
-                */
-               mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-               break;
-       default:
-               DEBUGOUT("Flow control param set incorrectly\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ret_val = phy->ops.write_reg(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);
-       if (ret_val)
-               goto out;
-
-       DEBUGOUT1("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);
-
-       if (phy->autoneg_mask & ADVERTISE_1000_FULL) {
-               ret_val = phy->ops.write_reg(hw,
-                                             PHY_1000T_CTRL,
-                                             mii_1000t_ctrl_reg);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_setup_copper_link_generic - Configure copper link settings
- *  @hw: pointer to the HW structure
- *
- *  Calls the appropriate function to configure the link for auto-neg or forced
- *  speed and duplex.  Then we check for link, once link is established calls
- *  to configure collision distance and flow control are called.  If link is
- *  not established, we return -E1000_ERR_PHY (-2).
- **/
-s32 igb_setup_copper_link_generic(struct e1000_hw *hw)
-{
-       s32 ret_val;
-       bool link;
-
-       DEBUGFUNC("igb_setup_copper_link_generic");
-
-       if (hw->mac.autoneg) {
-               /*
-                * Setup autoneg and flow control advertisement and perform
-                * autonegotiation.
-                */
-               ret_val = igb_copper_link_autoneg(hw);
-               if (ret_val)
-                       goto out;
-       } else {
-#if 0
-               /*
-                * PHY will be set to 10H, 10F, 100H or 100F
-                * depending on user settings.
-                */
-               DEBUGOUT("Forcing Speed and Duplex\n");
-               ret_val = hw->phy.ops.force_speed_duplex(hw);
-               if (ret_val) {
-                       DEBUGOUT("Error Forcing Speed and Duplex\n");
-                       goto out;
-               }
-#endif
-       }
-
-       /*
-        * Check link status. Wait up to 100 microseconds for link to become
-        * valid.
-        */
-       ret_val = igb_phy_has_link_generic(hw,
-                                            COPPER_LINK_UP_LIMIT,
-                                            10,
-                                            &link);
-       if (ret_val)
-               goto out;
-
-       if (link) {
-               DEBUGOUT("Valid link established!!!\n");
-               igb_config_collision_dist_generic(hw);
-               ret_val = igb_config_fc_after_link_up_generic(hw);
-       } else {
-               DEBUGOUT("Unable to establish link!!!\n");
-       }
-
-out:
-       return ret_val;
-}
-
-#if 0
-/**
- *  igb_phy_force_speed_duplex_igp - Force speed/duplex for igp PHY
- *  @hw: pointer to the HW structure
- *
- *  Calls the PHY setup function to force speed and duplex.  Clears the
- *  auto-crossover to force MDI manually.  Waits for link and returns
- *  successful if link up is successful, else -E1000_ERR_PHY (-2).
- **/
-s32 igb_phy_force_speed_duplex_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-       bool link;
-
-       DEBUGFUNC("igb_phy_force_speed_duplex_igp");
-
-       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       igb_phy_force_speed_duplex_setup(hw, &phy_data);
-
-       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Clear Auto-Crossover to force MDI manually.  IGP requires MDI
-        * forced whenever speed and duplex are forced.
-        */
-       ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
-       phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
-
-       ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       DEBUGOUT1("IGP PSCR: %X\n", phy_data);
-
-       usec_delay(1);
-
-       if (phy->autoneg_wait_to_complete) {
-               DEBUGOUT("Waiting for forced speed/duplex link on IGP phy.\n");
-
-               ret_val = igb_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link) {
-                       DEBUGOUT("Link taking longer than expected.\n");
-                }
-               /* Try once more */
-               ret_val = igb_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-#endif
-
-#if 0
-/**
- *  igb_phy_force_speed_duplex_m88 - Force speed/duplex for m88 PHY
- *  @hw: pointer to the HW structure
- *
- *  Calls the PHY setup function to force speed and duplex.  Clears the
- *  auto-crossover to force MDI manually.  Resets the PHY to commit the
- *  changes.  If time expires while waiting for link up, we reset the DSP.
- *  After reset, TX_CLK and CRS on Tx must be set.  Return successful upon
- *  successful completion, else return corresponding error code.
- **/
-s32 igb_phy_force_speed_duplex_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data;
-       bool link;
-
-       DEBUGFUNC("igb_phy_force_speed_duplex_m88");
-
-       /*
-        * Clear Auto-Crossover to force MDI manually.  M88E1000 requires MDI
-        * forced whenever speed and duplex are forced.
-        */
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-       ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       DEBUGOUT1("M88E1000 PSCR: %X\n", phy_data);
-
-       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       igb_phy_force_speed_duplex_setup(hw, &phy_data);
-
-       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /* Reset the phy to commit changes. */
-       ret_val = hw->phy.ops.commit(hw);
-       if (ret_val)
-               goto out;
-
-       if (phy->autoneg_wait_to_complete) {
-               DEBUGOUT("Waiting for forced speed/duplex link on M88 phy.\n");
-
-               ret_val = igb_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link) {
-                       /*
-                        * We didn't get link.
-                        * Reset the DSP and cross our fingers.
-                        */
-                       ret_val = phy->ops.write_reg(hw,
-                                                     M88E1000_PHY_PAGE_SELECT,
-                                                     0x001d);
-                       if (ret_val)
-                               goto out;
-                       ret_val = igb_phy_reset_dsp_generic(hw);
-                       if (ret_val)
-                               goto out;
-               }
-
-               /* Try once more */
-               ret_val = igb_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
-                                                    100000, &link);
-               if (ret_val)
-                       goto out;
-       }
-
-       ret_val = phy->ops.read_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * Resetting the phy means we need to re-force TX_CLK in the
-        * Extended PHY Specific Control Register to 25MHz clock from
-        * the reset value of 2.5MHz.
-        */
-       phy_data |= M88E1000_EPSCR_TX_CLK_25;
-       ret_val = phy->ops.write_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, phy_data);
-       if (ret_val)
-               goto out;
-
-       /*
-        * In addition, we must re-enable CRS on Tx for both half and full
-        * duplex.
-        */
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-       ret_val = phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
-
-out:
-       return ret_val;
-}
-#endif
-
-#if 0
-/**
- *  igb_phy_force_speed_duplex_ife - Force PHY speed & duplex
- *  @hw: pointer to the HW structure
- *
- *  Forces the speed and duplex settings of the PHY.
- *  This is a function pointer entry point only called by
- *  PHY setup routines.
- **/
-s32 igb_phy_force_speed_duplex_ife(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-       bool link;
-
-       DEBUGFUNC("igb_phy_force_speed_duplex_ife");
-
-       if (phy->type != e1000_phy_ife) {
-               ret_val = igb_phy_force_speed_duplex_igp(hw);
-               goto out;
-       }
-
-       ret_val = phy->ops.read_reg(hw, PHY_CONTROL, &data);
-       if (ret_val)
-               goto out;
-
-       igb_phy_force_speed_duplex_setup(hw, &data);
-
-       ret_val = phy->ops.write_reg(hw, PHY_CONTROL, data);
-       if (ret_val)
-               goto out;
-
-       /* Disable MDI-X support for 10/100 */
-       ret_val = phy->ops.read_reg(hw, IFE_PHY_MDIX_CONTROL, &data);
-       if (ret_val)
-               goto out;
-
-       data &= ~IFE_PMC_AUTO_MDIX;
-       data &= ~IFE_PMC_FORCE_MDIX;
-
-       ret_val = phy->ops.write_reg(hw, IFE_PHY_MDIX_CONTROL, data);
-       if (ret_val)
-               goto out;
-
-       DEBUGOUT1("IFE PMC: %X\n", data);
-
-       usec_delay(1);
-
-       if (phy->autoneg_wait_to_complete) {
-               DEBUGOUT("Waiting for forced speed/duplex link on IFE phy.\n");
-
-               ret_val = igb_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-
-               if (!link) {
-                       DEBUGOUT("Link taking longer than expected.\n");
-                }
-               /* Try once more */
-               ret_val = igb_phy_has_link_generic(hw,
-                                                    PHY_FORCE_LIMIT,
-                                                    100000,
-                                                    &link);
-               if (ret_val)
-                       goto out;
-       }
-
-out:
-       return ret_val;
-}
-#endif
-
-#if 0
-/**
- *  igb_phy_force_speed_duplex_setup - Configure forced PHY speed/duplex
- *  @hw: pointer to the HW structure
- *  @phy_ctrl: pointer to current value of PHY_CONTROL
- *
- *  Forces speed and duplex on the PHY by doing the following: disable flow
- *  control, force speed/duplex on the MAC, disable auto speed detection,
- *  disable auto-negotiation, configure duplex, configure speed, configure
- *  the collision distance, write configuration to CTRL register.  The
- *  caller must write to the PHY_CONTROL register for these settings to
- *  take affect.
- **/
-void igb_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl)
-{
-       struct e1000_mac_info *mac = &hw->mac;
-       u32 ctrl;
-
-       DEBUGFUNC("igb_phy_force_speed_duplex_setup");
-
-       /* Turn off flow control when forcing speed/duplex */
-       hw->fc.current_mode = e1000_fc_none;
-
-       /* Force speed/duplex on the mac */
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-       ctrl &= ~E1000_CTRL_SPD_SEL;
-
-       /* Disable Auto Speed Detection */
-       ctrl &= ~E1000_CTRL_ASDE;
-
-       /* Disable autoneg on the phy */
-       *phy_ctrl &= ~MII_CR_AUTO_NEG_EN;
-
-       /* Forcing Full or Half Duplex? */
-       if (mac->forced_speed_duplex & E1000_ALL_HALF_DUPLEX) {
-               ctrl &= ~E1000_CTRL_FD;
-               *phy_ctrl &= ~MII_CR_FULL_DUPLEX;
-               DEBUGOUT("Half Duplex\n");
-       } else {
-               ctrl |= E1000_CTRL_FD;
-               *phy_ctrl |= MII_CR_FULL_DUPLEX;
-               DEBUGOUT("Full Duplex\n");
-       }
-
-       /* Forcing 10mb or 100mb? */
-       if (mac->forced_speed_duplex & E1000_ALL_100_SPEED) {
-               ctrl |= E1000_CTRL_SPD_100;
-               *phy_ctrl |= MII_CR_SPEED_100;
-               *phy_ctrl &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_10);
-               DEBUGOUT("Forcing 100mb\n");
-       } else {
-               ctrl &= ~(E1000_CTRL_SPD_1000 | E1000_CTRL_SPD_100);
-               *phy_ctrl |= MII_CR_SPEED_10;
-               *phy_ctrl &= ~(MII_CR_SPEED_1000 | MII_CR_SPEED_100);
-               DEBUGOUT("Forcing 10mb\n");
-       }
-
-       igb_config_collision_dist_generic(hw);
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-}
-#endif
-
-/**
- *  igb_set_d3_lplu_state_generic - Sets low power link up state for D3
- *  @hw: pointer to the HW structure
- *  @active: boolean used to enable/disable lplu
- *
- *  Success returns 0, Failure returns 1
- *
- *  The low power link up (lplu) state is set to the power management level D3
- *  and SmartSpeed is disabled when active is true, else clear lplu for D3
- *  and enable Smartspeed.  LPLU and Smartspeed are mutually exclusive.  LPLU
- *  is used during Dx states where the power conservation is most important.
- *  During driver activity, SmartSpeed should be enabled so performance is
- *  maintained.
- **/
-s32 igb_set_d3_lplu_state_generic(struct e1000_hw *hw, bool active)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 data;
-
-       DEBUGFUNC("igb_set_d3_lplu_state_generic");
-
-       if (!(hw->phy.ops.read_reg))
-               goto out;
-
-       ret_val = phy->ops.read_reg(hw, IGP02E1000_PHY_POWER_MGMT, &data);
-       if (ret_val)
-               goto out;
-
-       if (!active) {
-               data &= ~IGP02E1000_PM_D3_LPLU;
-               ret_val = phy->ops.write_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                            data);
-               if (ret_val)
-                       goto out;
-               /*
-                * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
-                * during Dx states where the power conservation is most
-                * important.  During driver activity we should enable
-                * SmartSpeed, so performance is maintained.
-                */
-               if (phy->smart_speed == e1000_smart_speed_on) {
-                       ret_val = phy->ops.read_reg(hw,
-                                                   IGP01E1000_PHY_PORT_CONFIG,
-                                                   &data);
-                       if (ret_val)
-                               goto out;
-
-                       data |= IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               } else if (phy->smart_speed == e1000_smart_speed_off) {
-                       ret_val = phy->ops.read_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    &data);
-                       if (ret_val)
-                               goto out;
-
-                       data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-                       ret_val = phy->ops.write_reg(hw,
-                                                    IGP01E1000_PHY_PORT_CONFIG,
-                                                    data);
-                       if (ret_val)
-                               goto out;
-               }
-       } else if ((phy->autoneg_advertised == E1000_ALL_SPEED_DUPLEX) ||
-                  (phy->autoneg_advertised == E1000_ALL_NOT_GIG) ||
-                  (phy->autoneg_advertised == E1000_ALL_10_SPEED)) {
-               data |= IGP02E1000_PM_D3_LPLU;
-               ret_val = phy->ops.write_reg(hw, IGP02E1000_PHY_POWER_MGMT,
-                                             data);
-               if (ret_val)
-                       goto out;
-
-               /* When LPLU is enabled, we should disable SmartSpeed */
-               ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                            &data);
-               if (ret_val)
-                       goto out;
-
-               data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-               ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
-                                             data);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_check_downshift_generic - Checks whether a downshift in speed occurred
- *  @hw: pointer to the HW structure
- *
- *  Success returns 0, Failure returns 1
- *
- *  A downshift is detected by querying the PHY link health.
- **/
-s32 igb_check_downshift_generic(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, offset, mask;
-
-       DEBUGFUNC("igb_check_downshift_generic");
-
-       switch (phy->type) {
-       case e1000_phy_m88:
-       case e1000_phy_gg82563:
-               offset  = M88E1000_PHY_SPEC_STATUS;
-               mask    = M88E1000_PSSR_DOWNSHIFT;
-               break;
-       case e1000_phy_igp_2:
-       case e1000_phy_igp:
-       case e1000_phy_igp_3:
-               offset  = IGP01E1000_PHY_LINK_HEALTH;
-               mask    = IGP01E1000_PLHR_SS_DOWNGRADE;
-               break;
-       default:
-               /* speed downshift not supported */
-               phy->speed_downgraded = false;
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       ret_val = phy->ops.read_reg(hw, offset, &phy_data);
-
-       if (!ret_val)
-               phy->speed_downgraded = (phy_data & mask) ? true : false;
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_check_polarity_m88 - Checks the polarity.
- *  @hw: pointer to the HW structure
- *
- *  Success returns 0, Failure returns -E1000_ERR_PHY (-2)
- *
- *  Polarity is determined based on the PHY specific status register.
- **/
-s32 igb_check_polarity_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-
-       DEBUGFUNC("igb_check_polarity_m88");
-
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_STATUS, &data);
-
-       if (!ret_val)
-               phy->cable_polarity = (data & M88E1000_PSSR_REV_POLARITY)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
-
-       return ret_val;
-}
-
-/**
- *  igb_check_polarity_igp - Checks the polarity.
- *  @hw: pointer to the HW structure
- *
- *  Success returns 0, Failure returns -E1000_ERR_PHY (-2)
- *
- *  Polarity is determined based on the PHY port status register, and the
- *  current speed (since there is no polarity at 100Mbps).
- **/
-s32 igb_check_polarity_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data, offset, mask;
-
-       DEBUGFUNC("igb_check_polarity_igp");
-
-       /*
-        * Polarity is determined based on the speed of
-        * our connection.
-        */
-       ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_STATUS, &data);
-       if (ret_val)
-               goto out;
-
-       if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
-           IGP01E1000_PSSR_SPEED_1000MBPS) {
-               offset  = IGP01E1000_PHY_PCS_INIT_REG;
-               mask    = IGP01E1000_PHY_POLARITY_MASK;
-       } else {
-               /*
-                * This really only applies to 10Mbps since
-                * there is no polarity for 100Mbps (always 0).
-                */
-               offset  = IGP01E1000_PHY_PORT_STATUS;
-               mask    = IGP01E1000_PSSR_POLARITY_REVERSED;
-       }
-
-       ret_val = phy->ops.read_reg(hw, offset, &data);
-
-       if (!ret_val)
-               phy->cable_polarity = (data & mask)
-                                     ? e1000_rev_polarity_reversed
-                                     : e1000_rev_polarity_normal;
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_check_polarity_ife - Check cable polarity for IFE PHY
- *  @hw: pointer to the HW structure
- *
- *  Polarity is determined on the polarity reversal feature being enabled.
- **/
-s32 igb_check_polarity_ife(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, offset, mask;
-
-       DEBUGFUNC("igb_check_polarity_ife");
-
-       /*
-        * Polarity is determined based on the reversal feature being enabled.
-        */
-       if (phy->polarity_correction) {
-               offset = IFE_PHY_EXTENDED_STATUS_CONTROL;
-               mask = IFE_PESC_POLARITY_REVERSED;
-       } else {
-               offset = IFE_PHY_SPECIAL_CONTROL;
-               mask = IFE_PSC_FORCE_POLARITY;
-       }
-
-       ret_val = phy->ops.read_reg(hw, offset, &phy_data);
-
-       if (!ret_val)
-               phy->cable_polarity = (phy_data & mask)
-                                      ? e1000_rev_polarity_reversed
-                                      : e1000_rev_polarity_normal;
-
-       return ret_val;
-}
-
-/**
- *  igb_wait_autoneg_generic - Wait for auto-neg completion
- *  @hw: pointer to the HW structure
- *
- *  Waits for auto-negotiation to complete or for the auto-negotiation time
- *  limit to expire, which ever happens first.
- **/
-s32 igb_wait_autoneg_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 i, phy_status;
-
-       DEBUGFUNC("igb_wait_autoneg_generic");
-
-       if (!(hw->phy.ops.read_reg))
-               return E1000_SUCCESS;
-
-       /* Break after autoneg completes or PHY_AUTO_NEG_LIMIT expires. */
-       for (i = PHY_AUTO_NEG_LIMIT; i > 0; i--) {
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
-               if (ret_val)
-                       break;
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
-               if (ret_val)
-                       break;
-               if (phy_status & MII_SR_AUTONEG_COMPLETE)
-                       break;
-               msec_delay(100);
-       }
-
-       /*
-        * PHY_AUTO_NEG_TIME expiration doesn't guarantee auto-negotiation
-        * has completed.
-        */
-       return ret_val;
-}
-
-/**
- *  igb_phy_has_link_generic - Polls PHY for link
- *  @hw: pointer to the HW structure
- *  @iterations: number of times to poll for link
- *  @usec_interval: delay between polling attempts
- *  @success: pointer to whether polling was successful or not
- *
- *  Polls the PHY status register for link, 'iterations' number of times.
- **/
-s32 igb_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
-                               u32 usec_interval, bool *success)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 i, phy_status;
-
-       DEBUGFUNC("igb_phy_has_link_generic");
-
-       if (!(hw->phy.ops.read_reg))
-               return E1000_SUCCESS;
-
-       for (i = 0; i < iterations; i++) {
-               /*
-                * Some PHYs require the PHY_STATUS register to be read
-                * twice due to the link bit being sticky.  No harm doing
-                * it across the board.
-                */
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
-               if (ret_val) {
-                       /*
-                        * If the first read fails, another entity may have
-                        * ownership of the resources, wait and try again to
-                        * see if they have relinquished the resources yet.
-                        */
-                       usec_delay(usec_interval);
-               }
-               ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
-               if (ret_val)
-                       break;
-               if (phy_status & MII_SR_LINK_STATUS)
-                       break;
-               if (usec_interval >= 1000)
-                       msec_delay_irq(usec_interval/1000);
-               else
-                       usec_delay(usec_interval);
-       }
-
-       *success = (i < iterations) ? true : false;
-
-       return ret_val;
-}
-
-#if 0
-/**
- *  igb_get_cable_length_m88 - Determine cable length for m88 PHY
- *  @hw: pointer to the HW structure
- *
- *  Reads the PHY specific status register to retrieve the cable length
- *  information.  The cable length is determined by averaging the minimum and
- *  maximum values to get the "average" cable length.  The m88 PHY has four
- *  possible cable length values, which are:
- *     Register Value          Cable Length
- *     0                       < 50 meters
- *     1                       50 - 80 meters
- *     2                       80 - 110 meters
- *     3                       110 - 140 meters
- *     4                       > 140 meters
- **/
-s32 igb_get_cable_length_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 phy_data, index;
-
-       DEBUGFUNC("igb_get_cable_length_m88");
-
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-       if (ret_val)
-               goto out;
-
-       index = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
-               M88E1000_PSSR_CABLE_LENGTH_SHIFT;
-       if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE - 1) {
-               ret_val = -E1000_ERR_PHY;
-               goto out;
-       }
-
-       phy->min_cable_length = e1000_m88_cable_length_table[index];
-       phy->max_cable_length = e1000_m88_cable_length_table[index + 1];
-
-       phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_get_cable_length_igp_2 - Determine cable length for igp2 PHY
- *  @hw: pointer to the HW structure
- *
- *  The automatic gain control (agc) normalizes the amplitude of the
- *  received signal, adjusting for the attenuation produced by the
- *  cable.  By reading the AGC registers, which represent the
- *  combination of coarse and fine gain value, the value can be put
- *  into a lookup table to obtain the approximate cable length
- *  for each channel.
- **/
-s32 igb_get_cable_length_igp_2(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_data, i, agc_value = 0;
-       u16 cur_agc_index, max_agc_index = 0;
-       u16 min_agc_index = IGP02E1000_CABLE_LENGTH_TABLE_SIZE - 1;
-       u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] =
-                                                        {IGP02E1000_PHY_AGC_A,
-                                                         IGP02E1000_PHY_AGC_B,
-                                                         IGP02E1000_PHY_AGC_C,
-                                                         IGP02E1000_PHY_AGC_D};
-
-       DEBUGFUNC("igb_get_cable_length_igp_2");
-
-       /* Read the AGC registers for all channels */
-       for (i = 0; i < IGP02E1000_PHY_CHANNEL_NUM; i++) {
-               ret_val = phy->ops.read_reg(hw, agc_reg_array[i], &phy_data);
-               if (ret_val)
-                       goto out;
-
-               /*
-                * Getting bits 15:9, which represent the combination of
-                * coarse and fine gain values.  The result is a number
-                * that can be put into the lookup table to obtain the
-                * approximate cable length.
-                */
-               cur_agc_index = (phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
-                               IGP02E1000_AGC_LENGTH_MASK;
-
-               /* Array index bound check. */
-               if ((cur_agc_index >= IGP02E1000_CABLE_LENGTH_TABLE_SIZE) ||
-                   (cur_agc_index == 0)) {
-                       ret_val = -E1000_ERR_PHY;
-                       goto out;
-               }
-
-               /* Remove min & max AGC values from calculation. */
-               if (e1000_igp_2_cable_length_table[min_agc_index] >
-                   e1000_igp_2_cable_length_table[cur_agc_index])
-                       min_agc_index = cur_agc_index;
-               if (e1000_igp_2_cable_length_table[max_agc_index] <
-                   e1000_igp_2_cable_length_table[cur_agc_index])
-                       max_agc_index = cur_agc_index;
-
-               agc_value += e1000_igp_2_cable_length_table[cur_agc_index];
-       }
-
-       agc_value -= (e1000_igp_2_cable_length_table[min_agc_index] +
-                     e1000_igp_2_cable_length_table[max_agc_index]);
-       agc_value /= (IGP02E1000_PHY_CHANNEL_NUM - 2);
-
-       /* Calculate cable length with the error range of +/- 10 meters. */
-       phy->min_cable_length = ((agc_value - IGP02E1000_AGC_RANGE) > 0) ?
-                                (agc_value - IGP02E1000_AGC_RANGE) : 0;
-       phy->max_cable_length = agc_value + IGP02E1000_AGC_RANGE;
-
-       phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
-
-out:
-       return ret_val;
-}
-#endif
-
-/**
- *  igb_get_phy_info_m88 - Retrieve PHY information
- *  @hw: pointer to the HW structure
- *
- *  Valid for only copper links.  Read the PHY status register (sticky read)
- *  to verify that link is up.  Read the PHY special control register to
- *  determine the polarity and 10base-T extended distance.  Read the PHY
- *  special status register to determine MDI/MDIx and current speed.  If
- *  speed is 1000, then determine cable length, local and remote receiver.
- **/
-s32 igb_get_phy_info_m88(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32  ret_val;
-       u16 phy_data;
-       bool link;
-
-       DEBUGFUNC("igb_get_phy_info_m88");
-
-       if (phy->media_type != e1000_media_type_copper) {
-               DEBUGOUT("Phy info is only valid for copper media\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ret_val = igb_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               DEBUGOUT("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy->polarity_correction = (phy_data & M88E1000_PSCR_POLARITY_REVERSAL)
-                                  ? true : false;
-
-       ret_val = igb_check_polarity_m88(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
-       if (ret_val)
-               goto out;
-
-       phy->is_mdix = (phy_data & M88E1000_PSSR_MDIX) ? true : false;
-
-       if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
-#if 0
-               ret_val = hw->phy.ops.get_cable_length(hw);
-#endif
-               ret_val = -E1000_ERR_CONFIG;
-               if (ret_val)
-                       goto out;
-#if 0
-               ret_val = phy->ops.read_reg(hw, PHY_1000T_STATUS, &phy_data);
-               if (ret_val)
-                       goto out;
-
-               phy->local_rx = (phy_data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
-
-               phy->remote_rx = (phy_data & SR_1000T_REMOTE_RX_STATUS)
-                                ? e1000_1000t_rx_status_ok
-                                : e1000_1000t_rx_status_not_ok;
-#endif
-       } else {
-               /* Set values to "undefined" */
-               phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
-               phy->local_rx = e1000_1000t_rx_status_undefined;
-               phy->remote_rx = e1000_1000t_rx_status_undefined;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_get_phy_info_igp - Retrieve igp PHY information
- *  @hw: pointer to the HW structure
- *
- *  Read PHY status to determine if link is up.  If link is up, then
- *  set/determine 10base-T extended distance and polarity correction.  Read
- *  PHY port status to determine MDI/MDIx and speed.  Based on the speed,
- *  determine on the cable length, local and remote receiver.
- **/
-s32 igb_get_phy_info_igp(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val;
-       u16 data;
-       bool link;
-
-       DEBUGFUNC("igb_get_phy_info_igp");
-
-       ret_val = igb_phy_has_link_generic(hw, 1, 0, &link);
-       if (ret_val)
-               goto out;
-
-       if (!link) {
-               DEBUGOUT("Phy info is only valid if link is up\n");
-               ret_val = -E1000_ERR_CONFIG;
-               goto out;
-       }
-
-       phy->polarity_correction = true;
-
-       ret_val = igb_check_polarity_igp(hw);
-       if (ret_val)
-               goto out;
-
-       ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_STATUS, &data);
-       if (ret_val)
-               goto out;
-
-       phy->is_mdix = (data & IGP01E1000_PSSR_MDIX) ? true : false;
-
-       if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
-           IGP01E1000_PSSR_SPEED_1000MBPS) {
-#if 0
-               ret_val = phy->ops.get_cable_length(hw);
-#endif
-               ret_val = -E1000_ERR_CONFIG;
-               if (ret_val)
-                       goto out;
-#if 0
-               ret_val = phy->ops.read_reg(hw, PHY_1000T_STATUS, &data);
-               if (ret_val)
-                       goto out;
-
-               phy->local_rx = (data & SR_1000T_LOCAL_RX_STATUS)
-                               ? e1000_1000t_rx_status_ok
-                               : e1000_1000t_rx_status_not_ok;
-
-               phy->remote_rx = (data & SR_1000T_REMOTE_RX_STATUS)
-                                ? e1000_1000t_rx_status_ok
-                                : e1000_1000t_rx_status_not_ok;
-#endif
-       } else {
-               phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
-               phy->local_rx = e1000_1000t_rx_status_undefined;
-               phy->remote_rx = e1000_1000t_rx_status_undefined;
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_phy_sw_reset_generic - PHY software reset
- *  @hw: pointer to the HW structure
- *
- *  Does a software reset of the PHY by reading the PHY control register and
- *  setting/write the control register reset bit to the PHY.
- **/
-s32 igb_phy_sw_reset_generic(struct e1000_hw *hw)
-{
-       s32 ret_val = E1000_SUCCESS;
-       u16 phy_ctrl;
-
-       DEBUGFUNC("igb_phy_sw_reset_generic");
-
-       if (!(hw->phy.ops.read_reg))
-               goto out;
-
-       ret_val = hw->phy.ops.read_reg(hw, PHY_CONTROL, &phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       phy_ctrl |= MII_CR_RESET;
-       ret_val = hw->phy.ops.write_reg(hw, PHY_CONTROL, phy_ctrl);
-       if (ret_val)
-               goto out;
-
-       usec_delay(1);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_phy_hw_reset_generic - PHY hardware reset
- *  @hw: pointer to the HW structure
- *
- *  Verify the reset block is not blocking us from resetting.  Acquire
- *  semaphore (if necessary) and read/set/write the device control reset
- *  bit in the PHY.  Wait the appropriate delay time for the device to
- *  reset and release the semaphore (if necessary).
- **/
-s32 igb_phy_hw_reset_generic(struct e1000_hw *hw)
-{
-       struct e1000_phy_info *phy = &hw->phy;
-       s32 ret_val = E1000_SUCCESS;
-       u32 ctrl;
-
-       DEBUGFUNC("igb_phy_hw_reset_generic");
-
-       ret_val = phy->ops.check_reset_block(hw);
-       if (ret_val) {
-               ret_val = E1000_SUCCESS;
-               goto out;
-       }
-
-       ret_val = phy->ops.acquire(hw);
-       if (ret_val)
-               goto out;
-
-       ctrl = E1000_READ_REG(hw, E1000_CTRL);
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_PHY_RST);
-       E1000_WRITE_FLUSH(hw);
-
-       usec_delay(phy->reset_delay_us);
-
-       E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-       E1000_WRITE_FLUSH(hw);
-
-       usec_delay(150);
-
-       phy->ops.release(hw);
-
-       ret_val = phy->ops.get_cfg_done(hw);
-
-out:
-       return ret_val;
-}
-
-/**
- *  igb_get_cfg_done_generic - Generic configuration done
- *  @hw: pointer to the HW structure
- *
- *  Generic function to wait 10 milli-seconds for configuration to complete
- *  and return success.
- **/
-s32 igb_get_cfg_done_generic(struct e1000_hw *hw __unused)
-{
-       DEBUGFUNC("igb_get_cfg_done_generic");
-
-       msec_delay_irq(10);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_phy_init_script_igp3 - Inits the IGP3 PHY
- *  @hw: pointer to the HW structure
- *
- *  Initializes a Intel Gigabit PHY3 when an EEPROM is not present.
- **/
-s32 igb_phy_init_script_igp3(struct e1000_hw *hw)
-{
-       DEBUGOUT("Running IGP 3 PHY init script\n");
-
-       /* PHY init IGP 3 */
-       /* Enable rise/fall, 10-mode work in class-A */
-       hw->phy.ops.write_reg(hw, 0x2F5B, 0x9018);
-       /* Remove all caps from Replica path filter */
-       hw->phy.ops.write_reg(hw, 0x2F52, 0x0000);
-       /* Bias trimming for ADC, AFE and Driver (Default) */
-       hw->phy.ops.write_reg(hw, 0x2FB1, 0x8B24);
-       /* Increase Hybrid poly bias */
-       hw->phy.ops.write_reg(hw, 0x2FB2, 0xF8F0);
-       /* Add 4% to Tx amplitude in Gig mode */
-       hw->phy.ops.write_reg(hw, 0x2010, 0x10B0);
-       /* Disable trimming (TTT) */
-       hw->phy.ops.write_reg(hw, 0x2011, 0x0000);
-       /* Poly DC correction to 94.6% + 2% for all channels */
-       hw->phy.ops.write_reg(hw, 0x20DD, 0x249A);
-       /* ABS DC correction to 95.9% */
-       hw->phy.ops.write_reg(hw, 0x20DE, 0x00D3);
-       /* BG temp curve trim */
-       hw->phy.ops.write_reg(hw, 0x28B4, 0x04CE);
-       /* Increasing ADC OPAMP stage 1 currents to max */
-       hw->phy.ops.write_reg(hw, 0x2F70, 0x29E4);
-       /* Force 1000 ( required for enabling PHY regs configuration) */
-       hw->phy.ops.write_reg(hw, 0x0000, 0x0140);
-       /* Set upd_freq to 6 */
-       hw->phy.ops.write_reg(hw, 0x1F30, 0x1606);
-       /* Disable NPDFE */
-       hw->phy.ops.write_reg(hw, 0x1F31, 0xB814);
-       /* Disable adaptive fixed FFE (Default) */
-       hw->phy.ops.write_reg(hw, 0x1F35, 0x002A);
-       /* Enable FFE hysteresis */
-       hw->phy.ops.write_reg(hw, 0x1F3E, 0x0067);
-       /* Fixed FFE for short cable lengths */
-       hw->phy.ops.write_reg(hw, 0x1F54, 0x0065);
-       /* Fixed FFE for medium cable lengths */
-       hw->phy.ops.write_reg(hw, 0x1F55, 0x002A);
-       /* Fixed FFE for long cable lengths */
-       hw->phy.ops.write_reg(hw, 0x1F56, 0x002A);
-       /* Enable Adaptive Clip Threshold */
-       hw->phy.ops.write_reg(hw, 0x1F72, 0x3FB0);
-       /* AHT reset limit to 1 */
-       hw->phy.ops.write_reg(hw, 0x1F76, 0xC0FF);
-       /* Set AHT master delay to 127 msec */
-       hw->phy.ops.write_reg(hw, 0x1F77, 0x1DEC);
-       /* Set scan bits for AHT */
-       hw->phy.ops.write_reg(hw, 0x1F78, 0xF9EF);
-       /* Set AHT Preset bits */
-       hw->phy.ops.write_reg(hw, 0x1F79, 0x0210);
-       /* Change integ_factor of channel A to 3 */
-       hw->phy.ops.write_reg(hw, 0x1895, 0x0003);
-       /* Change prop_factor of channels BCD to 8 */
-       hw->phy.ops.write_reg(hw, 0x1796, 0x0008);
-       /* Change cg_icount + enable integbp for channels BCD */
-       hw->phy.ops.write_reg(hw, 0x1798, 0xD008);
-       /*
-        * Change cg_icount + enable integbp + change prop_factor_master
-        * to 8 for channel A
-        */
-       hw->phy.ops.write_reg(hw, 0x1898, 0xD918);
-       /* Disable AHT in Slave mode on channel A */
-       hw->phy.ops.write_reg(hw, 0x187A, 0x0800);
-       /*
-        * Enable LPLU and disable AN to 1000 in non-D0a states,
-        * Enable SPD+B2B
-        */
-       hw->phy.ops.write_reg(hw, 0x0019, 0x008D);
-       /* Enable restart AN on an1000_dis change */
-       hw->phy.ops.write_reg(hw, 0x001B, 0x2080);
-       /* Enable wh_fifo read clock in 10/100 modes */
-       hw->phy.ops.write_reg(hw, 0x0014, 0x0045);
-       /* Restart AN, Speed selection is 1000 */
-       hw->phy.ops.write_reg(hw, 0x0000, 0x1340);
-
-       return E1000_SUCCESS;
-}
-
-/**
- *  igb_get_phy_type_from_id - Get PHY type from id
- *  @phy_id: phy_id read from the phy
- *
- *  Returns the phy type from the id.
- **/
-enum e1000_phy_type igb_get_phy_type_from_id(u32 phy_id)
-{
-       enum e1000_phy_type phy_type = e1000_phy_unknown;
-
-       switch (phy_id) {
-       case M88E1000_I_PHY_ID:
-       case M88E1000_E_PHY_ID:
-       case M88E1111_I_PHY_ID:
-       case M88E1011_I_PHY_ID:
-               phy_type = e1000_phy_m88;
-               break;
-       case IGP01E1000_I_PHY_ID: /* IGP 1 & 2 share this */
-               phy_type = e1000_phy_igp_2;
-               break;
-       case GG82563_E_PHY_ID:
-               phy_type = e1000_phy_gg82563;
-               break;
-       case IGP03E1000_E_PHY_ID:
-               phy_type = e1000_phy_igp_3;
-               break;
-       case IFE_E_PHY_ID:
-       case IFE_PLUS_E_PHY_ID:
-       case IFE_C_E_PHY_ID:
-               phy_type = e1000_phy_ife;
-               break;
-       default:
-               phy_type = e1000_phy_unknown;
-               break;
-       }
-       return phy_type;
-}
-
-/**
- *  igb_determine_phy_address - Determines PHY address.
- *  @hw: pointer to the HW structure
- *
- *  This uses a trial and error method to loop through possible PHY
- *  addresses. It tests each by reading the PHY ID registers and
- *  checking for a match.
- **/
-s32 igb_determine_phy_address(struct e1000_hw *hw)
-{
-       s32 ret_val = -E1000_ERR_PHY_TYPE;
-       u32 phy_addr = 0;
-       u32 i;
-       enum e1000_phy_type phy_type = e1000_phy_unknown;
-
-       hw->phy.id = phy_type;
-
-       for (phy_addr = 0; phy_addr < E1000_MAX_PHY_ADDR; phy_addr++) {
-               hw->phy.addr = phy_addr;
-               i = 0;
-
-               do {
-                       igb_get_phy_id(hw);
-                       phy_type = igb_get_phy_type_from_id(hw->phy.id);
-
-                       /*
-                        * If phy_type is valid, break - we found our
-                        * PHY address
-                        */
-                       if (phy_type  != e1000_phy_unknown) {
-                               ret_val = E1000_SUCCESS;
-                               goto out;
-                       }
-                       msec_delay(1);
-                       i++;
-               } while (i < 10);
-       }
-
-out:
-       return ret_val;
-}
-
-/**
- * igb_power_up_phy_copper - Restore copper link in case of PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, restore the link to previous
- * settings.
- **/
-void igb_power_up_phy_copper(struct e1000_hw *hw)
-{
-       u16 mii_reg = 0;
-
-       /* The PHY will retain its settings across a power down/up cycle */
-       hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
-       mii_reg &= ~MII_CR_POWER_DOWN;
-       hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
-}
-
-/**
- * igb_power_down_phy_copper - Restore copper link in case of PHY power down
- * @hw: pointer to the HW structure
- *
- * In the case of a PHY power down to save power, or to turn off link during a
- * driver unload, or wake on lan is not enabled, restore the link to previous
- * settings.
- **/
-void igb_power_down_phy_copper(struct e1000_hw *hw)
-{
-       u16 mii_reg = 0;
-
-       /* The PHY will retain its settings across a power down/up cycle */
-       hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
-       mii_reg |= MII_CR_POWER_DOWN;
-       hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
-       msec_delay(1);
-}
diff --git a/src/drivers/net/igb/igb_phy.h b/src/drivers/net/igb/igb_phy.h
deleted file mode 100644 (file)
index 8e6bc99..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#ifndef _IGB_PHY_H_
-#define _IGB_PHY_H_
-
-void igb_init_phy_ops_generic(struct e1000_hw *hw);
-s32  igb_check_downshift_generic(struct e1000_hw *hw);
-s32  igb_check_polarity_m88(struct e1000_hw *hw);
-s32  igb_check_polarity_igp(struct e1000_hw *hw);
-s32  igb_check_polarity_ife(struct e1000_hw *hw);
-s32  igb_check_reset_block_generic(struct e1000_hw *hw);
-s32  igb_copper_link_autoneg(struct e1000_hw *hw);
-s32  igb_copper_link_setup_igp(struct e1000_hw *hw);
-s32  igb_copper_link_setup_m88(struct e1000_hw *hw);
-#if 0
-s32  igb_phy_force_speed_duplex_igp(struct e1000_hw *hw);
-s32  igb_phy_force_speed_duplex_m88(struct e1000_hw *hw);
-s32  igb_phy_force_speed_duplex_ife(struct e1000_hw *hw);
-#endif
-#if 0
-s32  igb_get_cable_length_m88(struct e1000_hw *hw);
-s32  igb_get_cable_length_igp_2(struct e1000_hw *hw);
-#endif
-s32  igb_get_cfg_done_generic(struct e1000_hw *hw);
-s32  igb_get_phy_id(struct e1000_hw *hw);
-s32  igb_get_phy_info_igp(struct e1000_hw *hw);
-s32  igb_get_phy_info_m88(struct e1000_hw *hw);
-s32  igb_phy_sw_reset_generic(struct e1000_hw *hw);
-#if 0
-void igb_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl);
-#endif
-s32  igb_phy_hw_reset_generic(struct e1000_hw *hw);
-s32  igb_phy_reset_dsp_generic(struct e1000_hw *hw);
-s32  igb_read_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  igb_read_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  igb_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  igb_read_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  igb_read_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  igb_set_d3_lplu_state_generic(struct e1000_hw *hw, bool active);
-s32  igb_setup_copper_link_generic(struct e1000_hw *hw);
-s32  igb_wait_autoneg_generic(struct e1000_hw *hw);
-s32  igb_write_kmrn_reg_generic(struct e1000_hw *hw, u32 offset, u16 data);
-s32  igb_write_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 data);
-s32  igb_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data);
-s32  igb_write_phy_reg_igp_locked(struct e1000_hw *hw, u32 offset, u16 data);
-s32  igb_write_phy_reg_m88(struct e1000_hw *hw, u32 offset, u16 data);
-s32  igb_phy_reset_dsp(struct e1000_hw *hw);
-s32  igb_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
-                                u32 usec_interval, bool *success);
-s32  igb_phy_init_script_igp3(struct e1000_hw *hw);
-enum e1000_phy_type igb_get_phy_type_from_id(u32 phy_id);
-s32  igb_determine_phy_address(struct e1000_hw *hw);
-void igb_power_up_phy_copper(struct e1000_hw *hw);
-void igb_power_down_phy_copper(struct e1000_hw *hw);
-s32  igb_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  igb_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data);
-s32  igb_read_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 *data);
-s32  igb_write_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 data);
-
-#define E1000_MAX_PHY_ADDR                4
-
-/* IGP01E1000 Specific Registers */
-#define IGP01E1000_PHY_PORT_CONFIG        0x10 /* Port Config */
-#define IGP01E1000_PHY_PORT_STATUS        0x11 /* Status */
-#define IGP01E1000_PHY_PORT_CTRL          0x12 /* Control */
-#define IGP01E1000_PHY_LINK_HEALTH        0x13 /* PHY Link Health */
-#define IGP01E1000_GMII_FIFO              0x14 /* GMII FIFO */
-#define IGP01E1000_PHY_CHANNEL_QUALITY    0x15 /* PHY Channel Quality */
-#define IGP02E1000_PHY_POWER_MGMT         0x19 /* Power Management */
-#define IGP01E1000_PHY_PAGE_SELECT        0x1F /* Page Select */
-#define BM_PHY_PAGE_SELECT                22   /* Page Select for BM */
-#define IGP_PAGE_SHIFT                    5
-#define PHY_REG_MASK                      0x1F
-
-#define IGP01E1000_PHY_PCS_INIT_REG       0x00B4
-#define IGP01E1000_PHY_POLARITY_MASK      0x0078
-
-#define IGP01E1000_PSCR_AUTO_MDIX         0x1000
-#define IGP01E1000_PSCR_FORCE_MDI_MDIX    0x2000 /* 0=MDI, 1=MDIX */
-
-#define IGP01E1000_PSCFR_SMART_SPEED      0x0080
-
-/* Enable flexible speed on link-up */
-#define IGP01E1000_GMII_FLEX_SPD          0x0010
-#define IGP01E1000_GMII_SPD               0x0020 /* Enable SPD */
-
-#define IGP02E1000_PM_SPD                 0x0001 /* Smart Power Down */
-#define IGP02E1000_PM_D0_LPLU             0x0002 /* For D0a states */
-#define IGP02E1000_PM_D3_LPLU             0x0004 /* For all other states */
-
-#define IGP01E1000_PLHR_SS_DOWNGRADE      0x8000
-
-#define IGP01E1000_PSSR_POLARITY_REVERSED 0x0002
-#define IGP01E1000_PSSR_MDIX              0x0800
-#define IGP01E1000_PSSR_SPEED_MASK        0xC000
-#define IGP01E1000_PSSR_SPEED_1000MBPS    0xC000
-
-#define IGP02E1000_PHY_CHANNEL_NUM        4
-#define IGP02E1000_PHY_AGC_A              0x11B1
-#define IGP02E1000_PHY_AGC_B              0x12B1
-#define IGP02E1000_PHY_AGC_C              0x14B1
-#define IGP02E1000_PHY_AGC_D              0x18B1
-
-#define IGP02E1000_AGC_LENGTH_SHIFT       9   /* Course - 15:13, Fine - 12:9 */
-#define IGP02E1000_AGC_LENGTH_MASK        0x7F
-#define IGP02E1000_AGC_RANGE              15
-
-#define IGP03E1000_PHY_MISC_CTRL          0x1B
-#define IGP03E1000_PHY_MISC_DUPLEX_MANUAL_SET  0x1000 /* Manually Set Duplex */
-
-#define E1000_CABLE_LENGTH_UNDEFINED      0xFF
-
-#define E1000_KMRNCTRLSTA_OFFSET          0x001F0000
-#define E1000_KMRNCTRLSTA_OFFSET_SHIFT    16
-#define E1000_KMRNCTRLSTA_REN             0x00200000
-#define E1000_KMRNCTRLSTA_DIAG_OFFSET     0x3    /* Kumeran Diagnostic */
-#define E1000_KMRNCTRLSTA_TIMEOUTS        0x4    /* Kumeran Timeouts */
-#define E1000_KMRNCTRLSTA_INBAND_PARAM    0x9    /* Kumeran InBand Parameters */
-#define E1000_KMRNCTRLSTA_DIAG_NELPBK     0x1000 /* Nearend Loopback mode */
-
-#define IFE_PHY_EXTENDED_STATUS_CONTROL 0x10
-#define IFE_PHY_SPECIAL_CONTROL     0x11 /* 100BaseTx PHY Special Control */
-#define IFE_PHY_SPECIAL_CONTROL_LED 0x1B /* PHY Special and LED Control */
-#define IFE_PHY_MDIX_CONTROL        0x1C /* MDI/MDI-X Control */
-
-/* IFE PHY Extended Status Control */
-#define IFE_PESC_POLARITY_REVERSED    0x0100
-
-/* IFE PHY Special Control */
-#define IFE_PSC_AUTO_POLARITY_DISABLE      0x0010
-#define IFE_PSC_FORCE_POLARITY             0x0020
-#define IFE_PSC_DISABLE_DYNAMIC_POWER_DOWN 0x0100
-
-/* IFE PHY Special Control and LED Control */
-#define IFE_PSCL_PROBE_MODE            0x0020
-#define IFE_PSCL_PROBE_LEDS_OFF        0x0006 /* Force LEDs 0 and 2 off */
-#define IFE_PSCL_PROBE_LEDS_ON         0x0007 /* Force LEDs 0 and 2 on */
-
-/* IFE PHY MDIX Control */
-#define IFE_PMC_MDIX_STATUS      0x0020 /* 1=MDI-X, 0=MDI */
-#define IFE_PMC_FORCE_MDIX       0x0040 /* 1=force MDI-X, 0=force MDI */
-#define IFE_PMC_AUTO_MDIX        0x0080 /* 1=enable auto MDI/MDI-X, 0=disable */
-
-#endif /* _IGB_PHY_H_ */
diff --git a/src/drivers/net/igb/igb_regs.h b/src/drivers/net/igb/igb_regs.h
deleted file mode 100644 (file)
index e549675..0000000
+++ /dev/null
@@ -1,486 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2009 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-FILE_LICENCE ( GPL2_ONLY );
-
-#ifndef _IGB_REGS_H_
-#define _IGB_REGS_H_
-
-#define E1000_CTRL     0x00000  /* Device Control - RW */
-#define E1000_CTRL_DUP 0x00004  /* Device Control Duplicate (Shadow) - RW */
-#define E1000_STATUS   0x00008  /* Device Status - RO */
-#define E1000_EECD     0x00010  /* EEPROM/Flash Control - RW */
-#define E1000_EERD     0x00014  /* EEPROM Read - RW */
-#define E1000_CTRL_EXT 0x00018  /* Extended Device Control - RW */
-#define E1000_FLA      0x0001C  /* Flash Access - RW */
-#define E1000_MDIC     0x00020  /* MDI Control - RW */
-#define E1000_SCTL     0x00024  /* SerDes Control - RW */
-#define E1000_FCAL     0x00028  /* Flow Control Address Low - RW */
-#define E1000_FCAH     0x0002C  /* Flow Control Address High -RW */
-#define E1000_FEXT     0x0002C  /* Future Extended - RW */
-#define E1000_FEXTNVM  0x00028  /* Future Extended NVM - RW */
-#define E1000_FCT      0x00030  /* Flow Control Type - RW */
-#define E1000_CONNSW   0x00034  /* Copper/Fiber switch control - RW */
-#define E1000_VET      0x00038  /* VLAN Ether Type - RW */
-#define E1000_ICR      0x000C0  /* Interrupt Cause Read - R/clr */
-#define E1000_ITR      0x000C4  /* Interrupt Throttling Rate - RW */
-#define E1000_ICS      0x000C8  /* Interrupt Cause Set - WO */
-#define E1000_IMS      0x000D0  /* Interrupt Mask Set - RW */
-#define E1000_IMC      0x000D8  /* Interrupt Mask Clear - WO */
-#define E1000_IAM      0x000E0  /* Interrupt Acknowledge Auto Mask */
-#define E1000_RCTL     0x00100  /* Rx Control - RW */
-#define E1000_FCTTV    0x00170  /* Flow Control Transmit Timer Value - RW */
-#define E1000_TXCW     0x00178  /* Tx Configuration Word - RW */
-#define E1000_RXCW     0x00180  /* Rx Configuration Word - RO */
-#define E1000_EICR     0x01580  /* Ext. Interrupt Cause Read - R/clr */
-#define E1000_EITR(_n) (0x01680 + (0x4 * (_n)))
-#define E1000_EICS     0x01520  /* Ext. Interrupt Cause Set - W0 */
-#define E1000_EIMS     0x01524  /* Ext. Interrupt Mask Set/Read - RW */
-#define E1000_EIMC     0x01528  /* Ext. Interrupt Mask Clear - WO */
-#define E1000_EIAC     0x0152C  /* Ext. Interrupt Auto Clear - RW */
-#define E1000_EIAM     0x01530  /* Ext. Interrupt Ack Auto Clear Mask - RW */
-#define E1000_GPIE     0x01514  /* General Purpose Interrupt Enable - RW */
-#define E1000_IVAR0    0x01700  /* Interrupt Vector Allocation (array) - RW */
-#define E1000_IVAR_MISC 0x01740 /* IVAR for "other" causes - RW */
-#define E1000_TCTL     0x00400  /* Tx Control - RW */
-#define E1000_TCTL_EXT 0x00404  /* Extended Tx Control - RW */
-#define E1000_TIPG     0x00410  /* Tx Inter-packet gap -RW */
-#define E1000_TBT      0x00448  /* Tx Burst Timer - RW */
-#define E1000_AIT      0x00458  /* Adaptive Interframe Spacing Throttle - RW */
-#define E1000_LEDCTL   0x00E00  /* LED Control - RW */
-#define E1000_EXTCNF_CTRL  0x00F00  /* Extended Configuration Control */
-#define E1000_EXTCNF_SIZE  0x00F08  /* Extended Configuration Size */
-#define E1000_PHY_CTRL     0x00F10  /* PHY Control Register in CSR */
-#define E1000_PBA      0x01000  /* Packet Buffer Allocation - RW */
-#define E1000_PBS      0x01008  /* Packet Buffer Size */
-#define E1000_EEMNGCTL 0x01010  /* MNG EEprom Control */
-#define E1000_EEARBC   0x01024  /* EEPROM Auto Read Bus Control */
-#define E1000_FLASHT   0x01028  /* FLASH Timer Register */
-#define E1000_EEWR     0x0102C  /* EEPROM Write Register - RW */
-#define E1000_FLSWCTL  0x01030  /* FLASH control register */
-#define E1000_FLSWDATA 0x01034  /* FLASH data register */
-#define E1000_FLSWCNT  0x01038  /* FLASH Access Counter */
-#define E1000_FLOP     0x0103C  /* FLASH Opcode Register */
-#define E1000_I2CCMD   0x01028  /* SFPI2C Command Register - RW */
-#define E1000_I2CPARAMS 0x0102C /* SFPI2C Parameters Register - RW */
-#define E1000_WDSTP    0x01040  /* Watchdog Setup - RW */
-#define E1000_SWDSTS   0x01044  /* SW Device Status - RW */
-#define E1000_FRTIMER  0x01048  /* Free Running Timer - RW */
-#define E1000_TCPTIMER 0x0104C  /* TCP Timer - RW */
-#define E1000_VPDDIAG  0x01060  /* VPD Diagnostic - RO */
-#define E1000_ICR_V2   0x01500  /* Interrupt Cause - new location - RC */
-#define E1000_ICS_V2   0x01504  /* Interrupt Cause Set - new location - WO */
-#define E1000_IMS_V2   0x01508  /* Interrupt Mask Set/Read - new location - RW */
-#define E1000_IMC_V2   0x0150C  /* Interrupt Mask Clear - new location - WO */
-#define E1000_IAM_V2   0x01510  /* Interrupt Ack Auto Mask - new location - RW */
-#define E1000_ERT      0x02008  /* Early Rx Threshold - RW */
-#define E1000_FCRTL    0x02160  /* Flow Control Receive Threshold Low - RW */
-#define E1000_FCRTH    0x02168  /* Flow Control Receive Threshold High - RW */
-#define E1000_PSRCTL   0x02170  /* Packet Split Receive Control - RW */
-#define E1000_RDFPCQ(_n)  (0x02430 + (0x4 * (_n)))
-#define E1000_PBRTH    0x02458  /* PB Rx Arbitration Threshold - RW */
-#define E1000_FCRTV    0x02460  /* Flow Control Refresh Timer Value - RW */
-/* Split and Replication Rx Control - RW */
-#define E1000_RDPUMB   0x025CC  /* DMA Rx Descriptor uC Mailbox - RW */
-#define E1000_RDPUAD   0x025D0  /* DMA Rx Descriptor uC Addr Command - RW */
-#define E1000_RDPUWD   0x025D4  /* DMA Rx Descriptor uC Data Write - RW */
-#define E1000_RDPURD   0x025D8  /* DMA Rx Descriptor uC Data Read - RW */
-#define E1000_RDPUCTL  0x025DC  /* DMA Rx Descriptor uC Control - RW */
-#define E1000_PBDIAG   0x02458  /* Packet Buffer Diagnostic - RW */
-#define E1000_RXPBS    0x02404  /* Rx Packet Buffer Size - RW */
-#define E1000_RDTR     0x02820  /* Rx Delay Timer - RW */
-#define E1000_RADV     0x0282C  /* Rx Interrupt Absolute Delay Timer - RW */
-/*
- * Convenience macros
- *
- * Note: "_n" is the queue number of the register to be written to.
- *
- * Example usage:
- * E1000_RDBAL_REG(current_rx_queue)
- */
-#define E1000_RDBAL(_n)      ((_n) < 4 ? (0x02800 + ((_n) * 0x100)) : \
-                                         (0x0C000 + ((_n) * 0x40)))
-#define E1000_RDBAH(_n)      ((_n) < 4 ? (0x02804 + ((_n) * 0x100)) : \
-                                         (0x0C004 + ((_n) * 0x40)))
-#define E1000_RDLEN(_n)      ((_n) < 4 ? (0x02808 + ((_n) * 0x100)) : \
-                                         (0x0C008 + ((_n) * 0x40)))
-#define E1000_SRRCTL(_n)     ((_n) < 4 ? (0x0280C + ((_n) * 0x100)) : \
-                                         (0x0C00C + ((_n) * 0x40)))
-#define E1000_RDH(_n)        ((_n) < 4 ? (0x02810 + ((_n) * 0x100)) : \
-                                         (0x0C010 + ((_n) * 0x40)))
-#define E1000_RXCTL(_n)      ((_n) < 4 ? (0x02814 + ((_n) * 0x100)) : \
-                                         (0x0C014 + ((_n) * 0x40)))
-#define E1000_DCA_RXCTRL(_n) E1000_RXCTL(_n)
-#define E1000_RDT(_n)        ((_n) < 4 ? (0x02818 + ((_n) * 0x100)) : \
-                                         (0x0C018 + ((_n) * 0x40)))
-#define E1000_RXDCTL(_n)     ((_n) < 4 ? (0x02828 + ((_n) * 0x100)) : \
-                                         (0x0C028 + ((_n) * 0x40)))
-#define E1000_RQDPC(_n)      ((_n) < 4 ? (0x02830 + ((_n) * 0x100)) : \
-                                         (0x0C030 + ((_n) * 0x40)))
-#define E1000_TDBAL(_n)      ((_n) < 4 ? (0x03800 + ((_n) * 0x100)) : \
-                                         (0x0E000 + ((_n) * 0x40)))
-#define E1000_TDBAH(_n)      ((_n) < 4 ? (0x03804 + ((_n) * 0x100)) : \
-                                         (0x0E004 + ((_n) * 0x40)))
-#define E1000_TDLEN(_n)      ((_n) < 4 ? (0x03808 + ((_n) * 0x100)) : \
-                                         (0x0E008 + ((_n) * 0x40)))
-#define E1000_TDH(_n)        ((_n) < 4 ? (0x03810 + ((_n) * 0x100)) : \
-                                         (0x0E010 + ((_n) * 0x40)))
-#define E1000_TXCTL(_n)      ((_n) < 4 ? (0x03814 + ((_n) * 0x100)) : \
-                                         (0x0E014 + ((_n) * 0x40)))
-#define E1000_DCA_TXCTRL(_n) E1000_TXCTL(_n)
-#define E1000_TDT(_n)        ((_n) < 4 ? (0x03818 + ((_n) * 0x100)) : \
-                                         (0x0E018 + ((_n) * 0x40)))
-#define E1000_TXDCTL(_n)     ((_n) < 4 ? (0x03828 + ((_n) * 0x100)) : \
-                                         (0x0E028 + ((_n) * 0x40)))
-#define E1000_TDWBAL(_n)     ((_n) < 4 ? (0x03838 + ((_n) * 0x100)) : \
-                                         (0x0E038 + ((_n) * 0x40)))
-#define E1000_TDWBAH(_n)     ((_n) < 4 ? (0x0383C + ((_n) * 0x100)) : \
-                                         (0x0E03C + ((_n) * 0x40)))
-#define E1000_TARC(_n)                   (0x03840 + ((_n) * 0x100))
-#define E1000_RSRPD    0x02C00  /* Rx Small Packet Detect - RW */
-#define E1000_RAID     0x02C08  /* Receive Ack Interrupt Delay - RW */
-#define E1000_TXDMAC   0x03000  /* Tx DMA Control - RW */
-#define E1000_KABGTXD  0x03004  /* AFE Band Gap Transmit Ref Data */
-#define E1000_PSRTYPE(_i)       (0x05480 + ((_i) * 4))
-#define E1000_RAL(_i)  (((_i) <= 15) ? (0x05400 + ((_i) * 8)) : \
-                                       (0x054E0 + ((_i - 16) * 8)))
-#define E1000_RAH(_i)  (((_i) <= 15) ? (0x05404 + ((_i) * 8)) : \
-                                       (0x054E4 + ((_i - 16) * 8)))
-#define E1000_IP4AT_REG(_i)     (0x05840 + ((_i) * 8))
-#define E1000_IP6AT_REG(_i)     (0x05880 + ((_i) * 4))
-#define E1000_WUPM_REG(_i)      (0x05A00 + ((_i) * 4))
-#define E1000_FFMT_REG(_i)      (0x09000 + ((_i) * 8))
-#define E1000_FFVT_REG(_i)      (0x09800 + ((_i) * 8))
-#define E1000_FFLT_REG(_i)      (0x05F00 + ((_i) * 8))
-#define E1000_PBSLAC   0x03100  /* Packet Buffer Slave Access Control */
-#define E1000_PBSLAD(_n)  (0x03110 + (0x4 * (_n)))  /* Packet Buffer DWORD (_n) */
-#define E1000_TXPBS    0x03404  /* Tx Packet Buffer Size - RW */
-#define E1000_TDFH     0x03410  /* Tx Data FIFO Head - RW */
-#define E1000_TDFT     0x03418  /* Tx Data FIFO Tail - RW */
-#define E1000_TDFHS    0x03420  /* Tx Data FIFO Head Saved - RW */
-#define E1000_TDFTS    0x03428  /* Tx Data FIFO Tail Saved - RW */
-#define E1000_TDFPC    0x03430  /* Tx Data FIFO Packet Count - RW */
-#define E1000_TDPUMB   0x0357C  /* DMA Tx Descriptor uC Mail Box - RW */
-#define E1000_TDPUAD   0x03580  /* DMA Tx Descriptor uC Addr Command - RW */
-#define E1000_TDPUWD   0x03584  /* DMA Tx Descriptor uC Data Write - RW */
-#define E1000_TDPURD   0x03588  /* DMA Tx Descriptor uC Data  Read  - RW */
-#define E1000_TDPUCTL  0x0358C  /* DMA Tx Descriptor uC Control - RW */
-#define E1000_DTXCTL   0x03590  /* DMA Tx Control - RW */
-#define E1000_DTXTCPFLGL 0x0359C /* DMA Tx Control flag low - RW */
-#define E1000_DTXTCPFLGH 0x035A0 /* DMA Tx Control flag high - RW */
-#define E1000_DTXMXSZRQ  0x03540 /* DMA Tx Max Total Allow Size Requests - RW */
-#define E1000_TIDV     0x03820  /* Tx Interrupt Delay Value - RW */
-#define E1000_TADV     0x0382C  /* Tx Interrupt Absolute Delay Val - RW */
-#define E1000_TSPMT    0x03830  /* TCP Segmentation PAD & Min Threshold - RW */
-#define E1000_CRCERRS  0x04000  /* CRC Error Count - R/clr */
-#define E1000_ALGNERRC 0x04004  /* Alignment Error Count - R/clr */
-#define E1000_SYMERRS  0x04008  /* Symbol Error Count - R/clr */
-#define E1000_RXERRC   0x0400C  /* Receive Error Count - R/clr */
-#define E1000_MPC      0x04010  /* Missed Packet Count - R/clr */
-#define E1000_SCC      0x04014  /* Single Collision Count - R/clr */
-#define E1000_ECOL     0x04018  /* Excessive Collision Count - R/clr */
-#define E1000_MCC      0x0401C  /* Multiple Collision Count - R/clr */
-#define E1000_LATECOL  0x04020  /* Late Collision Count - R/clr */
-#define E1000_COLC     0x04028  /* Collision Count - R/clr */
-#define E1000_DC       0x04030  /* Defer Count - R/clr */
-#define E1000_TNCRS    0x04034  /* Tx-No CRS - R/clr */
-#define E1000_SEC      0x04038  /* Sequence Error Count - R/clr */
-#define E1000_CEXTERR  0x0403C  /* Carrier Extension Error Count - R/clr */
-#define E1000_RLEC     0x04040  /* Receive Length Error Count - R/clr */
-#define E1000_XONRXC   0x04048  /* XON Rx Count - R/clr */
-#define E1000_XONTXC   0x0404C  /* XON Tx Count - R/clr */
-#define E1000_XOFFRXC  0x04050  /* XOFF Rx Count - R/clr */
-#define E1000_XOFFTXC  0x04054  /* XOFF Tx Count - R/clr */
-#define E1000_FCRUC    0x04058  /* Flow Control Rx Unsupported Count- R/clr */
-#define E1000_PRC64    0x0405C  /* Packets Rx (64 bytes) - R/clr */
-#define E1000_PRC127   0x04060  /* Packets Rx (65-127 bytes) - R/clr */
-#define E1000_PRC255   0x04064  /* Packets Rx (128-255 bytes) - R/clr */
-#define E1000_PRC511   0x04068  /* Packets Rx (255-511 bytes) - R/clr */
-#define E1000_PRC1023  0x0406C  /* Packets Rx (512-1023 bytes) - R/clr */
-#define E1000_PRC1522  0x04070  /* Packets Rx (1024-1522 bytes) - R/clr */
-#define E1000_GPRC     0x04074  /* Good Packets Rx Count - R/clr */
-#define E1000_BPRC     0x04078  /* Broadcast Packets Rx Count - R/clr */
-#define E1000_MPRC     0x0407C  /* Multicast Packets Rx Count - R/clr */
-#define E1000_GPTC     0x04080  /* Good Packets Tx Count - R/clr */
-#define E1000_GORCL    0x04088  /* Good Octets Rx Count Low - R/clr */
-#define E1000_GORCH    0x0408C  /* Good Octets Rx Count High - R/clr */
-#define E1000_GOTCL    0x04090  /* Good Octets Tx Count Low - R/clr */
-#define E1000_GOTCH    0x04094  /* Good Octets Tx Count High - R/clr */
-#define E1000_RNBC     0x040A0  /* Rx No Buffers Count - R/clr */
-#define E1000_RUC      0x040A4  /* Rx Undersize Count - R/clr */
-#define E1000_RFC      0x040A8  /* Rx Fragment Count - R/clr */
-#define E1000_ROC      0x040AC  /* Rx Oversize Count - R/clr */
-#define E1000_RJC      0x040B0  /* Rx Jabber Count - R/clr */
-#define E1000_MGTPRC   0x040B4  /* Management Packets Rx Count - R/clr */
-#define E1000_MGTPDC   0x040B8  /* Management Packets Dropped Count - R/clr */
-#define E1000_MGTPTC   0x040BC  /* Management Packets Tx Count - R/clr */
-#define E1000_TORL     0x040C0  /* Total Octets Rx Low - R/clr */
-#define E1000_TORH     0x040C4  /* Total Octets Rx High - R/clr */
-#define E1000_TOTL     0x040C8  /* Total Octets Tx Low - R/clr */
-#define E1000_TOTH     0x040CC  /* Total Octets Tx High - R/clr */
-#define E1000_TPR      0x040D0  /* Total Packets Rx - R/clr */
-#define E1000_TPT      0x040D4  /* Total Packets Tx - R/clr */
-#define E1000_PTC64    0x040D8  /* Packets Tx (64 bytes) - R/clr */
-#define E1000_PTC127   0x040DC  /* Packets Tx (65-127 bytes) - R/clr */
-#define E1000_PTC255   0x040E0  /* Packets Tx (128-255 bytes) - R/clr */
-#define E1000_PTC511   0x040E4  /* Packets Tx (256-511 bytes) - R/clr */
-#define E1000_PTC1023  0x040E8  /* Packets Tx (512-1023 bytes) - R/clr */
-#define E1000_PTC1522  0x040EC  /* Packets Tx (1024-1522 Bytes) - R/clr */
-#define E1000_MPTC     0x040F0  /* Multicast Packets Tx Count - R/clr */
-#define E1000_BPTC     0x040F4  /* Broadcast Packets Tx Count - R/clr */
-#define E1000_TSCTC    0x040F8  /* TCP Segmentation Context Tx - R/clr */
-#define E1000_TSCTFC   0x040FC  /* TCP Segmentation Context Tx Fail - R/clr */
-#define E1000_IAC      0x04100  /* Interrupt Assertion Count */
-#define E1000_ICRXPTC  0x04104  /* Interrupt Cause Rx Pkt Timer Expire Count */
-#define E1000_ICRXATC  0x04108  /* Interrupt Cause Rx Abs Timer Expire Count */
-#define E1000_ICTXPTC  0x0410C  /* Interrupt Cause Tx Pkt Timer Expire Count */
-#define E1000_ICTXATC  0x04110  /* Interrupt Cause Tx Abs Timer Expire Count */
-#define E1000_ICTXQEC  0x04118  /* Interrupt Cause Tx Queue Empty Count */
-#define E1000_ICTXQMTC 0x0411C  /* Interrupt Cause Tx Queue Min Thresh Count */
-#define E1000_ICRXDMTC 0x04120  /* Interrupt Cause Rx Desc Min Thresh Count */
-#define E1000_ICRXOC   0x04124  /* Interrupt Cause Receiver Overrun Count */
-
-#define E1000_LSECTXUT        0x04300  /* LinkSec Tx Untagged Packet Count - OutPktsUntagged */
-#define E1000_LSECTXPKTE      0x04304  /* LinkSec Encrypted Tx Packets Count - OutPktsEncrypted */
-#define E1000_LSECTXPKTP      0x04308  /* LinkSec Protected Tx Packet Count - OutPktsProtected */
-#define E1000_LSECTXOCTE      0x0430C  /* LinkSec Encrypted Tx Octets Count - OutOctetsEncrypted */
-#define E1000_LSECTXOCTP      0x04310  /* LinkSec Protected Tx Octets Count - OutOctetsProtected */
-#define E1000_LSECRXUT        0x04314  /* LinkSec Untagged non-Strict Rx Packet Count - InPktsUntagged/InPktsNoTag */
-#define E1000_LSECRXOCTD      0x0431C  /* LinkSec Rx Octets Decrypted Count - InOctetsDecrypted */
-#define E1000_LSECRXOCTV      0x04320  /* LinkSec Rx Octets Validated - InOctetsValidated */
-#define E1000_LSECRXBAD       0x04324  /* LinkSec Rx Bad Tag - InPktsBadTag */
-#define E1000_LSECRXNOSCI     0x04328  /* LinkSec Rx Packet No SCI Count - InPktsNoSci */
-#define E1000_LSECRXUNSCI     0x0432C  /* LinkSec Rx Packet Unknown SCI Count - InPktsUnknownSci */
-#define E1000_LSECRXUNCH      0x04330  /* LinkSec Rx Unchecked Packets Count - InPktsUnchecked */
-#define E1000_LSECRXDELAY     0x04340  /* LinkSec Rx Delayed Packet Count - InPktsDelayed */
-#define E1000_LSECRXLATE      0x04350  /* LinkSec Rx Late Packets Count - InPktsLate */
-#define E1000_LSECRXOK(_n)    (0x04360 + (0x04 * (_n))) /* LinkSec Rx Packet OK Count - InPktsOk */
-#define E1000_LSECRXINV(_n)   (0x04380 + (0x04 * (_n))) /* LinkSec Rx Invalid Count - InPktsInvalid */
-#define E1000_LSECRXNV(_n)    (0x043A0 + (0x04 * (_n))) /* LinkSec Rx Not Valid Count - InPktsNotValid */
-#define E1000_LSECRXUNSA      0x043C0  /* LinkSec Rx Unused SA Count - InPktsUnusedSa */
-#define E1000_LSECRXNUSA      0x043D0  /* LinkSec Rx Not Using SA Count - InPktsNotUsingSa */
-#define E1000_LSECTXCAP       0x0B000  /* LinkSec Tx Capabilities Register - RO */
-#define E1000_LSECRXCAP       0x0B300  /* LinkSec Rx Capabilities Register - RO */
-#define E1000_LSECTXCTRL      0x0B004  /* LinkSec Tx Control - RW */
-#define E1000_LSECRXCTRL      0x0B304  /* LinkSec Rx Control - RW */
-#define E1000_LSECTXSCL       0x0B008  /* LinkSec Tx SCI Low - RW */
-#define E1000_LSECTXSCH       0x0B00C  /* LinkSec Tx SCI High - RW */
-#define E1000_LSECTXSA        0x0B010  /* LinkSec Tx SA0 - RW */
-#define E1000_LSECTXPN0       0x0B018  /* LinkSec Tx SA PN 0 - RW */
-#define E1000_LSECTXPN1       0x0B01C  /* LinkSec Tx SA PN 1 - RW */
-#define E1000_LSECRXSCL       0x0B3D0  /* LinkSec Rx SCI Low - RW */
-#define E1000_LSECRXSCH       0x0B3E0  /* LinkSec Rx SCI High - RW */
-#define E1000_LSECTXKEY0(_n)  (0x0B020 + (0x04 * (_n))) /* LinkSec Tx 128-bit Key 0 - WO */
-#define E1000_LSECTXKEY1(_n)  (0x0B030 + (0x04 * (_n))) /* LinkSec Tx 128-bit Key 1 - WO */
-#define E1000_LSECRXSA(_n)    (0x0B310 + (0x04 * (_n))) /* LinkSec Rx SAs - RW */
-#define E1000_LSECRXPN(_n)    (0x0B330 + (0x04 * (_n))) /* LinkSec Rx SAs - RW */
-/*
- * LinkSec Rx Keys  - where _n is the SA no. and _m the 4 dwords of the 128 bit
- * key - RW.
- */
-#define E1000_LSECRXKEY(_n, _m) (0x0B350 + (0x10 * (_n)) + (0x04 * (_m)))
-
-#define E1000_SSVPC             0x041A0  /* Switch Security Violation Packet Count */
-#define E1000_IPSCTRL           0xB430   /* IpSec Control Register */
-#define E1000_IPSRXCMD          0x0B408  /* IPSec Rx Command Register - RW */
-#define E1000_IPSRXIDX          0x0B400  /* IPSec Rx Index - RW */
-#define E1000_IPSRXIPADDR(_n)   (0x0B420+ (0x04 * (_n)))  /* IPSec Rx IPv4/v6 Address - RW */
-#define E1000_IPSRXKEY(_n)      (0x0B410 + (0x04 * (_n))) /* IPSec Rx 128-bit Key - RW */
-#define E1000_IPSRXSALT         0x0B404  /* IPSec Rx Salt - RW */
-#define E1000_IPSRXSPI          0x0B40C  /* IPSec Rx SPI - RW */
-#define E1000_IPSTXKEY(_n)      (0x0B460 + (0x04 * (_n))) /* IPSec Tx 128-bit Key - RW */
-#define E1000_IPSTXSALT         0x0B454  /* IPSec Tx Salt - RW */
-#define E1000_IPSTXIDX          0x0B450  /* IPSec Tx SA IDX - RW */
-#define E1000_PCS_CFG0    0x04200  /* PCS Configuration 0 - RW */
-#define E1000_PCS_LCTL    0x04208  /* PCS Link Control - RW */
-#define E1000_PCS_LSTAT   0x0420C  /* PCS Link Status - RO */
-#define E1000_CBTMPC      0x0402C  /* Circuit Breaker Tx Packet Count */
-#define E1000_HTDPMC      0x0403C  /* Host Transmit Discarded Packets */
-#define E1000_CBRDPC      0x04044  /* Circuit Breaker Rx Dropped Count */
-#define E1000_CBRMPC      0x040FC  /* Circuit Breaker Rx Packet Count */
-#define E1000_RPTHC       0x04104  /* Rx Packets To Host */
-#define E1000_HGPTC       0x04118  /* Host Good Packets Tx Count */
-#define E1000_HTCBDPC     0x04124  /* Host Tx Circuit Breaker Dropped Count */
-#define E1000_HGORCL      0x04128  /* Host Good Octets Received Count Low */
-#define E1000_HGORCH      0x0412C  /* Host Good Octets Received Count High */
-#define E1000_HGOTCL      0x04130  /* Host Good Octets Transmit Count Low */
-#define E1000_HGOTCH      0x04134  /* Host Good Octets Transmit Count High */
-#define E1000_LENERRS     0x04138  /* Length Errors Count */
-#define E1000_SCVPC       0x04228  /* SerDes/SGMII Code Violation Pkt Count */
-#define E1000_HRMPC       0x0A018  /* Header Redirection Missed Packet Count */
-#define E1000_PCS_ANADV   0x04218  /* AN advertisement - RW */
-#define E1000_PCS_LPAB    0x0421C  /* Link Partner Ability - RW */
-#define E1000_PCS_NPTX    0x04220  /* AN Next Page Transmit - RW */
-#define E1000_PCS_LPABNP  0x04224  /* Link Partner Ability Next Page - RW */
-#define E1000_1GSTAT_RCV  0x04228  /* 1GSTAT Code Violation Packet Count - RW */
-#define E1000_RXCSUM   0x05000  /* Rx Checksum Control - RW */
-#define E1000_RLPML    0x05004  /* Rx Long Packet Max Length */
-#define E1000_RFCTL    0x05008  /* Receive Filter Control*/
-#define E1000_MTA      0x05200  /* Multicast Table Array - RW Array */
-#define E1000_RA       0x05400  /* Receive Address - RW Array */
-#define E1000_RA2      0x054E0  /* 2nd half of receive address array - RW Array */
-#define E1000_VFTA     0x05600  /* VLAN Filter Table Array - RW Array */
-#define E1000_VT_CTL   0x0581C  /* VMDq Control - RW */
-#define E1000_VFQA0    0x0B000  /* VLAN Filter Queue Array 0 - RW Array */
-#define E1000_VFQA1    0x0B200  /* VLAN Filter Queue Array 1 - RW Array */
-#define E1000_WUC      0x05800  /* Wakeup Control - RW */
-#define E1000_WUFC     0x05808  /* Wakeup Filter Control - RW */
-#define E1000_WUS      0x05810  /* Wakeup Status - RO */
-#define E1000_MANC     0x05820  /* Management Control - RW */
-#define E1000_IPAV     0x05838  /* IP Address Valid - RW */
-#define E1000_IP4AT    0x05840  /* IPv4 Address Table - RW Array */
-#define E1000_IP6AT    0x05880  /* IPv6 Address Table - RW Array */
-#define E1000_WUPL     0x05900  /* Wakeup Packet Length - RW */
-#define E1000_WUPM     0x05A00  /* Wakeup Packet Memory - RO A */
-#define E1000_PBACL    0x05B68  /* MSIx PBA Clear - Read/Write 1's to clear */
-#define E1000_FFLT     0x05F00  /* Flexible Filter Length Table - RW Array */
-#define E1000_HOST_IF  0x08800  /* Host Interface */
-#define E1000_FFMT     0x09000  /* Flexible Filter Mask Table - RW Array */
-#define E1000_FFVT     0x09800  /* Flexible Filter Value Table - RW Array */
-#define E1000_FHFT(_n)  (0x09000 + (_n * 0x100)) /* Flexible Host Filter Table */
-#define E1000_FHFT_EXT(_n) (0x09A00 + (_n * 0x100)) /* Ext Flexible Host Filter Table */
-
-
-#define E1000_KMRNCTRLSTA 0x00034 /* MAC-PHY interface - RW */
-#define E1000_MDPHYA      0x0003C /* PHY address - RW */
-#define E1000_MANC2H      0x05860 /* Management Control To Host - RW */
-#define E1000_SW_FW_SYNC  0x05B5C /* Software-Firmware Synchronization - RW */
-#define E1000_CCMCTL      0x05B48 /* CCM Control Register */
-#define E1000_GIOCTL      0x05B44 /* GIO Analog Control Register */
-#define E1000_SCCTL       0x05B4C /* PCIc PLL Configuration Register */
-#define E1000_GCR         0x05B00 /* PCI-Ex Control */
-#define E1000_GCR2        0x05B64 /* PCI-Ex Control #2 */
-#define E1000_GSCL_1    0x05B10 /* PCI-Ex Statistic Control #1 */
-#define E1000_GSCL_2    0x05B14 /* PCI-Ex Statistic Control #2 */
-#define E1000_GSCL_3    0x05B18 /* PCI-Ex Statistic Control #3 */
-#define E1000_GSCL_4    0x05B1C /* PCI-Ex Statistic Control #4 */
-#define E1000_FACTPS    0x05B30 /* Function Active and Power State to MNG */
-#define E1000_SWSM      0x05B50 /* SW Semaphore */
-#define E1000_FWSM      0x05B54 /* FW Semaphore */
-#define E1000_SWSM2     0x05B58 /* Driver-only SW semaphore (not used by BOOT agents) */
-#define E1000_DCA_ID    0x05B70 /* DCA Requester ID Information - RO */
-#define E1000_DCA_CTRL  0x05B74 /* DCA Control - RW */
-#define E1000_FFLT_DBG  0x05F04 /* Debug Register */
-#define E1000_HICR      0x08F00 /* Host Interface Control */
-
-/* RSS registers */
-#define E1000_CPUVEC    0x02C10 /* CPU Vector Register - RW */
-#define E1000_MRQC      0x05818 /* Multiple Receive Control - RW */
-#define E1000_IMIR(_i)      (0x05A80 + ((_i) * 4))  /* Immediate Interrupt */
-#define E1000_IMIREXT(_i)   (0x05AA0 + ((_i) * 4))  /* Immediate Interrupt Ext*/
-#define E1000_IMIRVP    0x05AC0 /* Immediate Interrupt Rx VLAN Priority - RW */
-#define E1000_MSIXBM(_i)    (0x01600 + ((_i) * 4)) /* MSI-X Allocation Register
-                                                    * (_i) - RW */
-#define E1000_MSIXTADD(_i)  (0x0C000 + ((_i) * 0x10)) /* MSI-X Table entry addr
-                                                       * low reg - RW */
-#define E1000_MSIXTUADD(_i) (0x0C004 + ((_i) * 0x10)) /* MSI-X Table entry addr
-                                                       * upper reg - RW */
-#define E1000_MSIXTMSG(_i)  (0x0C008 + ((_i) * 0x10)) /* MSI-X Table entry
-                                                       * message reg - RW */
-#define E1000_MSIXVCTRL(_i) (0x0C00C + ((_i) * 0x10)) /* MSI-X Table entry
-                                                       * vector ctrl reg - RW */
-#define E1000_MSIXPBA    0x0E000 /* MSI-X Pending bit array */
-#define E1000_RETA(_i)  (0x05C00 + ((_i) * 4)) /* Redirection Table - RW */
-#define E1000_RSSRK(_i) (0x05C80 + ((_i) * 4)) /* RSS Random Key - RW */
-#define E1000_RSSIM     0x05864 /* RSS Interrupt Mask */
-#define E1000_RSSIR     0x05868 /* RSS Interrupt Request */
-/* VT Registers */
-#define E1000_SWPBS     0x03004 /* Switch Packet Buffer Size - RW */
-#define E1000_MBVFICR   0x00C80 /* Mailbox VF Cause - RWC */
-#define E1000_MBVFIMR   0x00C84 /* Mailbox VF int Mask - RW */
-#define E1000_VFLRE     0x00C88 /* VF Register Events - RWC */
-#define E1000_VFRE      0x00C8C /* VF Receive Enables */
-#define E1000_VFTE      0x00C90 /* VF Transmit Enables */
-#define E1000_QDE       0x02408 /* Queue Drop Enable - RW */
-#define E1000_DTXSWC    0x03500 /* DMA Tx Switch Control - RW */
-#define E1000_RPLOLR    0x05AF0 /* Replication Offload - RW */
-#define E1000_UTA       0x0A000 /* Unicast Table Array - RW */
-#define E1000_IOVTCL    0x05BBC /* IOV Control Register */
-#define E1000_VMRCTL    0X05D80 /* Virtual Mirror Rule Control */
-/* These act per VF so an array friendly macro is used */
-#define E1000_V2PMAILBOX(_n)   (0x00C40 + (4 * (_n)))
-#define E1000_P2VMAILBOX(_n)   (0x00C00 + (4 * (_n)))
-#define E1000_VMBMEM(_n)       (0x00800 + (64 * (_n)))
-#define E1000_VFVMBMEM(_n)     (0x00800 + (_n))
-#define E1000_VMOLR(_n)        (0x05AD0 + (4 * (_n)))
-#define E1000_VLVF(_n)         (0x05D00 + (4 * (_n))) /* VLAN Virtual Machine
-                                                       * Filter - RW */
-/* Time Sync */
-#define E1000_TSYNCRXCTL 0x0B620 /* Rx Time Sync Control register - RW */
-#define E1000_TSYNCTXCTL 0x0B614 /* Tx Time Sync Control register - RW */
-#define E1000_TSYNCRXCFG 0x05F50 /* Time Sync Rx Configuration - RW */
-#define E1000_RXSTMPL    0x0B624 /* Rx timestamp Low - RO */
-#define E1000_RXSTMPH    0x0B628 /* Rx timestamp High - RO */
-#define E1000_RXSATRL    0x0B62C /* Rx timestamp attribute low - RO */
-#define E1000_RXSATRH    0x0B630 /* Rx timestamp attribute high - RO */
-#define E1000_TXSTMPL    0x0B618 /* Tx timestamp value Low - RO */
-#define E1000_TXSTMPH    0x0B61C /* Tx timestamp value High - RO */
-#define E1000_SYSTIML    0x0B600 /* System time register Low - RO */
-#define E1000_SYSTIMH    0x0B604 /* System time register High - RO */
-#define E1000_TIMINCA    0x0B608 /* Increment attributes register - RW */
-
-/* Filtering Registers */
-#define E1000_SAQF(_n)  (0x05980 + (4 * (_n))) /* Source Address Queue Fltr */
-#define E1000_DAQF(_n)  (0x059A0 + (4 * (_n))) /* Dest Address Queue Fltr */
-#define E1000_SPQF(_n)  (0x059C0 + (4 * (_n))) /* Source Port Queue Fltr */
-#define E1000_FTQF(_n)  (0x059E0 + (4 * (_n))) /* 5-tuple Queue Fltr */
-#define E1000_TTQF(_n)  (0x059E0 + (4 * (_n))) /* 2-tuple Queue Fltr */
-#define E1000_SYNQF(_n) (0x055FC + (4 * (_n))) /* SYN Packet Queue Fltr */
-#define E1000_ETQF(_n)  (0x05CB0 + (4 * (_n))) /* EType Queue Fltr */
-
-#define E1000_RTTDCS            0x3600  /* Reedtown Tx Desc plane control and status */
-#define E1000_RTTPCS            0x3474  /* Reedtown Tx Packet Plane control and status */
-#define E1000_RTRPCS            0x2474  /* Rx packet plane control and status */
-#define E1000_RTRUP2TC          0x05AC4 /* Rx User Priority to Traffic Class */
-#define E1000_RTTUP2TC          0x0418  /* Transmit User Priority to Traffic Class */
-#define E1000_RTTDTCRC(_n)      (0x3610 + ((_n) * 4)) /* Tx Desc plane TC Rate-scheduler config */
-#define E1000_RTTPTCRC(_n)      (0x3480 + ((_n) * 4)) /* Tx Packet plane TC Rate-Scheduler Config */
-#define E1000_RTRPTCRC(_n)      (0x2480 + ((_n) * 4)) /* Rx Packet plane TC Rate-Scheduler Config */
-#define E1000_RTTDTCRS(_n)      (0x3630 + ((_n) * 4)) /* Tx Desc Plane TC Rate-Scheduler Status */
-#define E1000_RTTDTCRM(_n)      (0x3650 + ((_n) * 4)) /* Tx Desc Plane TC Rate-Scheduler MMW */
-#define E1000_RTTPTCRS(_n)      (0x34A0 + ((_n) * 4)) /* Tx Packet plane TC Rate-Scheduler Status */
-#define E1000_RTTPTCRM(_n)      (0x34C0 + ((_n) * 4)) /* Tx Packet plane TC Rate-scheduler MMW */
-#define E1000_RTRPTCRS(_n)      (0x24A0 + ((_n) * 4)) /* Rx Packet plane TC Rate-Scheduler Status */
-#define E1000_RTRPTCRM(_n)      (0x24C0 + ((_n) * 4)) /* Rx Packet plane TC Rate-Scheduler MMW */
-#define E1000_RTTDVMRM(_n)      (0x3670 + ((_n) * 4)) /* Tx Desc plane VM Rate-Scheduler MMW*/
-#define E1000_RTTBCNRM(_n)      (0x3690 + ((_n) * 4)) /* Tx BCN Rate-Scheduler MMW */
-#define E1000_RTTDQSEL          0x3604  /* Tx Desc Plane Queue Select */
-#define E1000_RTTDVMRC          0x3608  /* Tx Desc Plane VM Rate-Scheduler Config */
-#define E1000_RTTDVMRS          0x360C  /* Tx Desc Plane VM Rate-Scheduler Status */
-#define E1000_RTTBCNRC          0x36B0  /* Tx BCN Rate-Scheduler Config */
-#define E1000_RTTBCNRS          0x36B4  /* Tx BCN Rate-Scheduler Status */
-#define E1000_RTTBCNCR          0xB200  /* Tx BCN Control Register */
-#define E1000_RTTBCNTG          0x35A4  /* Tx BCN Tagging */
-#define E1000_RTTBCNCP          0xB208  /* Tx BCN Congestion point */
-#define E1000_RTRBCNCR          0xB20C  /* Rx BCN Control Register */
-#define E1000_RTTBCNRD          0x36B8  /* Tx BCN Rate Drift */
-#define E1000_PFCTOP            0x1080  /* Priority Flow Control Type and Opcode */
-#define E1000_RTTBCNIDX         0xB204  /* Tx BCN Congestion Point */
-#define E1000_RTTBCNACH         0x0B214 /* Tx BCN Control High */
-#define E1000_RTTBCNACL         0x0B210 /* Tx BCN Control Low */
-
-#endif /* _IGB_REGS_H_ */
diff --git a/src/drivers/net/intel.c b/src/drivers/net/intel.c
new file mode 100644 (file)
index 0000000..3eb1a37
--- /dev/null
@@ -0,0 +1,946 @@
+/*
+ * Copyright (C) 2012 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <byteswap.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
+#include "intel.h"
+
+/** @file
+ *
+ * Intel 10/100/1000 network card driver
+ *
+ */
+
+/******************************************************************************
+ *
+ * EEPROM interface
+ *
+ ******************************************************************************
+ */
+
+/**
+ * Read data from EEPROM
+ *
+ * @v nvs              NVS device
+ * @v address          Address from which to read
+ * @v data             Data buffer
+ * @v len              Length of data buffer
+ * @ret rc             Return status code
+ */
+static int intel_read_eeprom ( struct nvs_device *nvs, unsigned int address,
+                              void *data, size_t len ) {
+       struct intel_nic *intel =
+               container_of ( nvs, struct intel_nic, eeprom );
+       unsigned int i;
+       uint32_t value;
+       uint16_t *data_word = data;
+
+       /* Sanity check.  We advertise a blocksize of one word, so
+        * should only ever receive single-word requests.
+        */
+       assert ( len == sizeof ( *data_word ) );
+
+       /* Initiate read */
+       writel ( ( INTEL_EERD_START | ( address << intel->eerd_addr_shift ) ),
+                intel->regs + INTEL_EERD );
+
+       /* Wait for read to complete */
+       for ( i = 0 ; i < INTEL_EEPROM_MAX_WAIT_MS ; i++ ) {
+
+               /* If read is not complete, delay 1ms and retry */
+               value = readl ( intel->regs + INTEL_EERD );
+               if ( ! ( value & intel->eerd_done ) ) {
+                       mdelay ( 1 );
+                       continue;
+               }
+
+               /* Extract data */
+               *data_word = cpu_to_le16 ( INTEL_EERD_DATA ( value ) );
+               return 0;
+       }
+
+       DBGC ( intel, "INTEL %p timed out waiting for EEPROM read\n", intel );
+       return -ETIMEDOUT;
+}
+
+/**
+ * Write data to EEPROM
+ *
+ * @v nvs              NVS device
+ * @v address          Address to which to write
+ * @v data             Data buffer
+ * @v len              Length of data buffer
+ * @ret rc             Return status code
+ */
+static int intel_write_eeprom ( struct nvs_device *nvs,
+                               unsigned int address __unused,
+                               const void *data __unused,
+                               size_t len __unused ) {
+       struct intel_nic *intel =
+               container_of ( nvs, struct intel_nic, eeprom );
+
+       DBGC ( intel, "INTEL %p EEPROM write not supported\n", intel );
+       return -ENOTSUP;
+}
+
+/**
+ * Initialise EEPROM
+ *
+ * @v intel            Intel device
+ * @ret rc             Return status code
+ */
+static int intel_init_eeprom ( struct intel_nic *intel ) {
+       unsigned int i;
+       uint32_t value;
+
+       /* The NIC automatically detects the type of attached EEPROM.
+        * The EERD register provides access to only a single word at
+        * a time, so we pretend to have a single-word block size.
+        *
+        * The EEPROM size may be larger than the minimum size, but
+        * this doesn't matter to us since we access only the first
+        * few words.
+        */
+       intel->eeprom.word_len_log2 = INTEL_EEPROM_WORD_LEN_LOG2;
+       intel->eeprom.size = INTEL_EEPROM_MIN_SIZE_WORDS;
+       intel->eeprom.block_size = 1;
+       intel->eeprom.read = intel_read_eeprom;
+       intel->eeprom.write = intel_write_eeprom;
+
+       /* The layout of the EERD register was changed at some point
+        * to accommodate larger EEPROMs.  Read from address zero (for
+        * which the request layouts are compatible) to determine
+        * which type of register we have.
+        */
+       writel ( INTEL_EERD_START, intel->regs + INTEL_EERD );
+       for ( i = 0 ; i < INTEL_EEPROM_MAX_WAIT_MS ; i++ ) {
+               value = readl ( intel->regs + INTEL_EERD );
+               if ( value & INTEL_EERD_DONE_LARGE ) {
+                       DBGC ( intel, "INTEL %p has large-format EERD\n",
+                              intel );
+                       intel->eerd_done = INTEL_EERD_DONE_LARGE;
+                       intel->eerd_addr_shift = INTEL_EERD_ADDR_SHIFT_LARGE;
+                       return 0;
+               }
+               if ( value & INTEL_EERD_DONE_SMALL ) {
+                       DBGC ( intel, "INTEL %p has small-format EERD\n",
+                              intel );
+                       intel->eerd_done = INTEL_EERD_DONE_SMALL;
+                       intel->eerd_addr_shift = INTEL_EERD_ADDR_SHIFT_SMALL;
+                       return 0;
+               }
+               mdelay ( 1 );
+       }
+
+       DBGC ( intel, "INTEL %p timed out waiting for initial EEPROM read "
+              "(value %08x)\n", intel, value );
+       return -ETIMEDOUT;
+}
+
+/******************************************************************************
+ *
+ * MAC address
+ *
+ ******************************************************************************
+ */
+
+/**
+ * Fetch initial MAC address from EEPROM
+ *
+ * @v intel            Intel device
+ * @v hw_addr          Hardware address to fill in
+ * @ret rc             Return status code
+ */
+static int intel_fetch_mac_eeprom ( struct intel_nic *intel,
+                                   uint8_t *hw_addr ) {
+       int rc;
+
+       /* Initialise EEPROM */
+       if ( ( rc = intel_init_eeprom ( intel ) ) != 0 )
+               return rc;
+
+       /* Read base MAC address from EEPROM */
+       if ( ( rc = nvs_read ( &intel->eeprom, INTEL_EEPROM_MAC,
+                              hw_addr, ETH_ALEN ) ) != 0 ) {
+               DBGC ( intel, "INTEL %p could not read EEPROM base MAC "
+                      "address: %s\n", intel, strerror ( rc ) );
+               return rc;
+       }
+
+       /* Adjust MAC address for multi-port devices */
+       hw_addr[ETH_ALEN-1] ^= intel->port;
+
+       DBGC ( intel, "INTEL %p has EEPROM MAC address %s (port %d)\n",
+              intel, eth_ntoa ( hw_addr ), intel->port );
+       return 0;
+}
+
+/**
+ * Fetch initial MAC address
+ *
+ * @v intel            Intel device
+ * @v hw_addr          Hardware address to fill in
+ * @ret rc             Return status code
+ */
+static int intel_fetch_mac ( struct intel_nic *intel, uint8_t *hw_addr ) {
+       union intel_receive_address mac;
+       int rc;
+
+       /* Read current address from RAL0/RAH0 */
+       mac.reg.low = cpu_to_le32 ( readl ( intel->regs + INTEL_RAL0 ) );
+       mac.reg.high = cpu_to_le32 ( readl ( intel->regs + INTEL_RAH0 ) );
+       DBGC ( intel, "INTEL %p has autoloaded MAC address %s\n",
+              intel, eth_ntoa ( mac.raw ) );
+
+       /* Try to read address from EEPROM */
+       if ( ( rc = intel_fetch_mac_eeprom ( intel, hw_addr ) ) == 0 )
+               return 0;
+
+       /* Use current address if valid */
+       if ( is_valid_ether_addr ( mac.raw ) ) {
+               memcpy ( hw_addr, mac.raw, ETH_ALEN );
+               return 0;
+       }
+
+       DBGC ( intel, "INTEL %p has no MAC address to use\n", intel );
+       return -ENOENT;
+}
+
+/******************************************************************************
+ *
+ * Diagnostics
+ *
+ ******************************************************************************
+ */
+
+/**
+ * Dump diagnostic information
+ *
+ * @v intel            Intel device
+ */
+static void __attribute__ (( unused )) intel_diag ( struct intel_nic *intel ) {
+
+       DBGC ( intel, "INTEL %p TDH=%04x TDT=%04x RDH=%04x RDT=%04x\n", intel,
+              readl ( intel->regs + INTEL_TDH ),
+              readl ( intel->regs + INTEL_TDT ),
+              readl ( intel->regs + INTEL_RDH ),
+              readl ( intel->regs + INTEL_RDT ) );
+}
+
+/******************************************************************************
+ *
+ * Device reset
+ *
+ ******************************************************************************
+ */
+
+/**
+ * Reset hardware
+ *
+ * @v intel            Intel device
+ * @ret rc             Return status code
+ */
+static int intel_reset ( struct intel_nic *intel ) {
+       uint32_t pbs;
+       uint32_t ctrl;
+       uint32_t status;
+
+       /* Force RX and TX packet buffer allocation, to work around an
+        * errata in ICH devices.
+        */
+       pbs = readl ( intel->regs + INTEL_PBS );
+       if ( ( pbs == 0x14 ) || ( pbs == 0x18 ) ) {
+               DBGC ( intel, "INTEL %p WARNING: applying ICH PBS/PBA errata\n",
+                      intel );
+               writel ( 0x08, intel->regs + INTEL_PBA );
+               writel ( 0x10, intel->regs + INTEL_PBS );
+       }
+
+       /* Always reset MAC.  Required to reset the TX and RX rings. */
+       ctrl = readl ( intel->regs + INTEL_CTRL );
+       writel ( ( ctrl | INTEL_CTRL_RST ), intel->regs + INTEL_CTRL );
+       mdelay ( INTEL_RESET_DELAY_MS );
+
+       /* Set a sensible default configuration */
+       ctrl |= ( INTEL_CTRL_SLU | INTEL_CTRL_ASDE );
+       ctrl &= ~( INTEL_CTRL_LRST | INTEL_CTRL_FRCSPD | INTEL_CTRL_FRCDPLX );
+       writel ( ctrl, intel->regs + INTEL_CTRL );
+       mdelay ( INTEL_RESET_DELAY_MS );
+
+       /* If link is already up, do not attempt to reset the PHY.  On
+        * some models (notably ICH), performing a PHY reset seems to
+        * drop the link speed to 10Mbps.
+        */
+       status = readl ( intel->regs + INTEL_STATUS );
+       if ( status & INTEL_STATUS_LU ) {
+               DBGC ( intel, "INTEL %p MAC reset (ctrl %08x)\n",
+                      intel, ctrl );
+               return 0;
+       }
+
+       /* Reset PHY and MAC simultaneously */
+       writel ( ( ctrl | INTEL_CTRL_RST | INTEL_CTRL_PHY_RST ),
+                intel->regs + INTEL_CTRL );
+       mdelay ( INTEL_RESET_DELAY_MS );
+
+       /* PHY reset is not self-clearing on all models */
+       writel ( ctrl, intel->regs + INTEL_CTRL );
+       mdelay ( INTEL_RESET_DELAY_MS );
+
+       DBGC ( intel, "INTEL %p MAC+PHY reset (ctrl %08x)\n", intel, ctrl );
+       return 0;
+}
+
+/******************************************************************************
+ *
+ * Link state
+ *
+ ******************************************************************************
+ */
+
+/**
+ * Check link state
+ *
+ * @v netdev           Network device
+ */
+static void intel_check_link ( struct net_device *netdev ) {
+       struct intel_nic *intel = netdev->priv;
+       uint32_t status;
+
+       /* Read link status */
+       status = readl ( intel->regs + INTEL_STATUS );
+       DBGC ( intel, "INTEL %p link status is %08x\n", intel, status );
+
+       /* Update network device */
+       if ( status & INTEL_STATUS_LU ) {
+               netdev_link_up ( netdev );
+       } else {
+               netdev_link_down ( netdev );
+       }
+}
+
+/******************************************************************************
+ *
+ * Network device interface
+ *
+ ******************************************************************************
+ */
+
+/**
+ * Create descriptor ring
+ *
+ * @v intel            Intel device
+ * @v ring             Descriptor ring
+ * @ret rc             Return status code
+ */
+static int intel_create_ring ( struct intel_nic *intel,
+                              struct intel_ring *ring ) {
+       physaddr_t address;
+
+       /* Allocate descriptor ring.  Align ring on its own size to
+        * prevent any possible page-crossing errors due to hardware
+        * errata.
+        */
+       ring->desc = malloc_dma ( ring->len, ring->len );
+       if ( ! ring->desc )
+               return -ENOMEM;
+
+       /* Initialise descriptor ring */
+       memset ( ring->desc, 0, ring->len );
+
+       /* Program ring address */
+       address = virt_to_bus ( ring->desc );
+       writel ( ( address & 0xffffffffUL ),
+                ( intel->regs + ring->reg + INTEL_xDBAL ) );
+       if ( sizeof ( physaddr_t ) > sizeof ( uint32_t ) ) {
+               writel ( ( ( ( uint64_t ) address ) >> 32 ),
+                        ( intel->regs + ring->reg + INTEL_xDBAH ) );
+       } else {
+               writel ( 0, intel->regs + ring->reg + INTEL_xDBAH );
+       }
+
+       /* Program ring length */
+       writel ( ring->len, ( intel->regs + ring->reg + INTEL_xDLEN ) );
+
+       /* Reset head and tail pointers */
+       writel ( 0, ( intel->regs + ring->reg + INTEL_xDH ) );
+       writel ( 0, ( intel->regs + ring->reg + INTEL_xDT ) );
+
+       DBGC ( intel, "INTEL %p ring %05x is at [%08llx,%08llx)\n",
+              intel, ring->reg, ( ( unsigned long long ) address ),
+              ( ( unsigned long long ) address + ring->len ) );
+
+       return 0;
+}
+
+/**
+ * Destroy descriptor ring
+ *
+ * @v intel            Intel device
+ * @v ring             Descriptor ring
+ */
+static void intel_destroy_ring ( struct intel_nic *intel,
+                                struct intel_ring *ring ) {
+
+       /* Clear ring length */
+       writel ( 0, ( intel->regs + ring->reg + INTEL_xDLEN ) );
+
+       /* Clear ring address */
+       writel ( 0, ( intel->regs + ring->reg + INTEL_xDBAL ) );
+       writel ( 0, ( intel->regs + ring->reg + INTEL_xDBAH ) );
+
+       /* Free descriptor ring */
+       free_dma ( ring->desc, ring->len );
+       ring->desc = NULL;
+       ring->prod = 0;
+       ring->cons = 0;
+}
+
+/**
+ * Refill receive descriptor ring
+ *
+ * @v intel            Intel device
+ */
+static void intel_refill_rx ( struct intel_nic *intel ) {
+       struct intel_descriptor *rx;
+       struct io_buffer *iobuf;
+       unsigned int rx_idx;
+       unsigned int rx_tail;
+       physaddr_t address;
+
+       while ( ( intel->rx.prod - intel->rx.cons ) < INTEL_RX_FILL ) {
+
+               /* Allocate I/O buffer */
+               iobuf = alloc_iob ( INTEL_RX_MAX_LEN );
+               if ( ! iobuf ) {
+                       /* Wait for next refill */
+                       return;
+               }
+
+               /* Get next receive descriptor */
+               rx_idx = ( intel->rx.prod++ % INTEL_NUM_RX_DESC );
+               rx_tail = ( intel->rx.prod % INTEL_NUM_RX_DESC );
+               rx = &intel->rx.desc[rx_idx];
+
+               /* Populate receive descriptor */
+               address = virt_to_bus ( iobuf->data );
+               rx->address = cpu_to_le64 ( address );
+               rx->length = 0;
+               rx->status = 0;
+               rx->errors = 0;
+               wmb();
+
+               /* Record I/O buffer */
+               assert ( intel->rx_iobuf[rx_idx] == NULL );
+               intel->rx_iobuf[rx_idx] = iobuf;
+
+               /* Push descriptor to card */
+               writel ( rx_tail, intel->regs + INTEL_RDT );
+
+               DBGC2 ( intel, "INTEL %p RX %d is [%llx,%llx)\n", intel, rx_idx,
+                       ( ( unsigned long long ) address ),
+                       ( ( unsigned long long ) address + INTEL_RX_MAX_LEN ) );
+       }
+}
+
+/**
+ * Open network device
+ *
+ * @v netdev           Network device
+ * @ret rc             Return status code
+ */
+static int intel_open ( struct net_device *netdev ) {
+       struct intel_nic *intel = netdev->priv;
+       union intel_receive_address mac;
+       uint32_t tctl;
+       uint32_t rctl;
+       int rc;
+
+       /* Create transmit descriptor ring */
+       if ( ( rc = intel_create_ring ( intel, &intel->tx ) ) != 0 )
+               goto err_create_tx;
+
+       /* Create receive descriptor ring */
+       if ( ( rc = intel_create_ring ( intel, &intel->rx ) ) != 0 )
+               goto err_create_rx;
+
+       /* Fill receive ring */
+       intel_refill_rx ( intel );
+
+       /* Program MAC address */
+       memset ( &mac, 0, sizeof ( mac ) );
+       memcpy ( mac.raw, netdev->ll_addr, sizeof ( mac.raw ) );
+       writel ( le32_to_cpu ( mac.reg.low ), intel->regs + INTEL_RAL0 );
+       writel ( ( le32_to_cpu ( mac.reg.high ) | INTEL_RAH0_AV ),
+                intel->regs + INTEL_RAH0 );
+
+       /* Enable transmitter  */
+       tctl = readl ( intel->regs + INTEL_TCTL );
+       tctl &= ~( INTEL_TCTL_CT_MASK | INTEL_TCTL_COLD_MASK );
+       tctl |= ( INTEL_TCTL_EN | INTEL_TCTL_PSP | INTEL_TCTL_CT_DEFAULT |
+                 INTEL_TCTL_COLD_DEFAULT );
+       writel ( tctl, intel->regs + INTEL_TCTL );
+
+       /* Enable receiver */
+       rctl = readl ( intel->regs + INTEL_RCTL );
+       rctl &= ~( INTEL_RCTL_BSIZE_BSEX_MASK );
+       rctl |= ( INTEL_RCTL_EN | INTEL_RCTL_UPE | INTEL_RCTL_MPE |
+                 INTEL_RCTL_BAM | INTEL_RCTL_BSIZE_2048 | INTEL_RCTL_SECRC );
+       writel ( rctl, intel->regs + INTEL_RCTL );
+
+       /* Update link state */
+       intel_check_link ( netdev );
+
+       return 0;
+
+       intel_destroy_ring ( intel, &intel->rx );
+ err_create_rx:
+       intel_destroy_ring ( intel, &intel->tx );
+ err_create_tx:
+       return rc;
+}
+
+/**
+ * Close network device
+ *
+ * @v netdev           Network device
+ */
+static void intel_close ( struct net_device *netdev ) {
+       struct intel_nic *intel = netdev->priv;
+       unsigned int i;
+
+       /* Disable receiver */
+       writel ( 0, intel->regs + INTEL_RCTL );
+
+       /* Disable transmitter  */
+       writel ( 0, intel->regs + INTEL_TCTL );
+
+       /* Destroy receive descriptor ring */
+       intel_destroy_ring ( intel, &intel->rx );
+
+       /* Discard any unused receive buffers */
+       for ( i = 0 ; i < INTEL_NUM_RX_DESC ; i++ ) {
+               if ( intel->rx_iobuf[i] )
+                       free_iob ( intel->rx_iobuf[i] );
+               intel->rx_iobuf[i] = NULL;
+       }
+
+       /* Destroy transmit descriptor ring */
+       intel_destroy_ring ( intel, &intel->tx );
+
+       /* Reset the NIC, to flush the transmit and receive FIFOs */
+       intel_reset ( intel );
+}
+
+/**
+ * Transmit packet
+ *
+ * @v netdev           Network device
+ * @v iobuf            I/O buffer
+ * @ret rc             Return status code
+ */
+static int intel_transmit ( struct net_device *netdev,
+                              struct io_buffer *iobuf ) {
+       struct intel_nic *intel = netdev->priv;
+       struct intel_descriptor *tx;
+       unsigned int tx_idx;
+       unsigned int tx_tail;
+       physaddr_t address;
+
+       /* Get next transmit descriptor */
+       if ( ( intel->tx.prod - intel->tx.cons ) >= INTEL_NUM_TX_DESC ) {
+               DBGC ( intel, "INTEL %p out of transmit descriptors\n", intel );
+               return -ENOBUFS;
+       }
+       tx_idx = ( intel->tx.prod++ % INTEL_NUM_TX_DESC );
+       tx_tail = ( intel->tx.prod % INTEL_NUM_TX_DESC );
+       tx = &intel->tx.desc[tx_idx];
+
+       /* Populate transmit descriptor */
+       address = virt_to_bus ( iobuf->data );
+       tx->address = cpu_to_le64 ( address );
+       tx->length = cpu_to_le16 ( iob_len ( iobuf ) );
+       tx->command = ( INTEL_DESC_CMD_RS | INTEL_DESC_CMD_IFCS |
+                       INTEL_DESC_CMD_EOP );
+       tx->status = 0;
+       wmb();
+
+       /* Notify card that there are packets ready to transmit */
+       writel ( tx_tail, intel->regs + INTEL_TDT );
+
+       DBGC2 ( intel, "INTEL %p TX %d is [%llx,%llx)\n", intel, tx_idx,
+               ( ( unsigned long long ) address ),
+               ( ( unsigned long long ) address + iob_len ( iobuf ) ) );
+
+       return 0;
+}
+
+/**
+ * Poll for completed packets
+ *
+ * @v netdev           Network device
+ */
+static void intel_poll_tx ( struct net_device *netdev ) {
+       struct intel_nic *intel = netdev->priv;
+       struct intel_descriptor *tx;
+       unsigned int tx_idx;
+
+       /* Check for completed packets */
+       while ( intel->tx.cons != intel->tx.prod ) {
+
+               /* Get next transmit descriptor */
+               tx_idx = ( intel->tx.cons % INTEL_NUM_TX_DESC );
+               tx = &intel->tx.desc[tx_idx];
+
+               /* Stop if descriptor is still in use */
+               if ( ! ( tx->status & INTEL_DESC_STATUS_DD ) )
+                       return;
+
+               DBGC2 ( intel, "INTEL %p TX %d complete\n", intel, tx_idx );
+
+               /* Complete TX descriptor */
+               netdev_tx_complete_next ( netdev );
+               intel->tx.cons++;
+       }
+}
+
+/**
+ * Poll for received packets
+ *
+ * @v netdev           Network device
+ */
+static void intel_poll_rx ( struct net_device *netdev ) {
+       struct intel_nic *intel = netdev->priv;
+       struct intel_descriptor *rx;
+       struct io_buffer *iobuf;
+       unsigned int rx_idx;
+       size_t len;
+
+       /* Check for received packets */
+       while ( intel->rx.cons != intel->rx.prod ) {
+
+               /* Get next receive descriptor */
+               rx_idx = ( intel->rx.cons % INTEL_NUM_RX_DESC );
+               rx = &intel->rx.desc[rx_idx];
+
+               /* Stop if descriptor is still in use */
+               if ( ! ( rx->status & INTEL_DESC_STATUS_DD ) )
+                       return;
+
+               /* Populate I/O buffer */
+               iobuf = intel->rx_iobuf[rx_idx];
+               intel->rx_iobuf[rx_idx] = NULL;
+               len = le16_to_cpu ( rx->length );
+               iob_put ( iobuf, len );
+
+               /* Hand off to network stack */
+               if ( rx->errors ) {
+                       DBGC ( intel, "INTEL %p RX %d error (length %zd, "
+                              "errors %02x)\n",
+                              intel, rx_idx, len, rx->errors );
+                       netdev_rx_err ( netdev, iobuf, -EIO );
+               } else {
+                       DBGC2 ( intel, "INTEL %p RX %d complete (length %zd)\n",
+                               intel, rx_idx, len );
+                       netdev_rx ( netdev, iobuf );
+               }
+               intel->rx.cons++;
+       }
+}
+
+/**
+ * Poll for completed and received packets
+ *
+ * @v netdev           Network device
+ */
+static void intel_poll ( struct net_device *netdev ) {
+       struct intel_nic *intel = netdev->priv;
+       uint32_t icr;
+
+       /* Check for and acknowledge interrupts */
+       icr = readl ( intel->regs + INTEL_ICR );
+       if ( ! icr )
+               return;
+
+       /* Poll for TX completions, if applicable */
+       if ( icr & INTEL_IRQ_TXDW )
+               intel_poll_tx ( netdev );
+
+       /* Poll for RX completionsm, if applicable */
+       if ( icr & INTEL_IRQ_RXT0 )
+               intel_poll_rx ( netdev );
+
+       /* Check link state, if applicable */
+       if ( icr & INTEL_IRQ_LSC )
+               intel_check_link ( netdev );
+
+       /* Refill RX ring */
+       intel_refill_rx ( intel );
+}
+
+/**
+ * Enable or disable interrupts
+ *
+ * @v netdev           Network device
+ * @v enable           Interrupts should be enabled
+ */
+static void intel_irq ( struct net_device *netdev, int enable ) {
+       struct intel_nic *intel = netdev->priv;
+       uint32_t mask;
+
+       mask = ( INTEL_IRQ_TXDW | INTEL_IRQ_LSC | INTEL_IRQ_RXT0 );
+       if ( enable ) {
+               writel ( mask, intel->regs + INTEL_IMS );
+       } else {
+               writel ( mask, intel->regs + INTEL_IMC );
+       }
+}
+
+/** Intel network device operations */
+static struct net_device_operations intel_operations = {
+       .open           = intel_open,
+       .close          = intel_close,
+       .transmit       = intel_transmit,
+       .poll           = intel_poll,
+       .irq            = intel_irq,
+};
+
+/******************************************************************************
+ *
+ * PCI interface
+ *
+ ******************************************************************************
+ */
+
+/**
+ * Probe PCI device
+ *
+ * @v pci              PCI device
+ * @ret rc             Return status code
+ */
+static int intel_probe ( struct pci_device *pci ) {
+       struct net_device *netdev;
+       struct intel_nic *intel;
+       int rc;
+
+       /* Allocate and initialise net device */
+       netdev = alloc_etherdev ( sizeof ( *intel ) );
+       if ( ! netdev ) {
+               rc = -ENOMEM;
+               goto err_alloc;
+       }
+       netdev_init ( netdev, &intel_operations );
+       intel = netdev->priv;
+       pci_set_drvdata ( pci, netdev );
+       netdev->dev = &pci->dev;
+       memset ( intel, 0, sizeof ( *intel ) );
+       intel->port = PCI_FUNC ( pci->busdevfn );
+       intel_init_ring ( &intel->tx, INTEL_NUM_TX_DESC, INTEL_TD );
+       intel_init_ring ( &intel->rx, INTEL_NUM_RX_DESC, INTEL_RD );
+
+       /* Fix up PCI device */
+       adjust_pci_device ( pci );
+
+       /* Map registers */
+       intel->regs = ioremap ( pci->membase, INTEL_BAR_SIZE );
+
+       /* Reset the NIC */
+       if ( ( rc = intel_reset ( intel ) ) != 0 )
+               goto err_reset;
+
+       /* Fetch MAC address */
+       if ( ( rc = intel_fetch_mac ( intel, netdev->hw_addr ) ) != 0 )
+               goto err_fetch_mac;
+
+       /* Register network device */
+       if ( ( rc = register_netdev ( netdev ) ) != 0 )
+               goto err_register_netdev;
+
+       /* Set initial link state */
+       intel_check_link ( netdev );
+
+       return 0;
+
+       unregister_netdev ( netdev );
+ err_register_netdev:
+ err_fetch_mac:
+       intel_reset ( intel );
+ err_reset:
+       netdev_nullify ( netdev );
+       netdev_put ( netdev );
+ err_alloc:
+       return rc;
+}
+
+/**
+ * Remove PCI device
+ *
+ * @v pci              PCI device
+ */
+static void intel_remove ( struct pci_device *pci ) {
+       struct net_device *netdev = pci_get_drvdata ( pci );
+       struct intel_nic *intel = netdev->priv;
+
+       /* Unregister network device */
+       unregister_netdev ( netdev );
+
+       /* Reset the NIC */
+       intel_reset ( intel );
+
+       /* Free network device */
+       netdev_nullify ( netdev );
+       netdev_put ( netdev );
+}
+
+/** Intel PCI device IDs */
+static struct pci_device_id intel_nics[] = {
+       PCI_ROM ( 0x8086, 0x0438, "dh8900cc", "DH8900CC", 0 ),
+       PCI_ROM ( 0x8086, 0x043a, "dh8900cc-f", "DH8900CC Fiber", 0 ),
+       PCI_ROM ( 0x8086, 0x043c, "dh8900cc-b", "DH8900CC Backplane", 0 ),
+       PCI_ROM ( 0x8086, 0x0440, "dh8900cc-s", "DH8900CC SFP", 0 ),
+       PCI_ROM ( 0x8086, 0x1000, "82542-f", "82542 (Fiber)", 0 ),
+       PCI_ROM ( 0x8086, 0x1001, "82543gc-f", "82543GC (Fiber)", 0 ),
+       PCI_ROM ( 0x8086, 0x1004, "82543gc", "82543GC (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x1008, "82544ei", "82544EI (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x1009, "82544ei-f", "82544EI (Fiber)", 0 ),
+       PCI_ROM ( 0x8086, 0x100c, "82544gc", "82544GC (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x100d, "82544gc-l", "82544GC (LOM)", 0 ),
+       PCI_ROM ( 0x8086, 0x100e, "82540em", "82540EM", 0 ),
+       PCI_ROM ( 0x8086, 0x100f, "82545em", "82545EM (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x1010, "82546eb", "82546EB (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x1011, "82545em-f", "82545EM (Fiber)", 0 ),
+       PCI_ROM ( 0x8086, 0x1012, "82546eb-f", "82546EB (Fiber)", 0 ),
+       PCI_ROM ( 0x8086, 0x1013, "82541ei", "82541EI", 0 ),
+       PCI_ROM ( 0x8086, 0x1014, "82541er", "82541ER", 0 ),
+       PCI_ROM ( 0x8086, 0x1015, "82540em-l", "82540EM (LOM)", 0 ),
+       PCI_ROM ( 0x8086, 0x1016, "82540ep-m", "82540EP (Mobile)", 0 ),
+       PCI_ROM ( 0x8086, 0x1017, "82540ep", "82540EP", 0 ),
+       PCI_ROM ( 0x8086, 0x1018, "82541ei", "82541EI", 0 ),
+       PCI_ROM ( 0x8086, 0x1019, "82547ei", "82547EI", 0 ),
+       PCI_ROM ( 0x8086, 0x101a, "82547ei-m", "82547EI (Mobile)", 0 ),
+       PCI_ROM ( 0x8086, 0x101d, "82546eb", "82546EB", 0 ),
+       PCI_ROM ( 0x8086, 0x101e, "82540ep-m", "82540EP (Mobile)", 0 ),
+       PCI_ROM ( 0x8086, 0x1026, "82545gm", "82545GM", 0 ),
+       PCI_ROM ( 0x8086, 0x1027, "82545gm-1", "82545GM", 0 ),
+       PCI_ROM ( 0x8086, 0x1028, "82545gm-2", "82545GM", 0 ),
+       PCI_ROM ( 0x8086, 0x1049, "82566mm", "82566MM", 0 ),
+       PCI_ROM ( 0x8086, 0x104a, "82566dm", "82566DM", 0 ),
+       PCI_ROM ( 0x8086, 0x104b, "82566dc", "82566DC", 0 ),
+       PCI_ROM ( 0x8086, 0x104c, "82562v", "82562V 10/100", 0 ),
+       PCI_ROM ( 0x8086, 0x104d, "82566mc", "82566MC", 0 ),
+       PCI_ROM ( 0x8086, 0x105e, "82571eb", "82571EB", 0 ),
+       PCI_ROM ( 0x8086, 0x105f, "82571eb-1", "82571EB", 0 ),
+       PCI_ROM ( 0x8086, 0x1060, "82571eb-2", "82571EB", 0 ),
+       PCI_ROM ( 0x8086, 0x1075, "82547gi", "82547GI", 0 ),
+       PCI_ROM ( 0x8086, 0x1076, "82541gi", "82541GI", 0 ),
+       PCI_ROM ( 0x8086, 0x1077, "82541gi-1", "82541GI", 0 ),
+       PCI_ROM ( 0x8086, 0x1078, "82541er", "82541ER", 0 ),
+       PCI_ROM ( 0x8086, 0x1079, "82546gb", "82546GB", 0 ),
+       PCI_ROM ( 0x8086, 0x107a, "82546gb-1", "82546GB", 0 ),
+       PCI_ROM ( 0x8086, 0x107b, "82546gb-2", "82546GB", 0 ),
+       PCI_ROM ( 0x8086, 0x107c, "82541pi", "82541PI", 0 ),
+       PCI_ROM ( 0x8086, 0x107d, "82572ei", "82572EI (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x107e, "82572ei-f", "82572EI (Fiber)", 0 ),
+       PCI_ROM ( 0x8086, 0x107f, "82572ei", "82572EI", 0 ),
+       PCI_ROM ( 0x8086, 0x108a, "82546gb-3", "82546GB", 0 ),
+       PCI_ROM ( 0x8086, 0x108b, "82573v", "82573V (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x108c, "82573e", "82573E (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x1096, "80003es2lan", "80003ES2LAN (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x1098, "80003es2lan-s", "80003ES2LAN (Serdes)", 0 ),
+       PCI_ROM ( 0x8086, 0x1099, "82546gb-4", "82546GB (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x109a, "82573l", "82573L", 0 ),
+       PCI_ROM ( 0x8086, 0x10a4, "82571eb", "82571EB", 0 ),
+       PCI_ROM ( 0x8086, 0x10a5, "82571eb", "82571EB (Fiber)", 0 ),
+       PCI_ROM ( 0x8086, 0x10a7, "82575eb", "82575EB", 0 ),
+       PCI_ROM ( 0x8086, 0x10a9, "82575eb", "82575EB Backplane", 0 ),
+       PCI_ROM ( 0x8086, 0x10b5, "82546gb", "82546GB (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x10b9, "82572ei", "82572EI (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x10ba, "80003es2lan", "80003ES2LAN (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x10bb, "80003es2lan", "80003ES2LAN (Serdes)", 0 ),
+       PCI_ROM ( 0x8086, 0x10bc, "82571eb", "82571EB (Copper)", 0 ),
+       PCI_ROM ( 0x8086, 0x10bd, "82566dm-2", "82566DM-2", 0 ),
+       PCI_ROM ( 0x8086, 0x10bf, "82567lf", "82567LF", 0 ),
+       PCI_ROM ( 0x8086, 0x10c0, "82562v-2", "82562V-2 10/100", 0 ),
+       PCI_ROM ( 0x8086, 0x10c2, "82562g-2", "82562G-2 10/100", 0 ),
+       PCI_ROM ( 0x8086, 0x10c3, "82562gt-2", "82562GT-2 10/100", 0 ),
+       PCI_ROM ( 0x8086, 0x10c4, "82562gt", "82562GT 10/100", 0 ),
+       PCI_ROM ( 0x8086, 0x10c5, "82562g", "82562G 10/100", 0 ),
+       PCI_ROM ( 0x8086, 0x10c9, "82576", "82576", 0 ),
+       PCI_ROM ( 0x8086, 0x10cb, "82567v", "82567V", 0 ),
+       PCI_ROM ( 0x8086, 0x10cc, "82567lm-2", "82567LM-2", 0 ),
+       PCI_ROM ( 0x8086, 0x10cd, "82567lf-2", "82567LF-2", 0 ),
+       PCI_ROM ( 0x8086, 0x10ce, "82567v-2", "82567V-2", 0 ),
+       PCI_ROM ( 0x8086, 0x10d3, "82574l", "82574L", 0 ),
+       PCI_ROM ( 0x8086, 0x10d5, "82571pt", "82571PT PT Quad", 0 ),
+       PCI_ROM ( 0x8086, 0x10d6, "82575gb", "82575GB", 0 ),
+       PCI_ROM ( 0x8086, 0x10d9, "82571eb-d", "82571EB Dual Mezzanine", 0 ),
+       PCI_ROM ( 0x8086, 0x10da, "82571eb-q", "82571EB Quad Mezzanine", 0 ),
+       PCI_ROM ( 0x8086, 0x10de, "82567lm-3", "82567LM-3", 0 ),
+       PCI_ROM ( 0x8086, 0x10df, "82567lf-3", "82567LF-3", 0 ),
+       PCI_ROM ( 0x8086, 0x10e5, "82567lm-4", "82567LM-4", 0 ),
+       PCI_ROM ( 0x8086, 0x10e6, "82576", "82576", 0 ),
+       PCI_ROM ( 0x8086, 0x10e7, "82576-2", "82576", 0 ),
+       PCI_ROM ( 0x8086, 0x10e8, "82576-3", "82576", 0 ),
+       PCI_ROM ( 0x8086, 0x10ea, "82577lm", "82577LM", 0 ),
+       PCI_ROM ( 0x8086, 0x10eb, "82577lc", "82577LC", 0 ),
+       PCI_ROM ( 0x8086, 0x10ef, "82578dm", "82578DM", 0 ),
+       PCI_ROM ( 0x8086, 0x10f0, "82578dc", "82578DC", 0 ),
+       PCI_ROM ( 0x8086, 0x10f5, "82567lm", "82567LM", 0 ),
+       PCI_ROM ( 0x8086, 0x10f6, "82574l", "82574L", 0 ),
+       PCI_ROM ( 0x8086, 0x1501, "82567v-3", "82567V-3", 0 ),
+       PCI_ROM ( 0x8086, 0x1502, "82579lm", "82579LM", 0 ),
+       PCI_ROM ( 0x8086, 0x1503, "82579v", "82579V", 0 ),
+       PCI_ROM ( 0x8086, 0x150a, "82576ns", "82576NS", 0 ),
+       PCI_ROM ( 0x8086, 0x150c, "82583v", "82583V", 0 ),
+       PCI_ROM ( 0x8086, 0x150d, "82576-4", "82576 Backplane", 0 ),
+       PCI_ROM ( 0x8086, 0x150e, "82580", "82580", 0 ),
+       PCI_ROM ( 0x8086, 0x150f, "82580-f", "82580 Fiber", 0 ),
+       PCI_ROM ( 0x8086, 0x1510, "82580-b", "82580 Backplane", 0 ),
+       PCI_ROM ( 0x8086, 0x1511, "82580-s", "82580 SFP", 0 ),
+       PCI_ROM ( 0x8086, 0x1516, "82580-2", "82580", 0 ),
+       PCI_ROM ( 0x8086, 0x1518, "82576ns", "82576NS SerDes", 0 ),
+       PCI_ROM ( 0x8086, 0x1521, "i350", "I350", 0 ),
+       PCI_ROM ( 0x8086, 0x1522, "i350-f", "I350 Fiber", 0 ),
+       PCI_ROM ( 0x8086, 0x1523, "i350-b", "I350 Backplane", 0 ),
+       PCI_ROM ( 0x8086, 0x1524, "i350-2", "I350", 0 ),
+       PCI_ROM ( 0x8086, 0x1525, "82567v-4", "82567V-4", 0 ),
+       PCI_ROM ( 0x8086, 0x1526, "82576-5", "82576", 0 ),
+       PCI_ROM ( 0x8086, 0x1527, "82580-f2", "82580 Fiber", 0 ),
+       PCI_ROM ( 0x8086, 0x294c, "82566dc-2", "82566DC-2", 0 ),
+       PCI_ROM ( 0x8086, 0x2e6e, "cemedia", "CE Media Processor", 0 ),
+};
+
+/** Intel PCI driver */
+struct pci_driver intel_driver __pci_driver = {
+       .ids = intel_nics,
+       .id_count = ( sizeof ( intel_nics ) / sizeof ( intel_nics[0] ) ),
+       .probe = intel_probe,
+       .remove = intel_remove,
+};
diff --git a/src/drivers/net/intel.h b/src/drivers/net/intel.h
new file mode 100644 (file)
index 0000000..6f941d1
--- /dev/null
@@ -0,0 +1,252 @@
+#ifndef _INTEL_H
+#define _INTEL_H
+
+/** @file
+ *
+ * Intel 10/100/1000 network card driver
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+#include <stdint.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/nvs.h>
+
+/** Intel BAR size */
+#define INTEL_BAR_SIZE ( 128 * 1024 )
+
+/** A packet descriptor */
+struct intel_descriptor {
+       /** Buffer address */
+       uint64_t address;
+       /** Length */
+       uint16_t length;
+       /** Reserved */
+       uint8_t reserved_a;
+       /** Command */
+       uint8_t command;
+       /** Status */
+       uint8_t status;
+       /** Errors */
+       uint8_t errors;
+       /** Reserved */
+       uint16_t reserved_b;
+} __attribute__ (( packed ));
+
+/** Packet descriptor command bits */
+enum intel_descriptor_command {
+       /** Report status */
+       INTEL_DESC_CMD_RS = 0x08,
+       /** Insert frame checksum (CRC) */
+       INTEL_DESC_CMD_IFCS = 0x02,
+       /** End of packet */
+       INTEL_DESC_CMD_EOP = 0x01,
+};
+
+/** Packet descriptor status bits */
+enum intel_descriptor_status {
+       /** Descriptor done */
+       INTEL_DESC_STATUS_DD = 0x01,
+};
+
+/** Device Control Register */
+#define INTEL_CTRL 0x00000UL
+#define INTEL_CTRL_LRST                0x00000008UL    /**< Link reset */
+#define INTEL_CTRL_ASDE                0x00000020UL    /**< Auto-speed detection */
+#define INTEL_CTRL_SLU         0x00000040UL    /**< Set link up */
+#define INTEL_CTRL_FRCSPD      0x00000800UL    /**< Force speed */
+#define INTEL_CTRL_FRCDPLX     0x00001000UL    /**< Force duplex */
+#define INTEL_CTRL_RST         0x04000000UL    /**< Device reset */
+#define INTEL_CTRL_PHY_RST     0x80000000UL    /**< PHY reset */
+
+/** Time to delay for device reset, in milliseconds */
+#define INTEL_RESET_DELAY_MS 20
+
+/** Device Status Register */
+#define INTEL_STATUS 0x00008UL
+#define INTEL_STATUS_LU                0x00000002UL    /**< Link up */
+
+/** EEPROM Read Register */
+#define INTEL_EERD 0x00014UL
+#define INTEL_EERD_START       0x00000001UL    /**< Start read */
+#define INTEL_EERD_DONE_SMALL  0x00000010UL    /**< Read done (small EERD) */
+#define INTEL_EERD_DONE_LARGE  0x00000002UL    /**< Read done (large EERD) */
+#define INTEL_EERD_ADDR_SHIFT_SMALL 8          /**< Address shift (small) */
+#define INTEL_EERD_ADDR_SHIFT_LARGE 2          /**< Address shift (large) */
+#define INTEL_EERD_DATA(value) ( (value) >> 16 ) /**< Read data */
+
+/** Maximum time to wait for EEPROM read, in milliseconds */
+#define INTEL_EEPROM_MAX_WAIT_MS 100
+
+/** EEPROM word length */
+#define INTEL_EEPROM_WORD_LEN_LOG2 1
+
+/** Minimum EEPROM size, in words */
+#define INTEL_EEPROM_MIN_SIZE_WORDS 64
+
+/** Offset of MAC address within EEPROM */
+#define INTEL_EEPROM_MAC 0x00
+
+/** Interrupt Cause Read Register */
+#define INTEL_ICR 0x000c0UL
+#define INTEL_IRQ_TXDW         0x00000001UL    /**< Transmit descriptor done */
+#define INTEL_IRQ_LSC          0x00000004UL    /**< Link status change */
+#define INTEL_IRQ_RXT0         0x00000080UL    /**< Receive timer */
+
+/** Interrupt Mask Set/Read Register */
+#define INTEL_IMS 0x000d0UL
+
+/** Interrupt Mask Clear Register */
+#define INTEL_IMC 0x000d8UL
+
+/** Receive Control Register */
+#define INTEL_RCTL 0x00100UL
+#define INTEL_RCTL_EN          0x00000002UL    /**< Receive enable */
+#define INTEL_RCTL_UPE         0x00000008UL    /**< Unicast promiscuous mode */
+#define INTEL_RCTL_MPE         0x00000010UL    /**< Multicast promiscuous */
+#define INTEL_RCTL_BAM         0x00008000UL    /**< Broadcast accept mode */
+#define INTEL_RCTL_BSIZE_BSEX(bsex,bsize) \
+       ( ( (bsize) << 16 ) | ( (bsex) << 25 ) ) /**< Buffer size */
+#define INTEL_RCTL_BSIZE_2048  INTEL_RCTL_BSIZE_BSEX ( 0, 0 )
+#define INTEL_RCTL_BSIZE_BSEX_MASK INTEL_RCTL_BSIZE_BSEX ( 1, 3 )
+#define INTEL_RCTL_SECRC       0x04000000UL    /**< Strip CRC */
+
+/** Transmit Control Register */
+#define INTEL_TCTL 0x00400UL
+#define INTEL_TCTL_EN          0x00000002UL    /**< Transmit enable */
+#define INTEL_TCTL_PSP         0x00000008UL    /**< Pad short packets */
+#define INTEL_TCTL_CT(x)       ( (x) << 4 )    /**< Collision threshold */
+#define INTEL_TCTL_CT_DEFAULT  INTEL_TCTL_CT ( 0x0f )
+#define INTEL_TCTL_CT_MASK     INTEL_TCTL_CT ( 0xff )
+#define INTEL_TCTL_COLD(x)     ( (x) << 12 )   /**< Collision distance */
+#define INTEL_TCTL_COLD_DEFAULT        INTEL_TCTL_COLD ( 0x040 )
+#define INTEL_TCTL_COLD_MASK   INTEL_TCTL_COLD ( 0x3ff )
+
+/** Packet Buffer Allocation */
+#define INTEL_PBA 0x01000UL
+
+/** Packet Buffer Size */
+#define INTEL_PBS 0x01008UL
+
+/** Receive Descriptor register block */
+#define INTEL_RD 0x02800UL
+
+/** Number of receive descriptors
+ *
+ * Minimum value is 8, since the descriptor ring length must be a
+ * multiple of 128.
+ */
+#define INTEL_NUM_RX_DESC 8
+
+/** Receive descriptor ring fill level */
+#define INTEL_RX_FILL 4
+
+/** Receive buffer length */
+#define INTEL_RX_MAX_LEN 2048
+
+/** Transmit Descriptor register block */
+#define INTEL_TD 0x03800UL
+
+/** Number of transmit descriptors
+ *
+ * Descriptor ring length must be a multiple of 16.  ICH8/9/10
+ * requires a minimum of 16 TX descriptors.
+ */
+#define INTEL_NUM_TX_DESC 16
+
+/** Receive/Transmit Descriptor Base Address Low (offset) */
+#define INTEL_xDBAL 0x00
+
+/** Receive/Transmit Descriptor Base Address High (offset) */
+#define INTEL_xDBAH 0x04
+
+/** Receive/Transmit Descriptor Length (offset) */
+#define INTEL_xDLEN 0x08
+
+/** Receive/Transmit Descriptor Head (offset) */
+#define INTEL_xDH 0x10
+
+/** Receive/Transmit Descriptor Tail (offset) */
+#define INTEL_xDT 0x18
+
+/** Receive Descriptor Head */
+#define INTEL_RDH ( INTEL_RD + INTEL_xDH )
+
+/** Receive Descriptor Tail */
+#define INTEL_RDT ( INTEL_RD + INTEL_xDT )
+
+/** Transmit Descriptor Head */
+#define INTEL_TDH ( INTEL_TD + INTEL_xDH )
+
+/** Transmit Descriptor Tail */
+#define INTEL_TDT ( INTEL_TD + INTEL_xDT )
+
+/** Receive Address Low */
+#define INTEL_RAL0 0x05400UL
+
+/** Receive Address High */
+#define INTEL_RAH0 0x05404UL
+#define INTEL_RAH0_AV          0x80000000UL    /**< Address valid */
+
+/** Receive address */
+union intel_receive_address {
+       struct {
+               uint32_t low;
+               uint32_t high;
+       } __attribute__ (( packed )) reg;
+       uint8_t raw[ETH_ALEN];
+};
+
+/** An Intel descriptor ring */
+struct intel_ring {
+       /** Descriptors */
+       struct intel_descriptor *desc;
+       /** Producer index */
+       unsigned int prod;
+       /** Consumer index */
+       unsigned int cons;
+
+       /** Register block */
+       unsigned int reg;
+       /** Length (in bytes) */
+       size_t len;
+};
+
+/**
+ * Initialise descriptor ring
+ *
+ * @v ring             Descriptor ring
+ * @v count            Number of descriptors
+ * @v reg              Descriptor register block
+ */
+static inline __attribute__ (( always_inline)) void
+intel_init_ring ( struct intel_ring *ring, unsigned int count,
+                 unsigned int reg ) {
+       ring->len = ( count * sizeof ( ring->desc[0] ) );
+       ring->reg = reg;
+}
+
+/** An Intel network card */
+struct intel_nic {
+       /** Registers */
+       void *regs;
+       /** Port number (for multi-port devices) */
+       unsigned int port;
+
+       /** EEPROM */
+       struct nvs_device eeprom;
+       /** EEPROM done flag */
+       uint32_t eerd_done;
+       /** EEPROM address shift */
+       unsigned int eerd_addr_shift;
+
+       /** Transmit descriptor ring */
+       struct intel_ring tx;
+       /** Receive descriptor ring */
+       struct intel_ring rx;
+       /** Receive I/O buffers */
+       struct io_buffer *rx_iobuf[INTEL_NUM_RX_DESC];
+};
+
+#endif /* _INTEL_H */
index ff87e9b91c28c515801a72f5fb387987bbc03173..471ba77c91b3418f28729df782dc53487eaacbf9 100644 (file)
@@ -144,6 +144,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define ERRFILE_mii                 ( ERRFILE_DRIVER | 0x00620000 )
 #define ERRFILE_realtek                     ( ERRFILE_DRIVER | 0x00630000 )
 #define ERRFILE_skeleton            ( ERRFILE_DRIVER | 0x00640000 )
+#define ERRFILE_intel               ( ERRFILE_DRIVER | 0x00650000 )
 
 #define ERRFILE_scsi                ( ERRFILE_DRIVER | 0x00700000 )
 #define ERRFILE_arbel               ( ERRFILE_DRIVER | 0x00710000 )